[mapguide-commits] r7216 - in sandbox/jng/swig-java/Web/src: . JavaApiEx JavaApiEx/org JavaApiEx/org/osgeo JavaApiEx/org/osgeo/mapguide

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Nov 22 21:19:54 PST 2012


Author: jng
Date: 2012-11-22 21:19:53 -0800 (Thu, 22 Nov 2012)
New Revision: 7216

Added:
   sandbox/jng/swig-java/Web/src/JavaApiEx/
   sandbox/jng/swig-java/Web/src/JavaApiEx/COPYRIGHT
   sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.rc
   sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj
   sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am
   sandbox/jng/swig-java/Web/src/JavaApiEx/catchall.code
   sandbox/jng/swig-java/Web/src/JavaApiEx/getclassid.code
   sandbox/jng/swig-java/Web/src/JavaApiEx/java.i
   sandbox/jng/swig-java/Web/src/JavaApiEx/org/
   sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/
   sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/
   sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
   sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java
   sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
Modified:
   sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln
Log:
Check in JavaApiEx project where we'll do our enhancement work. This is a verbatim copy of the existing JavaApi project with the following differences:

 - It outputs MapGuideJavaApiEx.dll instead of MapGuideJavaApi.dll
 - It outputs MapGuideApiEx.jar instead of MapGuideApi.jar
 - VS 2008 project has been omitted.


Property changes on: sandbox/jng/swig-java/Web/src/JavaApiEx
___________________________________________________________________
Added: bugtraq:number
   + true

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/COPYRIGHT
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/COPYRIGHT	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/COPYRIGHT	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,19 @@
+Where copyrights have not been included in the source file, this
+copyright shall be used for all source files in this directory
+and subdirectories.
+
+Copyright (C) 2004-2011 by Autodesk, Inc.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of version 2.1 of the GNU Lesser
+General Public License as published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.rc
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.rc	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.rc	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,96 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winresrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "#include ""winresrc.h""\r\n"
+    "\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Open Source Geospatial Foundation"
+            VALUE "FileDescription", "MapGuideJavaApiEx Dynamic Link Library"
+            VALUE "FileVersion", "2, 5, 0, 0"
+            VALUE "InternalName", "MapGuideJavaApiEx"
+            VALUE "LegalCopyright", "Copyright (C) 2006-2011 by Autodesk, Inc."
+            VALUE "OriginalFilename", "MapGuideJavaApiEx.dll"
+            VALUE "ProductName", "MapGuide Open Source"
+            VALUE "ProductVersion", "2, 5, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C02F44CB-D916-428D-A1A5-04E225A2A4EC}</ProjectGuid>
+    <RootNamespace>JavaApi</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\obj\debug\JavaApiEx\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\debug64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\obj\debug64\JavaApiEx\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\obj\release\JavaApiEx\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\release64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\obj\release64\JavaApiEx\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MapGuideJavaApiExd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MapGuideJavaApiExd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MapGuideJavaApiEx</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MapGuideJavaApiEx</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApid.jar org\osgeo\mapguide\*.class
+</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>..\..\lib\debug\MapGuideJavaApid.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApid.jar org\osgeo\mapguide\*.class
+</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>..\..\lib\debug64\MapGuideJavaApid.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApiEx.jar org\osgeo\mapguide\*.class
+</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>..\..\lib\release\MapGuideJavaApiEx.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApiEx.jar org\osgeo\mapguide\*.class
+</Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
+      <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>..\..\lib\release64\MapGuideJavaApiEx.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="catchall.code" />
+    <None Include="getclassid.code" />
+    <None Include="java.i" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="JavaApiEx.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="MgApi_wrap.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\Foundation\Foundation.vcxproj">
+      <Project>{a82adc7d-4da4-42f2-9bf6-df5dcfb44425}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\Geometry\Geometry.vcxproj">
+      <Project>{d954daac-e305-40ce-b3f3-c229a0bef4f0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\MapGuideCommon\MapGuideCommon.vcxproj">
+      <Project>{5287a594-4d4f-43fe-a281-e279ab708cf1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\PlatformBase\PlatformBase.vcxproj">
+      <Project>{f7334b1b-0efa-47e3-8e66-df158e61b7e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\HttpHandler\HttpHandler.vcxproj">
+      <Project>{78619d0e-d3f9-4ddf-b90e-f99cb03dfc44}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\WebApp\WebApp.vcxproj">
+      <Project>{b797917b-6842-467c-8b14-e00b76a91247}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\WebSupport\WebSupport.vcxproj">
+      <Project>{795b1b0e-4ec8-469d-b641-e26324266fbf}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,468 @@
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = getclassid.code \
+             catchall.code \
+             java.i \
+             JavaApiEx.rc \
+             JavaApiEx.vcproj \
+             org/osgeo/mapguide/AppThrowable.java \
+             org/osgeo/mapguide/MgBase64.java \
+             org/osgeo/mapguide/MgLocalizer.java
+
+prefix=@prefix@/webserverextensions
+
+INCLUDES = -I../../../Common/MdfModel \
+           -I../../../Common/Foundation \
+           -I../../../Common/Geometry \
+           -I../../../Common/PlatformBase \
+           -I../../../Common/MapGuideCommon \
+           -I$(JAVA_HOME)/include \
+           -I$(JAVA_HOME)/include/linux \
+           -I../../../Oem/ACE/ACE_wrappers \
+           -I../HttpHandler \
+           -I../WebSupport \
+           -I../WebApp \
+           -I../../../Oem/dbxml/xerces-c-src/src
+
+BUILT_SOURCES = MgApi_wrap.cpp
+
+lib_LTLIBRARIES = libMapGuideJavaApiEx.la
+
+nodist_libMapGuideJavaApiEx_la_SOURCES = MgApi_wrap.cpp
+
+AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -DJAVA
+
+libMapGuideJavaApiEx_la_LIBADD = \
+    -lACE \
+    -lMgFoundation \
+    -lMgGeometry \
+    -lMgPlatformBase \
+    -lMgMapGuideCommon \
+    -lMgHttpHandler \
+    -lMgMdfModel \
+    -lMgMdfParser \
+    -lxerces-c \
+    -lMgWebApp
+
+libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
+    -L../../../Oem/ACE/ACE_wrappers/ace \
+    -L../../../Common/MdfModel \
+    -L../../../Common/MdfParser \
+    -L../../../Common/Foundation \
+    -L../../../Common/Geometry \
+    -L../../../Common/PlatformBase \
+    -L../../../Common/MapGuideCommon \
+    -L../HttpHandler \
+    -L../WebApp \
+    -L../../../Oem/dbxml/install/lib
+
+MgApi_wrap.cpp : \
+    ../WebApp/WebApp.h \
+    ../WebSupport/InitializeWebTier.cpp \
+    ../../../Common/MdfModel/UnicodeString.h \
+    ../HttpHandler/HttpHandlerApiDllExport.h \
+    ../HttpHandler/HttpHandler.h \
+    ../../../Common/Foundation/System/Object.h \
+    ../../../Common/Foundation/System/Disposable.h \
+    ../../../Common/Foundation/System/GuardDisposable.h \
+    ../../../Common/Foundation/System/Serializable.h \
+    ../../../Common/Foundation/System/NamedSerializable.h \
+    ../../../Common/Foundation/Data/Collection.h \
+    ../../../Common/Foundation/Data/Property.h \
+    ../../../Common/Foundation/System/DisposableCollection.h \
+    ../../../Common/Foundation/Data/BatchPropertyCollection.h \
+    ../../../Common/Foundation/Data/ByteReader.h \
+    ../../../Common/Foundation/Data/ByteSource.h \
+    ../../../Common/Foundation/Data/ByteSink.h \
+    ../../../Common/Foundation/Data/DateTime.h \
+    ../../../Common/Foundation/Data/NullableProperty.h \
+    ../../../Common/Foundation/Data/PropertyCollection.h \
+    ../../../Common/Foundation/Data/PropertyDefinition.h \
+    ../../../Common/Foundation/Data/StringCollection.h \
+    ../../../Common/Foundation/Data/StringProperty.h \
+    ../../../Common/Foundation/Data/FeaturePropertyType.h \
+    ../../../Common/Foundation/Data/MimeType.h \
+    ../../../Common/Foundation/Data/PropertyType.h \
+    ../../../Common/Foundation/Exception/Exception.h \
+    ../../../Common/Foundation/Exception/SystemException.h \
+    ../../../Common/Foundation/Exception/IoException.h \
+    ../../../Common/Foundation/Exception/FileIoException.h \
+    ../../../Common/Foundation/Exception/ApplicationException.h \
+    ../../../Common/Foundation/Exception/ThirdPartyException.h \
+    ../../../Common/Foundation/Exception/StreamIoException.h \
+    ../../../Common/Foundation/Exception/OutOfRangeException.h \
+    ../../../Common/Foundation/Exception/ArgumentOutOfRangeException.h \
+    ../../../Common/Foundation/Exception/ClassNotFoundException.h \
+    ../../../Common/Foundation/Exception/ConfigurationException.h \
+    ../../../Common/Foundation/Exception/ConfigurationLoadFailedException.h \
+    ../../../Common/Foundation/Exception/ConfigurationSaveFailedException.h \
+    ../../../Common/Foundation/Exception/DateTimeException.h \
+    ../../../Common/Foundation/Exception/DecryptionException.h \
+    ../../../Common/Foundation/Exception/DirectoryNotFoundException.h \
+    ../../../Common/Foundation/Exception/DivideByZeroException.h \
+    ../../../Common/Foundation/Exception/DomainException.h \
+    ../../../Common/Foundation/Exception/DuplicateDirectoryException.h \
+    ../../../Common/Foundation/Exception/DuplicateFileException.h \
+    ../../../Common/Foundation/Exception/DuplicateObjectException.h \
+    ../../../Common/Foundation/Exception/EncryptionException.h \
+    ../../../Common/Foundation/Exception/FileNotFoundException.h \
+    ../../../Common/Foundation/Exception/IndexOutOfRangeException.h \
+    ../../../Common/Foundation/Exception/InvalidArgumentException.h \
+    ../../../Common/Foundation/Exception/InvalidCastException.h \
+    ../../../Common/Foundation/Exception/InvalidOperationException.h \
+    ../../../Common/Foundation/Exception/InvalidPropertyTypeException.h \
+    ../../../Common/Foundation/Exception/InvalidStreamHeaderException.h \
+    ../../../Common/Foundation/Exception/LengthException.h \
+    ../../../Common/Foundation/Exception/LogicException.h \
+    ../../../Common/Foundation/Exception/NotFiniteNumberException.h \
+    ../../../Common/Foundation/Exception/NotImplementedException.h \
+    ../../../Common/Foundation/Exception/NullArgumentException.h \
+    ../../../Common/Foundation/Exception/NullPropertyValueException.h \
+    ../../../Common/Foundation/Exception/NullReferenceException.h \
+    ../../../Common/Foundation/Exception/ObjectNotFoundException.h \
+    ../../../Common/Foundation/Exception/OutOfMemoryException.h \
+    ../../../Common/Foundation/Exception/OverflowException.h \
+    ../../../Common/Foundation/Exception/PlatformNotSupportedException.h \
+    ../../../Common/Foundation/Exception/ResourcesException.h \
+    ../../../Common/Foundation/Exception/ResourcesLoadFailedException.h \
+    ../../../Common/Foundation/Exception/RuntimeException.h \
+    ../../../Common/Foundation/Exception/TemporaryFileNotAvailableException.h \
+    ../../../Common/Foundation/Exception/UnclassifiedException.h \
+    ../../../Common/Foundation/Exception/UnderflowException.h \
+    ../../../Common/Foundation/Exception/XmlException.h \
+    ../../../Common/Foundation/Exception/XmlParserException.h \
+    ../../../Common/Geometry/GeometricEntity.h \
+    ../../../Common/Geometry/Geometry.h \
+    ../../../Common/Geometry/GeometryComponent.h \
+    ../../../Common/Geometry/Curve.h \
+    ../../../Common/Geometry/CurveSegment.h \
+    ../../../Common/Geometry/Ring.h \
+    ../../../Common/Geometry/Region.h \
+    ../../../Common/Geometry/AgfReaderWriter.h \
+    ../../../Common/Geometry/AggregateGeometry.h \
+    ../../../Common/Geometry/ArcSegment.h \
+    ../../../Common/Geometry/Coordinate.h \
+    ../../../Common/Geometry/CoordinateCollection.h \
+    ../../../Common/Geometry/CoordinateIterator.h \
+    ../../../Common/Geometry/CoordinateXY.h \
+    ../../../Common/Geometry/CoordinateXYM.h \
+    ../../../Common/Geometry/CoordinateXYZ.h \
+    ../../../Common/Geometry/CoordinateXYZM.h \
+    ../../../Common/Geometry/CurvePolygon.h \
+    ../../../Common/Geometry/CurvePolygonCollection.h \
+    ../../../Common/Geometry/CurveRing.h \
+    ../../../Common/Geometry/CurveRingCollection.h \
+    ../../../Common/Geometry/CurveSegmentCollection.h \
+    ../../../Common/Geometry/CurveString.h \
+    ../../../Common/Geometry/CurveStringCollection.h \
+    ../../../Common/Geometry/Envelope.h \
+    ../../../Common/Geometry/GeometryCollection.h \
+    ../../../Common/Geometry/GeometryFactory.h \
+    ../../../Common/Geometry/LinearRing.h \
+    ../../../Common/Geometry/LinearRingCollection.h \
+    ../../../Common/Geometry/LinearSegment.h \
+    ../../../Common/Geometry/LineString.h \
+    ../../../Common/Geometry/LineStringCollection.h \
+    ../../../Common/Geometry/Measure.h \
+    ../../../Common/Geometry/MultiCurvePolygon.h \
+    ../../../Common/Geometry/MultiCurveString.h \
+    ../../../Common/Geometry/MultiGeometry.h \
+    ../../../Common/Geometry/MultiLineString.h \
+    ../../../Common/Geometry/MultiPoint.h \
+    ../../../Common/Geometry/MultiPolygon.h \
+    ../../../Common/Geometry/Point.h \
+    ../../../Common/Geometry/PointCollection.h \
+    ../../../Common/Geometry/Polygon.h \
+    ../../../Common/Geometry/PolygonCollection.h \
+    ../../../Common/Geometry/Transform.h \
+    ../../../Common/Geometry/WktReaderWriter.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystem.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryBase.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h \
+    ../../../Common/Geometry/Exception/CoordinateSystemComputationFailedException.h \
+    ../../../Common/Geometry/Exception/CoordinateSystemConversionFailedException.h \
+    ../../../Common/Geometry/Exception/CoordinateSystemInitializationFailedException.h \
+    ../../../Common/Geometry/Exception/CoordinateSystemLoadFailedException.h \
+    ../../../Common/Geometry/Exception/CoordinateSystemMeasureFailedException.h \
+    ../../../Common/Geometry/Exception/CoordinateSystemTransformFailedException.h \
+    ../../../Common/Geometry/Exception/GeometryException.h \
+    ../../../Common/Geometry/Exception/InvalidCoordinateSystemException.h \
+    ../../../Common/Geometry/Exception/InvalidCoordinateSystemTypeException.h \
+    ../../../Common/Geometry/Exception/InvalidCoordinateSystemUnitsException.h \
+    ../../../Common/Geometry/CoordinateDimension.h \
+    ../../../Common/Geometry/GeometricEntityType.h \
+    ../../../Common/Geometry/GeometricPathInstructionType.h \
+    ../../../Common/Geometry/GeometryComponentType.h \
+    ../../../Common/Geometry/GeometryType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h \
+	../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformationMethod.h \
+    ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h \
+    ../../../Common/PlatformBase/Data/BlobProperty.h \
+    ../../../Common/PlatformBase/Data/BooleanProperty.h \
+    ../../../Common/PlatformBase/Data/ByteProperty.h \
+    ../../../Common/PlatformBase/Data/ClobProperty.h \
+    ../../../Common/PlatformBase/Data/Color.h \
+    ../../../Common/PlatformBase/Data/DateTimeProperty.h \
+    ../../../Common/PlatformBase/Data/DoubleProperty.h \
+    ../../../Common/PlatformBase/Data/Int16Property.h \
+    ../../../Common/PlatformBase/Data/Int32Property.h \
+    ../../../Common/PlatformBase/Data/Int64Property.h \
+    ../../../Common/PlatformBase/Data/IntCollection.h \
+    ../../../Common/PlatformBase/Data/PropertyDefinitionCollection.h \
+    ../../../Common/PlatformBase/Data/SingleProperty.h \
+    ../../../Common/PlatformBase/Data/StringPropertyCollection.h \
+    ../../../Common/PlatformBase/Exception/ArrayTypeMismatchException.h \
+    ../../../Common/PlatformBase/Exception/DuplicateResourceDataException.h \
+    ../../../Common/PlatformBase/Exception/DuplicateResourceException.h \
+    ../../../Common/PlatformBase/Exception/EmptyFeatureSetException.h \
+    ../../../Common/PlatformBase/Exception/FdoException.h \
+    ../../../Common/PlatformBase/Exception/FeatureServiceException.h \
+    ../../../Common/PlatformBase/Exception/InvalidMapDefinitionException.h \
+    ../../../Common/PlatformBase/Exception/InvalidRepositoryNameException.h \
+    ../../../Common/PlatformBase/Exception/InvalidRepositoryTypeException.h \
+    ../../../Common/PlatformBase/Exception/InvalidResourceDataNameException.h \
+    ../../../Common/PlatformBase/Exception/InvalidResourceDataTypeException.h \
+    ../../../Common/PlatformBase/Exception/InvalidResourceNameException.h \
+    ../../../Common/PlatformBase/Exception/InvalidResourcePathException.h \
+    ../../../Common/PlatformBase/Exception/InvalidResourcePreProcessingTypeException.h \
+    ../../../Common/PlatformBase/Exception/InvalidResourceTypeException.h \
+    ../../../Common/PlatformBase/Exception/LayerNotFoundException.h \
+    ../../../Common/PlatformBase/Exception/ResourceBusyException.h \
+    ../../../Common/PlatformBase/Exception/ResourceDataNotFoundException.h \
+    ../../../Common/PlatformBase/Exception/ResourceNotFoundException.h \
+    ../../../Common/PlatformBase/Exception/ServiceNotAvailableException.h \
+    ../../../Common/PlatformBase/Exception/ServiceNotSupportedException.h \
+    ../../../Common/PlatformBase/Exception/UserNotFoundException.h \
+    ../../../Common/PlatformBase/Services/FeatureCommand.h \
+    ../../../Common/PlatformBase/Services/FeatureQueryOptions.h \
+    ../../../Common/PlatformBase/Services/FeatureSourceParams.h \
+    ../../../Common/PlatformBase/Services/Reader.h \
+    ../../../Common/PlatformBase/Services/Service.h \
+    ../../../Common/PlatformBase/Services/BaseService.h \
+    ../../../Common/PlatformBase/Services/ClassDefinition.h \
+    ../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
+    ../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
+    ../../../Common/PlatformBase/Services/CreateSdfParams.h \
+    ../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
+    ../../../Common/PlatformBase/Services/DataReader.h \
+    ../../../Common/PlatformBase/Services/DeleteFeatures.h \
+    ../../../Common/PlatformBase/Services/FeatureAggregateOptions.h \
+    ../../../Common/PlatformBase/Services/FeatureCommandCollection.h \
+    ../../../Common/PlatformBase/Services/FeatureProperty.h \
+    ../../../Common/PlatformBase/Services/FeatureReader.h \
+    ../../../Common/PlatformBase/Services/FeatureSchema.h \
+    ../../../Common/PlatformBase/Services/FeatureSchemaCollection.h \
+    ../../../Common/PlatformBase/Services/FeatureService.h \
+    ../../../Common/PlatformBase/Services/GeometricPropertyDefinition.h \
+    ../../../Common/PlatformBase/Services/GeometryProperty.h \
+    ../../../Common/PlatformBase/Services/GeometryTypeInfo.h \
+    ../../../Common/PlatformBase/Services/GwsFeatureReader.h \
+    ../../../Common/PlatformBase/Services/InsertFeatures.h \
+    ../../../Common/PlatformBase/Services/LongTransactionReader.h \
+    ../../../Common/PlatformBase/Services/ObjectPropertyDefinition.h \
+    ../../../Common/PlatformBase/Services/Parameter.h \
+    ../../../Common/PlatformBase/Services/ParameterCollection.h \
+    ../../../Common/PlatformBase/Services/Raster.h \
+    ../../../Common/PlatformBase/Services/RasterProperty.h \
+    ../../../Common/PlatformBase/Services/RasterPropertyDefinition.h \
+    ../../../Common/PlatformBase/Services/Resource.h \
+    ../../../Common/PlatformBase/Services/ResourceIdentifier.h \
+    ../../../Common/PlatformBase/Services/ResourceService.h \
+    ../../../Common/PlatformBase/Services/SpatialContextReader.h \
+    ../../../Common/PlatformBase/Services/SqlDataReader.h \
+    ../../../Common/PlatformBase/Services/Transaction.h \
+    ../../../Common/PlatformBase/Services/UpdateFeatures.h \
+    ../../../Common/PlatformBase/Services/Warnings.h \
+    ../../../Common/PlatformBase/Services/BaseServiceDefs.h \
+    ../../../Common/PlatformBase/Services/FeatureCommandType.h \
+    ../../../Common/PlatformBase/Services/FeatureGeometricType.h \
+    ../../../Common/PlatformBase/Services/FeatureSpatialOperations.h \
+    ../../../Common/PlatformBase/Services/ObjectPropertyType.h \
+    ../../../Common/PlatformBase/Services/OrderingOption.h \
+    ../../../Common/PlatformBase/Services/ParameterDirection.h \
+    ../../../Common/PlatformBase/Services/RasterTypes.h \
+    ../../../Common/PlatformBase/Services/ReaderType.h \
+    ../../../Common/PlatformBase/Services/ResourceDefs.h \
+    ../../../Common/PlatformBase/Services/SpatialContextExtentType.h \
+    ../../../Common/PlatformBase/MapLayer/LayerBase.h \
+    ../../../Common/PlatformBase/MapLayer/LayerCollection.h \
+    ../../../Common/PlatformBase/MapLayer/LayerGroup.h \
+    ../../../Common/PlatformBase/MapLayer/LayerGroupCollection.h \
+    ../../../Common/PlatformBase/MapLayer/MapBase.h \
+    ../../../Common/PlatformBase/MapLayer/MapCollection.h \
+    ../../../Common/PlatformBase/MapLayer/ReadOnlyLayerCollection.h \
+    ../../../Common/PlatformBase/MapLayer/SelectionBase.h \
+    ../../../Common/PlatformBase/MapLayer/LayerGroupType.h \
+    ../../../Common/PlatformBase/MapLayer/LayerType.h \
+    ../../../Common/MapGuideCommon/Exception/AuthenticationFailedException.h \
+    ../../../Common/MapGuideCommon/Exception/ConnectionFailedException.h \
+    ../../../Common/MapGuideCommon/Exception/ConnectionNotOpenException.h \
+    ../../../Common/MapGuideCommon/Exception/DbException.h \
+    ../../../Common/MapGuideCommon/Exception/DbXmlException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateGroupException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateNameException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateParameterException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateRepositoryException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateRoleException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateServerException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateSessionException.h \
+    ../../../Common/MapGuideCommon/Exception/DuplicateUserException.h \
+    ../../../Common/MapGuideCommon/Exception/DwfException.h \
+    ../../../Common/MapGuideCommon/Exception/DwfSectionNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/DwfSectionResourceNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/EndOfStreamException.h \
+    ../../../Common/MapGuideCommon/Exception/GroupNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidDwfPackageException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidDwfSectionException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidFeatureSourceException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidIpAddressException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidLicenseException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidLogEntryException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidPasswordException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutFontSizeUnitsException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutPositionUnitsException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutSizeUnitsException.h \
+    ../../../Common/MapGuideCommon/Exception/InvalidServerNameException.h \
+    ../../../Common/MapGuideCommon/Exception/LicenseException.h \
+    ../../../Common/MapGuideCommon/Exception/LicenseExpiredException.h \
+    ../../../Common/MapGuideCommon/Exception/OperationProcessingException.h \
+    ../../../Common/MapGuideCommon/Exception/ParameterNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/PathTooLongException.h \
+    ../../../Common/MapGuideCommon/Exception/PortNotAvailableException.h \
+    ../../../Common/MapGuideCommon/Exception/PrintToScaleModeNotSelectedException.h \
+    ../../../Common/MapGuideCommon/Exception/RepositoryCreationFailedException.h \
+    ../../../Common/MapGuideCommon/Exception/RepositoryNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/RepositoryNotOpenException.h \
+    ../../../Common/MapGuideCommon/Exception/RepositoryOpenFailedException.h \
+    ../../../Common/MapGuideCommon/Exception/RoleNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/ServerNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/ServerNotOnlineException.h \
+    ../../../Common/MapGuideCommon/Exception/SessionExpiredException.h \
+    ../../../Common/MapGuideCommon/Exception/SessionNotFoundException.h \
+    ../../../Common/MapGuideCommon/Exception/UnauthorizedAccessException.h \
+    ../../../Common/MapGuideCommon/Exception/UriFormatException.h \
+    ../../../Common/MapGuideCommon/Services/DrawingService.h \
+    ../../../Common/MapGuideCommon/Services/DwfVersion.h \
+    ../../../Common/MapGuideCommon/Services/FeatureInformation.h \
+    ../../../Common/MapGuideCommon/Services/KmlService.h \
+    ../../../Common/MapGuideCommon/Services/Layout.h \
+    ../../../Common/MapGuideCommon/Services/MappingService.h \
+    ../../../Common/MapGuideCommon/Services/MapPlot.h \
+    ../../../Common/MapGuideCommon/Services/MapPlotCollection.h \
+    ../../../Common/MapGuideCommon/Services/PackageStatusInformation.h \
+    ../../../Common/MapGuideCommon/Services/PlotSpecification.h \
+    ../../../Common/MapGuideCommon/Services/ProfilingService.h \
+    ../../../Common/MapGuideCommon/Services/RenderingOptions.h \
+    ../../../Common/MapGuideCommon/Services/RenderingService.h \
+    ../../../Common/MapGuideCommon/Services/ServerAdmin.h \
+    ../../../Common/MapGuideCommon/Services/Site.h \
+    ../../../Common/MapGuideCommon/Services/SiteConnection.h \
+    ../../../Common/MapGuideCommon/Services/SiteInfo.h \
+    ../../../Common/MapGuideCommon/Services/TileService.h \
+    ../../../Common/MapGuideCommon/System/UserInformation.h \
+    ../../../Common/MapGuideCommon/MapLayer/Layer.h \
+    ../../../Common/MapGuideCommon/MapLayer/Map.h \
+    ../../../Common/MapGuideCommon/MapLayer/Selection.h \
+    ../../../Common/MapGuideCommon/Services/MappingDefs.h \
+    ../../../Common/MapGuideCommon/Services/MapPlotInstruction.h \
+    ../../../Common/MapGuideCommon/Services/ServerAdminDefs.h \
+    ../../../Common/MapGuideCommon/Services/UnitType.h \
+    ../../../Common/MapGuideCommon/System/ConfigProperties.h \
+    ../WebApp/WebCommand.h \
+    ../WebApp/WebUiTargetCommand.h \
+    ../WebApp/WebWidget.h \
+    ../WebApp/WebWidgetCollection.h \
+    ../WebApp/WebUiPane.h \
+    ../WebApp/WebUiSizablePane.h \
+    ../WebApp/WebBufferCommand.h \
+    ../WebApp/WebCommandCollection.h \
+    ../WebApp/WebCommandWidget.h \
+    ../WebApp/WebContextMenu.h \
+    ../WebApp/WebFlyoutWidget.h \
+    ../WebApp/WebGetPrintablePageCommand.h \
+    ../WebApp/WebHelpCommand.h \
+    ../WebApp/WebInformationPane.h \
+    ../WebApp/WebInvokeScriptCommand.h \
+    ../WebApp/WebInvokeUrlCommand.h \
+    ../WebApp/WebLayout.h \
+    ../WebApp/WebMeasureCommand.h \
+    ../WebApp/WebPrintCommand.h \
+    ../WebApp/WebSearchCommand.h \
+    ../WebApp/WebSelectWithinCommand.h \
+    ../WebApp/WebSeparatorWidget.h \
+    ../WebApp/WebTaskBar.h \
+    ../WebApp/WebTaskBarWidget.h \
+    ../WebApp/WebTaskPane.h \
+    ../WebApp/WebToolbar.h \
+    ../WebApp/WebViewOptionsCommand.h \
+    ../WebApp/WebActions.h \
+    ../WebApp/WebTargetType.h \
+    ../WebApp/WebTargetViewerType.h \
+    ../WebApp/WebTaskButtonType.h \
+    ../WebApp/WebWidgetType.h \
+    ../HttpHandler/HttpHeader.h \
+    ../HttpHandler/HttpPrimitiveValue.h \
+    ../HttpHandler/HttpRequest.h \
+    ../HttpHandler/HttpRequestMetadata.h \
+    ../HttpHandler/HttpRequestParam.h \
+    ../HttpHandler/HttpResponse.h \
+    ../HttpHandler/HttpResult.h
+	../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+	cp -f java.i language.i
+	../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
+	../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+	rm -f org/osgeo/mapguide/*.class
+	mv -f *.java org/osgeo/mapguide
+	$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
+	$(JAVA_HOME)/bin/jar cf ../WEB-INF/lib/MapGuideApiEx.jar org/osgeo/mapguide/*.class

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/catchall.code
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/catchall.code	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/catchall.code	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,8 @@
+
+void onCatchAll(JNIEnv* jenv, const char* proxyfname)
+{
+    string s = proxyfname;
+    wstring fname = MgUtil::MultiByteToWideChar(s);
+    MgUnclassifiedException* e = new MgUnclassifiedException(fname, __LINE__, __WFILE__, NULL, L"", NULL);
+    ThrowJavaExceptionWrapper(jenv, e);
+}

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/getclassid.code
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/getclassid.code	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/getclassid.code	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,6 @@
+
+/* Get a class identifier from an Object instance */
+JNIEXPORT jint JNICALL Java_org_osgeo_mapguide_MapGuideJavaApiJNI_getClassId(JNIEnv* jenv, jclass jcls, jlong jarg1)
+{
+  return ((MgObject*)(void*)jarg1)->GetClassId();
+}

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/java.i
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/java.i	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/java.i	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,101 @@
+//
+//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+%typemap(jni) STRINGPARAM "jstring"
+%typemap(jtype) STRINGPARAM "String"
+%typemap(jstype) STRINGPARAM "String"
+%typemap(javain) STRINGPARAM "$javainput"
+%typemap(in) STRINGPARAM
+{
+    if($input == NULL)
+       $1 = std::wstring(L"");
+    else
+    {
+        int len = jenv->GetStringLength($input);
+        const jchar *pstr = jenv->GetStringChars($input, 0);
+        if (!pstr)
+            $1 = std::wstring(L"ERROR: SWIG string conversion"); 
+        else
+        {
+#ifdef WIN32
+            $1 =  std::wstring((const wchar_t*)pstr, len);
+#else
+            xstring u16String = xstring((XMLCh*)pstr, len);
+            lstring u32String;
+            UnicodeString::UTF16toUTF32(u16String.c_str(),u32String);
+            $1 =  std::wstring((const wchar_t*) u32String.c_str());
+#endif
+            jenv->ReleaseStringChars($input, pstr);
+        }
+    }
+}
+
+%typemap(jni) STRING "jstring"
+%typemap(jtype) STRING "String"
+%typemap(jstype) STRING "String"
+%typemap(javaout) STRING
+{
+  { return $jnicall; }
+}
+%typemap(out) STRING
+{
+#ifdef WIN32
+    jresult = jenv->NewString((const jchar *)result.c_str(), (jsize)result.length());
+#else
+    xstring u16String;
+    UnicodeString::UTF32toUTF16((const LCh*) result.c_str(), u16String);
+    jresult = jenv->NewString((const jchar *)u16String.c_str(), (jsize)u16String.length());
+#endif
+}
+
+%typemap(jni) BYTE_ARRAY_IN "jbyteArray"
+%typemap(jtype) BYTE_ARRAY_IN "byte[]"
+%typemap(jstype) BYTE_ARRAY_IN "byte[]"
+%typemap(in) BYTE_ARRAY_IN (jbyte* bytes)
+{
+    bytes = jenv->GetByteArrayElements($input, 0);
+    if (!bytes)
+        return $null;
+    $1 = (BYTE_ARRAY_IN)bytes;
+}
+%typemap(freearg) BYTE_ARRAY_IN
+{
+    jenv->ReleaseByteArrayElements($input, bytes$argnum, 0);
+}
+%typemap(javain) BYTE_ARRAY_IN "$javainput"
+
+
+%typemap(jni) BYTE_ARRAY_OUT "jbyteArray"
+%typemap(jtype) BYTE_ARRAY_OUT "byte[]"
+%typemap(jstype) BYTE_ARRAY_OUT "byte[]"
+%typemap(in) BYTE_ARRAY_OUT (jbyte* bytes)
+{
+    bytes = jenv->GetByteArrayElements($input, 0);
+    if (!bytes)
+        return $null;
+    $1 = (BYTE_ARRAY_OUT)bytes;
+}
+%typemap(freearg) BYTE_ARRAY_OUT
+{
+    jenv->ReleaseByteArrayElements($input, bytes$argnum, JNI_COMMIT);
+}
+%typemap(javain) BYTE_ARRAY_OUT "$javainput"
+
+///////////////////////////////////////////////////////////
+// Global functions
+//
+void MgInitializeWebTier(STRINGPARAM configFile);


Property changes on: sandbox/jng/swig-java/Web/src/JavaApiEx/org
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide
___________________________________________________________________
Added: bugtraq:number
   + true

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,57 @@
+//
+//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+package org.osgeo.mapguide;
+
+class AppThrowable extends Exception
+{
+    public AppThrowable()
+    {
+    }
+
+    public AppThrowable(long cPtr, boolean cMemoryOwn)
+    {
+    }
+
+    public String getMessage()
+    {
+        try
+        {
+            return ((MgException)this).GetExceptionMessage();
+        }
+        catch (MgException e)
+        {
+            return "";
+        }
+    }
+
+    public void printStackTrace()
+    {
+        try
+        {
+            System.out.println(((MgException)this).GetStackTrace());
+        }
+        catch (MgException e)
+        {
+        }
+    }
+
+    public void delete()
+    {
+        //implemented by derived classes
+    }
+}

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,1469 @@
+//
+//  Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of version 2.1 of the GNU Lesser
+//  General Public License as published by the Free Software Foundation.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+/**
+ * Encodes and decodes to and from Base64 notation.
+ *
+ * <p>
+ * Change Log:
+ * </p>
+ * <ul>
+ *  <li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
+ *   some convenience methods for reading and writing to and from files.</li>
+ *  <li>v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
+ *   with other encodings (like EBCDIC).</li>
+ *  <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
+ *   encoded data was a single byte.</li>
+ *  <li>v2.0 - I got rid of methods that used booleans to set options.
+ *   Now everything is more consolidated and cleaner. The code now detects
+ *   when data that's being decoded is gzip-compressed and will decompress it
+ *   automatically. Generally things are cleaner. You'll probably have to
+ *   change some method calls that you were making to support the new
+ *   options format (<tt>int</tt>s that you "OR" together).</li>
+ *  <li>v1.5.1 - Fixed bug when decompressing and decoding to a
+ *   byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+ *   Added the ability to "suspend" encoding in the Output Stream so
+ *   you can turn on and off the encoding if you need to embed base64
+ *   data in an otherwise "normal" stream (like an XML file).</li>
+ *  <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
+ *      This helps when using GZIP streams.
+ *      Added the ability to GZip-compress objects before encoding them.</li>
+ *  <li>v1.4 - Added helper methods to read/write files.</li>
+ *  <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
+ *  <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
+ *      where last buffer being read, if not completely full, was not returned.</li>
+ *  <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
+ *  <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
+ * </ul>
+ *
+ * <p>
+ * I am placing this code in the Public Domain. Do with it as you will.
+ * This software comes with no guarantees or warranties but with
+ * plenty of well-wishing instead!
+ * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
+ * periodically to check for updates or to contribute improvements.
+ * </p>
+ *
+ * @author Robert Harder
+ * @author rob at iharder.net
+ * @version 2.1
+ */
+
+package org.osgeo.mapguide;
+
+public class MgBase64
+{
+
+/* ********  P U B L I C   F I E L D S  ******** */
+
+
+    /** No options specified. Value is zero. */
+    public final static int NO_OPTIONS = 0;
+
+    /** Specify encoding. */
+    public final static int ENCODE = 1;
+
+
+    /** Specify decoding. */
+    public final static int DECODE = 0;
+
+
+    /** Specify that data should be gzip-compressed. */
+    public final static int GZIP = 2;
+
+
+    /** Don't break lines when encoding (violates strict Base64 specification) */
+    public final static int DONT_BREAK_LINES = 8;
+
+
+/* ********  P R I V A T E   F I E L D S  ******** */
+
+
+    /** Maximum line length (76) of Base64 output. */
+    private final static int MAX_LINE_LENGTH = 76;
+
+
+    /** The equals sign (=) as a byte. */
+    private final static byte EQUALS_SIGN = (byte)'=';
+
+
+    /** The new line character (\n) as a byte. */
+    private final static byte NEW_LINE = (byte)'\n';
+
+
+    /** Preferred encoding. */
+    private final static String PREFERRED_ENCODING = "UTF-8";
+
+
+    /** The 64 valid Base64 values. */
+    private final static byte[] ALPHABET;
+    private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
+    {
+        (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
+        (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
+        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
+        (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
+        (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
+        (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
+        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
+        (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
+        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
+        (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
+    };
+
+    /** Determine which ALPHABET to use. */
+    static
+    {
+        byte[] __bytes;
+        try
+        {
+            __bytes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".getBytes( PREFERRED_ENCODING );
+        }   // end try
+        catch (java.io.UnsupportedEncodingException use)
+        {
+            __bytes = _NATIVE_ALPHABET; // Fall back to native encoding
+        }   // end catch
+        ALPHABET = __bytes;
+    }   // end static
+
+
+    /**
+     * Translates a Base64 value to either its 6-bit reconstruction value
+     * or a negative number indicating some other meaning.
+     **/
+    private final static byte[] DECODABET =
+    {
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
+        -5,-5,                                      // Whitespace: Tab and Linefeed
+        -9,-9,                                      // Decimal 11 - 12
+        -5,                                         // Whitespace: Carriage Return
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
+        -9,-9,-9,-9,-9,                             // Decimal 27 - 31
+        -5,                                         // Whitespace: Space
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
+        62,                                         // Plus sign at decimal 43
+        -9,-9,-9,                                   // Decimal 44 - 46
+        63,                                         // Slash at decimal 47
+        52,53,54,55,56,57,58,59,60,61,              // Numbers zero through nine
+        -9,-9,-9,                                   // Decimal 58 - 60
+        -1,                                         // Equals sign at decimal 61
+        -9,-9,-9,                                      // Decimal 62 - 64
+        0,1,2,3,4,5,6,7,8,9,10,11,12,13,            // Letters 'A' through 'N'
+        14,15,16,17,18,19,20,21,22,23,24,25,        // Letters 'O' through 'Z'
+        -9,-9,-9,-9,-9,-9,                          // Decimal 91 - 96
+        26,27,28,29,30,31,32,33,34,35,36,37,38,     // Letters 'a' through 'm'
+        39,40,41,42,43,44,45,46,47,48,49,50,51,     // Letters 'n' through 'z'
+        -9,-9,-9,-9                                 // Decimal 123 - 126
+        /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 127 - 139
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
+    };
+
+    // I think I end up not using the BAD_ENCODING indicator.
+    //private final static byte BAD_ENCODING    = -9; // Indicates error in encoding
+    private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
+    private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+
+
+    /** Defeats instantiation. */
+    private MgBase64(){}
+
+
+
+/* ********  E N C O D I N G   M E T H O D S  ******** */
+
+
+    /**
+     * Encodes up to the first three bytes of array <var>threeBytes</var>
+     * and returns a four-byte array in Base64 notation.
+     * The actual number of significant bytes in your array is
+     * given by <var>numSigBytes</var>.
+     * The array <var>threeBytes</var> needs only be as big as
+     * <var>numSigBytes</var>.
+     * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
+     *
+     * @param b4 A reusable byte array to reduce array instantiation
+     * @param threeBytes the array to convert
+     * @param numSigBytes the number of significant bytes in your array
+     * @return four byte array in Base64 notation.
+     * @since 1.5.1
+     */
+    private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes )
+    {
+        encode3to4( threeBytes, 0, numSigBytes, b4, 0 );
+        return b4;
+    }   // end encode3to4
+
+
+    /**
+     * Encodes up to three bytes of the array <var>source</var>
+     * and writes the resulting four Base64 bytes to <var>destination</var>.
+     * The source and destination arrays can be manipulated
+     * anywhere along their length by specifying
+     * <var>srcOffset</var> and <var>destOffset</var>.
+     * This method does not check to make sure your arrays
+     * are large enough to accomodate <var>srcOffset</var> + 3 for
+     * the <var>source</var> array or <var>destOffset</var> + 4 for
+     * the <var>destination</var> array.
+     * The actual number of significant bytes in your array is
+     * given by <var>numSigBytes</var>.
+     *
+     * @param source the array to convert
+     * @param srcOffset the index where conversion begins
+     * @param numSigBytes the number of significant bytes in your array
+     * @param destination the array to hold the conversion
+     * @param destOffset the index where output will be put
+     * @return the <var>destination</var> array
+     * @since 1.3
+     */
+    private static byte[] encode3to4(
+     byte[] source, int srcOffset, int numSigBytes,
+     byte[] destination, int destOffset )
+    {
+        //           1         2         3
+        // 01234567890123456789012345678901 Bit position
+        // --------000000001111111122222222 Array position from threeBytes
+        // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
+        //          >>18  >>12  >> 6  >> 0  Right shift necessary
+        //                0x3f  0x3f  0x3f  Additional AND
+
+        // Create buffer with zero-padding if there are only one or two
+        // significant bytes passed in the array.
+        // We have to shift left 24 in order to flush out the 1's that appear
+        // when Java treats a value as negative that is cast from a byte to an int.
+        int inBuff =   ( numSigBytes > 0 ? ((source[ srcOffset     ] << 24) >>>  8) : 0 )
+                     | ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
+                     | ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
+
+        switch( numSigBytes )
+        {
+            case 3:
+                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
+                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
+                destination[ destOffset + 3 ] = ALPHABET[ (inBuff       ) & 0x3f ];
+                return destination;
+
+            case 2:
+                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
+                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
+                destination[ destOffset + 3 ] = EQUALS_SIGN;
+                return destination;
+
+            case 1:
+                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
+                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+                destination[ destOffset + 2 ] = EQUALS_SIGN;
+                destination[ destOffset + 3 ] = EQUALS_SIGN;
+                return destination;
+
+            default:
+                return destination;
+        }   // end switch
+    }   // end encode3to4
+
+
+
+    /**
+     * Serializes an object and returns the Base64-encoded
+     * version of that serialized object. If the object
+     * cannot be serialized or there is another error,
+     * the method will return <tt>null</tt>.
+     * The object is not GZip-compressed before being encoded.
+     *
+     * @param serializableObject The object to encode
+     * @return The Base64-encoded object
+     * @since 1.4
+     */
+    public static String encodeObject( java.io.Serializable serializableObject )
+    {
+        return encodeObject( serializableObject, NO_OPTIONS );
+    }   // end encodeObject
+
+
+
+    /**
+     * Serializes an object and returns the Base64-encoded
+     * version of that serialized object. If the object
+     * cannot be serialized or there is another error,
+     * the method will return <tt>null</tt>.
+     * <p>
+     * Valid options:<pre>
+     *   GZIP: gzip-compresses object before encoding it.
+     *   DONT_BREAK_LINES: don't break lines at 76 characters
+     *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+     * </pre>
+     * <p>
+     * Example: <code>encodeObject( myObj, Base64.GZIP )</code> or
+     * <p>
+     * Example: <code>encodeObject( myObj, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+     *
+     * @param serializableObject The object to encode
+     * @param options Specified options
+     * @return The Base64-encoded object
+     * @see Base64#GZIP
+     * @see Base64#DONT_BREAK_LINES
+     * @since 2.0
+     */
+    public static String encodeObject( java.io.Serializable serializableObject, int options )
+    {
+        // Streams
+        java.io.ByteArrayOutputStream  baos  = null;
+        java.io.OutputStream           b64os = null;
+        java.io.ObjectOutputStream     oos   = null;
+        java.util.zip.GZIPOutputStream gzos  = null;
+
+        // Isolate options
+        int gzip           = (options & GZIP);
+        int dontBreakLines = (options & DONT_BREAK_LINES);
+
+        try
+        {
+            // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
+            baos  = new java.io.ByteArrayOutputStream();
+            b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
+
+            // GZip?
+            if( gzip == GZIP )
+            {
+                gzos = new java.util.zip.GZIPOutputStream( b64os );
+                oos  = new java.io.ObjectOutputStream( gzos );
+            }   // end if: gzip
+            else
+                oos   = new java.io.ObjectOutputStream( b64os );
+
+            oos.writeObject( serializableObject );
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            e.printStackTrace();
+            return null;
+        }   // end catch
+        finally
+        {
+            try{ oos.close();   } catch( Exception e ){}
+            try{ gzos.close();  } catch( Exception e ){}
+            try{ b64os.close(); } catch( Exception e ){}
+            try{ baos.close();  } catch( Exception e ){}
+        }   // end finally
+
+        // Return value according to relevant encoding.
+        try
+        {
+            return new String( baos.toByteArray(), PREFERRED_ENCODING );
+        }   // end try
+        catch (java.io.UnsupportedEncodingException uue)
+        {
+            return new String( baos.toByteArray() );
+        }   // end catch
+
+    }   // end encode
+
+
+
+    /**
+     * Encodes a byte array into Base64 notation.
+     * Does not GZip-compress data.
+     *
+     * @param source The data to convert
+     * @since 1.4
+     */
+    public static String encodeBytes( byte[] source )
+    {
+        return encodeBytes( source, 0, source.length, NO_OPTIONS );
+    }   // end encodeBytes
+
+
+
+    /**
+     * Encodes a byte array into Base64 notation.
+     * <p>
+     * Valid options:<pre>
+     *   GZIP: gzip-compresses object before encoding it.
+     *   DONT_BREAK_LINES: don't break lines at 76 characters
+     *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+     * </pre>
+     * <p>
+     * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
+     * <p>
+     * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+     *
+     *
+     * @param source The data to convert
+     * @param options Specified options
+     * @see Base64#GZIP
+     * @see Base64#DONT_BREAK_LINES
+     * @since 2.0
+     */
+    public static String encodeBytes( byte[] source, int options )
+    {
+        return encodeBytes( source, 0, source.length, options );
+    }   // end encodeBytes
+
+
+    /**
+     * Encodes a byte array into Base64 notation.
+     * Does not GZip-compress data.
+     *
+     * @param source The data to convert
+     * @param off Offset in array where conversion should begin
+     * @param len Length of data to convert
+     * @since 1.4
+     */
+    public static String encodeBytes( byte[] source, int off, int len )
+    {
+        return encodeBytes( source, off, len, NO_OPTIONS );
+    }   // end encodeBytes
+
+
+
+    /**
+     * Encodes a byte array into Base64 notation.
+     * <p>
+     * Valid options:<pre>
+     *   GZIP: gzip-compresses object before encoding it.
+     *   DONT_BREAK_LINES: don't break lines at 76 characters
+     *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+     * </pre>
+     * <p>
+     * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
+     * <p>
+     * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+     *
+     *
+     * @param source The data to convert
+     * @param off Offset in array where conversion should begin
+     * @param len Length of data to convert
+     * @param options Specified options
+     * @see Base64#GZIP
+     * @see Base64#DONT_BREAK_LINES
+     * @since 2.0
+     */
+    public static String encodeBytes( byte[] source, int off, int len, int options )
+    {
+        // Isolate options
+        int dontBreakLines = ( options & DONT_BREAK_LINES );
+        int gzip           = ( options & GZIP   );
+
+        // Compress?
+        if( gzip == GZIP )
+        {
+            java.io.ByteArrayOutputStream  baos  = null;
+            java.util.zip.GZIPOutputStream gzos  = null;
+            MgBase64.OutputStream          b64os = null;
+
+
+            try
+            {
+                // GZip -> Base64 -> ByteArray
+                baos = new java.io.ByteArrayOutputStream();
+                b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
+                gzos  = new java.util.zip.GZIPOutputStream( b64os );
+
+                gzos.write( source, off, len );
+                gzos.close();
+            }   // end try
+            catch( java.io.IOException e )
+            {
+                e.printStackTrace();
+                return null;
+            }   // end catch
+            finally
+            {
+                try{ gzos.close();  } catch( Exception e ){}
+                try{ b64os.close(); } catch( Exception e ){}
+                try{ baos.close();  } catch( Exception e ){}
+            }   // end finally
+
+            // Return value according to relevant encoding.
+            try
+            {
+                return new String( baos.toByteArray(), PREFERRED_ENCODING );
+            }   // end try
+            catch (java.io.UnsupportedEncodingException uue)
+            {
+                return new String( baos.toByteArray() );
+            }   // end catch
+        }   // end if: compress
+
+        // Else, don't compress. Better not to use streams at all then.
+        else
+        {
+            // Convert option to boolean in way that code likes it.
+            boolean breakLines = dontBreakLines == 0;
+
+            int    len43   = len * 4 / 3;
+            byte[] outBuff = new byte[   ( len43 )                      // Main 4:3
+                                       + ( (len % 3) > 0 ? 4 : 0 )      // Account for padding
+                                       + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines
+            int d = 0;
+            int e = 0;
+            int len2 = len - 2;
+            int lineLength = 0;
+            for( ; d < len2; d+=3, e+=4 )
+            {
+                encode3to4( source, d+off, 3, outBuff, e );
+
+                lineLength += 4;
+                if( breakLines && lineLength == MAX_LINE_LENGTH )
+                {
+                    outBuff[e+4] = NEW_LINE;
+                    e++;
+                    lineLength = 0;
+                }   // end if: end of line
+            }   // en dfor: each piece of array
+
+            if( d < len )
+            {
+                encode3to4( source, d+off, len - d, outBuff, e );
+                e += 4;
+            }   // end if: some padding needed
+
+
+            // Return value according to relevant encoding.
+            try
+            {
+                return new String( outBuff, 0, e, PREFERRED_ENCODING );
+            }   // end try
+            catch (java.io.UnsupportedEncodingException uue)
+            {
+                return new String( outBuff, 0, e );
+            }   // end catch
+
+        }   // end else: don't compress
+
+    }   // end encodeBytes
+
+
+
+
+
+/* ********  D E C O D I N G   M E T H O D S  ******** */
+
+
+    /**
+     * Decodes four bytes from array <var>source</var>
+     * and writes the resulting bytes (up to three of them)
+     * to <var>destination</var>.
+     * The source and destination arrays can be manipulated
+     * anywhere along their length by specifying
+     * <var>srcOffset</var> and <var>destOffset</var>.
+     * This method does not check to make sure your arrays
+     * are large enough to accomodate <var>srcOffset</var> + 4 for
+     * the <var>source</var> array or <var>destOffset</var> + 3 for
+     * the <var>destination</var> array.
+     * This method returns the actual number of bytes that
+     * were converted from the Base64 encoding.
+     *
+     *
+     * @param source the array to convert
+     * @param srcOffset the index where conversion begins
+     * @param destination the array to hold the conversion
+     * @param destOffset the index where output will be put
+     * @return the number of decoded bytes converted
+     * @since 1.3
+     */
+    private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset )
+    {
+        // Example: Dk==
+        if( source[ srcOffset + 2] == EQUALS_SIGN )
+        {
+            // Two ways to do the same thing. Don't know which way I like best.
+            //int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] << 24 ) >>>  6 )
+            //              | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
+            int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] & 0xFF ) << 18 )
+                          | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
+
+            destination[ destOffset ] = (byte)( outBuff >>> 16 );
+            return 1;
+        }
+
+        // Example: DkL=
+        else if( source[ srcOffset + 3 ] == EQUALS_SIGN )
+        {
+            // Two ways to do the same thing. Don't know which way I like best.
+            //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
+            //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+            //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
+            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
+                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
+                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6 );
+
+            destination[ destOffset     ] = (byte)( outBuff >>> 16 );
+            destination[ destOffset + 1 ] = (byte)( outBuff >>>  8 );
+            return 2;
+        }
+
+        // Example: DkLE
+        else
+        {
+            try{
+            // Two ways to do the same thing. Don't know which way I like best.
+            //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
+            //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+            //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
+            //              | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
+            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
+                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
+                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6)
+                          | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF )      );
+
+
+            destination[ destOffset     ] = (byte)( outBuff >> 16 );
+            destination[ destOffset + 1 ] = (byte)( outBuff >>  8 );
+            destination[ destOffset + 2 ] = (byte)( outBuff       );
+
+            return 3;
+            }catch( Exception e){
+                System.out.println(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset     ] ]  ) );
+                System.out.println(""+source[srcOffset+1]+  ": " + ( DECODABET[ source[ srcOffset + 1 ] ]  ) );
+                System.out.println(""+source[srcOffset+2]+  ": " + ( DECODABET[ source[ srcOffset + 2 ] ]  ) );
+                System.out.println(""+source[srcOffset+3]+  ": " + ( DECODABET[ source[ srcOffset + 3 ] ]  ) );
+                return -1;
+            }   //e nd catch
+        }
+    }   // end decodeToBytes
+
+
+
+
+    /**
+     * Very low-level access to decoding ASCII characters in
+     * the form of a byte array. Does not support automatically
+     * gunzipping or any other "fancy" features.
+     *
+     * @param source The Base64 encoded data
+     * @param off    The offset of where to begin decoding
+     * @param len    The length of characters to decode
+     * @return decoded data
+     * @since 1.3
+     */
+    public static byte[] decode( byte[] source, int off, int len )
+    {
+        int    len34   = len * 3 / 4;
+        byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
+        int    outBuffPosn = 0;
+
+        byte[] b4        = new byte[4];
+        int    b4Posn    = 0;
+        int    i         = 0;
+        byte   sbiCrop   = 0;
+        byte   sbiDecode = 0;
+        for( i = off; i < off+len; i++ )
+        {
+            sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
+            sbiDecode = DECODABET[ sbiCrop ];
+
+            if( sbiDecode >= WHITE_SPACE_ENC ) // White space, Equals sign or better
+            {
+                if( sbiDecode >= EQUALS_SIGN_ENC )
+                {
+                    b4[ b4Posn++ ] = sbiCrop;
+                    if( b4Posn > 3 )
+                    {
+                        outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn );
+                        b4Posn = 0;
+
+                        // If that was the equals sign, break out of 'for' loop
+                        if( sbiCrop == EQUALS_SIGN )
+                            break;
+                    }   // end if: quartet built
+
+                }   // end if: equals sign or better
+
+            }   // end if: white space, equals sign or better
+            else
+            {
+                System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
+                return null;
+            }   // end else:
+        }   // each input character
+
+        byte[] out = new byte[ outBuffPosn ];
+        System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
+        return out;
+    }   // end decode
+
+
+
+
+    /**
+     * Decodes data from Base64 notation, automatically
+     * detecting gzip-compressed data and decompressing it.
+     *
+     * @param s the string to decode
+     * @return the decoded data
+     * @since 1.4
+     */
+    public static byte[] decode( String s )
+    {
+        byte[] bytes;
+        try
+        {
+            bytes = s.getBytes( PREFERRED_ENCODING );
+        }   // end try
+        catch( java.io.UnsupportedEncodingException uee )
+        {
+            bytes = s.getBytes();
+        }   // end catch
+        //</change>
+
+        // Decode
+        bytes = decode( bytes, 0, bytes.length );
+
+
+        // Check to see if it's gzip-compressed
+        // GZIP Magic Two-Byte Number: 0x8b1f (35615)
+        if( bytes != null && bytes.length >= 4 )
+        {
+
+            int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+            if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head )
+            {
+                java.io.ByteArrayInputStream  bais = null;
+                java.util.zip.GZIPInputStream gzis = null;
+                java.io.ByteArrayOutputStream baos = null;
+                byte[] buffer = new byte[2048];
+                int    length = 0;
+
+                try
+                {
+                    baos = new java.io.ByteArrayOutputStream();
+                    bais = new java.io.ByteArrayInputStream( bytes );
+                    gzis = new java.util.zip.GZIPInputStream( bais );
+
+                    while( ( length = gzis.read( buffer ) ) >= 0 )
+                    {
+                        baos.write(buffer,0,length);
+                    }   // end while: reading input
+
+                    // No error? Get new bytes.
+                    bytes = baos.toByteArray();
+
+                }   // end try
+                catch( java.io.IOException e )
+                {
+                    // Just return originally-decoded bytes
+                }   // end catch
+                finally
+                {
+                    try{ baos.close(); } catch( Exception e ){}
+                    try{ gzis.close(); } catch( Exception e ){}
+                    try{ bais.close(); } catch( Exception e ){}
+                }   // end finally
+
+            }   // end if: gzipped
+        }   // end if: bytes.length >= 2
+
+        return bytes;
+    }   // end decode
+
+
+
+
+    /**
+     * Attempts to decode Base64 data and deserialize a Java
+     * Object within. Returns <tt>null</tt> if there was an error.
+     *
+     * @param encodedObject The Base64 data to decode
+     * @return The decoded and deserialized object
+     * @since 1.5
+     */
+    public static Object decodeToObject( String encodedObject )
+    {
+        // Decode and gunzip if necessary
+        byte[] objBytes = decode( encodedObject );
+
+        java.io.ByteArrayInputStream  bais = null;
+        java.io.ObjectInputStream     ois  = null;
+        Object obj = null;
+
+        try
+        {
+            bais = new java.io.ByteArrayInputStream( objBytes );
+            ois  = new java.io.ObjectInputStream( bais );
+
+            obj = ois.readObject();
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            e.printStackTrace();
+            obj = null;
+        }   // end catch
+        catch( java.lang.ClassNotFoundException e )
+        {
+            e.printStackTrace();
+            obj = null;
+        }   // end catch
+        finally
+        {
+            try{ bais.close(); } catch( Exception e ){}
+            try{ ois.close();  } catch( Exception e ){}
+        }   // end finally
+
+        return obj;
+    }   // end decodeObject
+
+
+
+    /**
+     * Convenience method for encoding data to a file.
+     *
+     * @param dataToEncode byte array of data to encode in base64 form
+     * @param filename Filename for saving encoded data
+     * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+     *
+     * @since 2.1
+     */
+    public static boolean encodeToFile( byte[] dataToEncode, String filename )
+    {
+        boolean success = false;
+        MgBase64.OutputStream bos = null;
+        try
+        {
+            bos = new MgBase64.OutputStream(
+                      new java.io.FileOutputStream( filename ), MgBase64.ENCODE );
+            bos.write( dataToEncode );
+            success = true;
+        }   // end try
+        catch( java.io.IOException e )
+        {
+
+            success = false;
+        }   // end catch: IOException
+        finally
+        {
+            try{ bos.close(); } catch( Exception e ){}
+        }   // end finally
+
+        return success;
+    }   // end encodeToFile
+
+
+    /**
+     * Convenience method for decoding data to a file.
+     *
+     * @param dataToDecode Base64-encoded data as a string
+     * @param filename Filename for saving decoded data
+     * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+     *
+     * @since 2.1
+     */
+    public static boolean decodeToFile( String dataToDecode, String filename )
+    {
+        boolean success = false;
+        MgBase64.OutputStream bos = null;
+        try
+        {
+                bos = new MgBase64.OutputStream(
+                          new java.io.FileOutputStream( filename ), MgBase64.DECODE );
+                bos.write( dataToDecode.getBytes( PREFERRED_ENCODING ) );
+                success = true;
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            success = false;
+        }   // end catch: IOException
+        finally
+        {
+                try{ bos.close(); } catch( Exception e ){}
+        }   // end finally
+
+        return success;
+    }   // end decodeToFile
+
+
+
+
+    /**
+     * Convenience method for reading a base64-encoded
+     * file and decoding it.
+     *
+     * @param filename Filename for reading encoded data
+     * @return decoded byte array or null if unsuccessful
+     *
+     * @since 2.1
+     */
+    public static byte[] decodeFromFile( String filename )
+    {
+        byte[] decodedData = null;
+        MgBase64.InputStream bis = null;
+        try
+        {
+            // Set up some useful variables
+            java.io.File file = new java.io.File( filename );
+            byte[] buffer = null;
+            int length   = 0;
+            int numBytes = 0;
+
+            // Check for size of file
+            if( file.length() > Integer.MAX_VALUE )
+            {
+                System.err.println( "File is too big for this convenience method (" + file.length() + " bytes)." );
+                return null;
+            }   // end if: file too big for int index
+            buffer = new byte[ (int)file.length() ];
+
+            // Open a stream
+            bis = new MgBase64.InputStream(
+                      new java.io.BufferedInputStream(
+                      new java.io.FileInputStream( file ) ), MgBase64.DECODE );
+
+            // Read until done
+            while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
+                length += numBytes;
+
+            // Save in a variable to return
+            decodedData = new byte[ length ];
+            System.arraycopy( buffer, 0, decodedData, 0, length );
+
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            System.err.println( "Error decoding from file " + filename );
+        }   // end catch: IOException
+        finally
+        {
+            try{ bis.close(); } catch( Exception e) {}
+        }   // end finally
+
+        return decodedData;
+    }   // end decodeFromFile
+
+
+
+    /**
+     * Convenience method for reading a binary file
+     * and base64-encoding it.
+     *
+     * @param filename Filename for reading binary data
+     * @return base64-encoded string or null if unsuccessful
+     *
+     * @since 2.1
+     */
+    public static String encodeFromFile( String filename )
+    {
+        String encodedData = null;
+        MgBase64.InputStream bis = null;
+        try
+        {
+            // Set up some useful variables
+            java.io.File file = new java.io.File( filename );
+            byte[] buffer = new byte[ (int)(file.length() * 1.4) ];
+            int length   = 0;
+            int numBytes = 0;
+
+            // Open a stream
+            bis = new MgBase64.InputStream(
+                      new java.io.BufferedInputStream(
+                      new java.io.FileInputStream( file ) ), MgBase64.ENCODE );
+
+            // Read until done
+            while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
+                length += numBytes;
+
+            // Save in a variable to return
+            encodedData = new String( buffer, 0, length, MgBase64.PREFERRED_ENCODING );
+
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            System.err.println( "Error encoding from file " + filename );
+        }   // end catch: IOException
+        finally
+        {
+            try{ bis.close(); } catch( Exception e) {}
+        }   // end finally
+
+        return encodedData;
+        }   // end encodeFromFile
+
+
+
+
+    /* ********  I N N E R   C L A S S   I N P U T S T R E A M  ******** */
+
+
+
+    /**
+     * A {@link MgBase64.InputStream} will read data from another
+     * <tt>java.io.InputStream</tt>, given in the constructor,
+     * and encode/decode to/from MgBase64 notation on the fly.
+     *
+     * @see MgBase64
+     * @since 1.3
+     */
+    public static class InputStream extends java.io.FilterInputStream
+    {
+        private boolean encode;         // Encoding or decoding
+        private int     position;       // Current position in the buffer
+        private byte[]  buffer;         // Small buffer holding converted data
+        private int     bufferLength;   // Length of buffer (3 or 4)
+        private int     numSigBytes;    // Number of meaningful bytes in the buffer
+        private int     lineLength;
+        private boolean breakLines;     // Break lines at less than 80 characters
+
+
+        /**
+         * Constructs a {@link MgBase64.InputStream} in DECODE mode.
+         *
+         * @param in the <tt>java.io.InputStream</tt> from which to read data.
+         * @since 1.3
+         */
+        public InputStream( java.io.InputStream in )
+        {
+            this( in, DECODE );
+        }   // end constructor
+
+
+        /**
+         * Constructs a {@link MgBase64.InputStream} in
+         * either ENCODE or DECODE mode.
+         * <p>
+         * Valid options:<pre>
+         *   ENCODE or DECODE: Encode or Decode as data is read.
+         *   DONT_BREAK_LINES: don't break lines at 76 characters
+         *     (only meaningful when encoding)
+         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+         * </pre>
+         * <p>
+         * Example: <code>new MgBase64.InputStream( in, MgBase64.DECODE )</code>
+         *
+         *
+         * @param in the <tt>java.io.InputStream</tt> from which to read data.
+         * @param options Specified options
+         * @see MgBase64#ENCODE
+         * @see MgBase64#DECODE
+         * @see MgBase64#DONT_BREAK_LINES
+         * @since 2.0
+         */
+        public InputStream( java.io.InputStream in, int options )
+        {
+            super( in );
+            this.breakLines   = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
+            this.encode       = (options & ENCODE) == ENCODE;
+            this.bufferLength = encode ? 4 : 3;
+            this.buffer   = new byte[ bufferLength ];
+            this.position = -1;
+            this.lineLength = 0;
+        }   // end constructor
+
+        /**
+         * Reads enough of the input stream to convert
+         * to/from Base64 and returns the next byte.
+         *
+         * @return next byte
+         * @since 1.3
+         */
+        public int read() throws java.io.IOException
+        {
+            // Do we need to get data?
+            if( position < 0 )
+            {
+                if( encode )
+                {
+                    byte[] b3 = new byte[3];
+                    int numBinaryBytes = 0;
+                    for( int i = 0; i < 3; i++ )
+                    {
+                        try
+                        {
+                            int b = in.read();
+
+                            // If end of stream, b is -1.
+                            if( b >= 0 )
+                            {
+                                b3[i] = (byte)b;
+                                numBinaryBytes++;
+                            }   // end if: not end of stream
+
+                        }   // end try: read
+                        catch( java.io.IOException e )
+                        {
+                            // Only a problem if we got no data at all.
+                            if( i == 0 )
+                                throw e;
+
+                        }   // end catch
+                    }   // end for: each needed input byte
+
+                    if( numBinaryBytes > 0 )
+                    {
+                        encode3to4( b3, 0, numBinaryBytes, buffer, 0 );
+                        position = 0;
+                        numSigBytes = 4;
+                    }   // end if: got data
+                    else
+                    {
+                        return -1;
+                    }   // end else
+                }   // end if: encoding
+
+                // Else decoding
+                else
+                {
+                    byte[] b4 = new byte[4];
+                    int i = 0;
+                    for( i = 0; i < 4; i++ )
+                    {
+                        // Read four "meaningful" bytes:
+                        int b = 0;
+                        do{ b = in.read(); }
+                        while( b >= 0 && DECODABET[ b & 0x7f ] <= WHITE_SPACE_ENC );
+
+                        if( b < 0 )
+                            break; // Reads a -1 if end of stream
+
+                        b4[i] = (byte)b;
+                    }   // end for: each needed input byte
+
+                    if( i == 4 )
+                    {
+                        numSigBytes = decode4to3( b4, 0, buffer, 0 );
+                        position = 0;
+                    }   // end if: got four characters
+                    else if( i == 0 ){
+                        return -1;
+                    }   // end else if: also padded correctly
+                    else
+                    {
+                        // Must have broken out from above.
+                        throw new java.io.IOException( "Improperly padded Base64 input." );
+                    }   // end
+
+                }   // end else: decode
+            }   // end else: get data
+
+            // Got data?
+            if( position >= 0 )
+            {
+                // End of relevant data?
+                if( /*!encode &&*/ position >= numSigBytes )
+                    return -1;
+
+                if( encode && breakLines && lineLength >= MAX_LINE_LENGTH )
+                {
+                    lineLength = 0;
+                    return '\n';
+                }   // end if
+                else
+                {
+                    lineLength++;   // This isn't important when decoding
+                                    // but throwing an extra "if" seems
+                                    // just as wasteful.
+
+                    int b = buffer[ position++ ];
+
+                    if( position >= bufferLength )
+                        position = -1;
+
+                    return b & 0xFF; // This is how you "cast" a byte that's
+                                     // intended to be unsigned.
+                }   // end else
+            }   // end if: position >= 0
+
+            // Else error
+            else
+            {
+                // When JDK1.4 is more accepted, use an assertion here.
+                throw new java.io.IOException( "Error in Base64 code reading stream." );
+            }   // end else
+        }   // end read
+
+
+        /**
+         * Calls {@link #read()} repeatedly until the end of stream
+         * is reached or <var>len</var> bytes are read.
+         * Returns number of bytes read into array or -1 if
+         * end of stream is encountered.
+         *
+         * @param dest array to hold values
+         * @param off offset for array
+         * @param len max number of bytes to read into array
+         * @return bytes read into array or -1 if end of stream is encountered.
+         * @since 1.3
+         */
+        public int read( byte[] dest, int off, int len ) throws java.io.IOException
+        {
+            int i;
+            int b;
+            for( i = 0; i < len; i++ )
+            {
+                b = read();
+
+                //if( b < 0 && i == 0 )
+                //    return -1;
+
+                if( b >= 0 )
+                    dest[off + i] = (byte)b;
+                else if( i == 0 )
+                    return -1;
+                else
+                    break; // Out of 'for' loop
+            }   // end for: each byte read
+            return i;
+        }   // end read
+
+    }   // end inner class InputStream
+
+
+
+
+
+
+    /* ********  I N N E R   C L A S S   O U T P U T S T R E A M  ******** */
+
+
+
+    /**
+     * A {@link MgBase64.OutputStream} will write data to another
+     * <tt>java.io.OutputStream</tt>, given in the constructor,
+     * and encode/decode to/from Base64 notation on the fly.
+     *
+     * @see Base64
+     * @since 1.3
+     */
+    public static class OutputStream extends java.io.FilterOutputStream
+    {
+        private boolean encode;
+        private int     position;
+        private byte[]  buffer;
+        private int     bufferLength;
+        private int     lineLength;
+        private boolean breakLines;
+        private byte[]  b4; // Scratch used in a few places
+        private boolean suspendEncoding;
+
+        /**
+         * Constructs a {@link Base64.OutputStream} in ENCODE mode.
+         *
+         * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+         * @since 1.3
+         */
+        public OutputStream( java.io.OutputStream out )
+        {
+            this( out, ENCODE );
+        }   // end constructor
+
+
+        /**
+         * Constructs a {@link Base64.OutputStream} in
+         * either ENCODE or DECODE mode.
+         * <p>
+         * Valid options:<pre>
+         *   ENCODE or DECODE: Encode or Decode as data is read.
+         *   DONT_BREAK_LINES: don't break lines at 76 characters
+         *     (only meaningful when encoding)
+         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
+         * </pre>
+         * <p>
+         * Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
+         *
+         * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+         * @param options Specified options.
+         * @see Base64#ENCODE
+         * @see Base64#DECODE
+         * @see Base64#DONT_BREAK_LINES
+         * @since 1.3
+         */
+        public OutputStream( java.io.OutputStream out, int options )
+        {
+            super( out );
+            this.breakLines   = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
+            this.encode       = (options & ENCODE) == ENCODE;
+            this.bufferLength = encode ? 3 : 4;
+            this.buffer       = new byte[ bufferLength ];
+            this.position     = 0;
+            this.lineLength   = 0;
+            this.suspendEncoding = false;
+            this.b4           = new byte[4];
+        }   // end constructor
+
+
+        /**
+         * Writes the byte to the output stream after
+         * converting to/from Base64 notation.
+         * When encoding, bytes are buffered three
+         * at a time before the output stream actually
+         * gets a write() call.
+         * When decoding, bytes are buffered four
+         * at a time.
+         *
+         * @param theByte the byte to write
+         * @since 1.3
+         */
+        public void write(int theByte) throws java.io.IOException
+        {
+            // Encoding suspended?
+            if( suspendEncoding )
+            {
+                super.out.write( theByte );
+                return;
+            }   // end if: supsended
+
+            // Encode?
+            if( encode )
+            {
+                buffer[ position++ ] = (byte)theByte;
+                if( position >= bufferLength )  // Enough to encode.
+                {
+                    out.write( encode3to4( b4, buffer, bufferLength ) );
+
+                    lineLength += 4;
+                    if( breakLines && lineLength >= MAX_LINE_LENGTH )
+                    {
+                        out.write( NEW_LINE );
+                        lineLength = 0;
+                    }   // end if: end of line
+
+                    position = 0;
+                }   // end if: enough to output
+            }   // end if: encoding
+
+            // Else, Decoding
+            else
+            {
+                // Meaningful Base64 character?
+                if( DECODABET[ theByte & 0x7f ] > WHITE_SPACE_ENC )
+                {
+                    buffer[ position++ ] = (byte)theByte;
+                    if( position >= bufferLength )  // Enough to output.
+                    {
+                        int len = MgBase64.decode4to3( buffer, 0, b4, 0 );
+                        out.write( b4, 0, len );
+                        //out.write( MgBase64.decode4to3( buffer ) );
+                        position = 0;
+                    }   // end if: enough to output
+                }   // end if: meaningful base64 character
+                else if( DECODABET[ theByte & 0x7f ] != WHITE_SPACE_ENC )
+                {
+                    throw new java.io.IOException( "Invalid character in Base64 data." );
+                }   // end else: not white space either
+            }   // end else: decoding
+        }   // end write
+
+
+
+        /**
+         * Calls {@link #write(int)} repeatedly until <var>len</var>
+         * bytes are written.
+         *
+         * @param theBytes array from which to read bytes
+         * @param off offset for array
+         * @param len max number of bytes to read into array
+         * @since 1.3
+         */
+        public void write( byte[] theBytes, int off, int len ) throws java.io.IOException
+        {
+            // Encoding suspended?
+            if( suspendEncoding )
+            {
+                super.out.write( theBytes, off, len );
+                return;
+            }   // end if: supsended
+
+            for( int i = 0; i < len; i++ )
+            {
+                write( theBytes[ off + i ] );
+            }   // end for: each byte written
+
+        }   // end write
+
+
+
+        /**
+         * Method added by PHIL. [Thanks, PHIL. -Rob]
+         * This pads the buffer without closing the stream.
+         */
+        public void flushBase64() throws java.io.IOException
+        {
+            if( position > 0 )
+            {
+                if( encode )
+                {
+                    out.write( encode3to4( b4, buffer, position ) );
+                    position = 0;
+                }   // end if: encoding
+                else
+                {
+                    throw new java.io.IOException( "Base64 input not properly padded." );
+                }   // end else: decoding
+            }   // end if: buffer partially full
+
+        }   // end flush
+
+
+        /**
+         * Flushes and closes (I think, in the superclass) the stream.
+         *
+         * @since 1.3
+         */
+        public void close() throws java.io.IOException
+        {
+            // 1. Ensure that pending characters are written
+            flushBase64();
+
+            // 2. Actually close the stream
+            // Base class both flushes and closes.
+            super.close();
+
+            buffer = null;
+            out    = null;
+        }   // end close
+
+
+
+        /**
+         * Suspends encoding of the stream.
+         * May be helpful if you need to embed a piece of
+         * base640-encoded data in a stream.
+         *
+         * @since 1.5.1
+         */
+        public void suspendEncoding() throws java.io.IOException
+        {
+            flushBase64();
+            this.suspendEncoding = true;
+        }   // end suspendEncoding
+
+
+        /**
+         * Resumes encoding of the stream.
+         * May be helpful if you need to embed a piece of
+         * base640-encoded data in a stream.
+         *
+         * @since 1.5.1
+         */
+        public void resumeEncoding()
+        {
+            this.suspendEncoding = false;
+        }   // end resumeEncoding
+
+
+
+    }   // end inner class OutputStream
+
+
+}   // end class MgBase64

Added: sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java	                        (rev 0)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java	2012-11-23 05:19:53 UTC (rev 7216)
@@ -0,0 +1,154 @@
+/*
+  Copyright (C) 2004-2011 by Autodesk, Inc.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of version 2.1 of the GNU Lesser
+  General Public License as published by the Free Software Foundation.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+package org.osgeo.mapguide;
+
+import java.util.*;
+import java.io.*;
+
+public class MgLocalizer
+{
+    protected static String english = "en";
+    protected static String localizationPath = "";
+    protected static Hashtable languages = new Hashtable();
+
+    public static void SetLocalizedFilesPath(String path)
+    {
+        localizationPath = path;
+    }
+
+    public static String Localize(String text, String locale, int os)
+    {
+        String fontSuffix = (os==0? "Windows": (os==1? "Macintosh": "Linux"));
+        Hashtable sb = null;
+        try
+        {
+            sb = GetStringBundle(locale);
+        }
+        catch (Exception e)
+        {
+            return "";
+        }
+        int len = text.length();
+
+        for (int i = 0; i < len; )
+        {
+            int pos1 = text.indexOf("__#", i);
+            if (pos1 != -1)
+            {
+                int pos2 = text.indexOf("#__", pos1 + 3);
+                if (pos2 != -1)
+                {
+                    String id = text.substring(pos1 + 3, pos2);
+                    String locStr;
+                    locStr = (String)sb.get(id.equals("@font") || id.equals("@fontsize") ? id + fontSuffix : id);
+                    if (locStr == null)
+                        locStr = "";
+                    int locLen = locStr.length();
+
+                    String begin, end;
+                    if (pos1 > 0)
+                        begin = text.substring(0, pos1);
+                    else
+                        begin = "";
+                    end = text.substring(pos2 + 3);
+                    text = begin + locStr + end;
+
+                    len = len - 6 - id.length() + locLen;
+                    i = pos1 + locLen;
+                }
+                else
+                    i = len;
+            }
+            else
+                i = len;
+        }
+        return text;
+    }
+
+    public static String GetString(String id, String locale)
+    {
+        Hashtable sb = null;
+        try
+        {
+            sb = GetStringBundle(locale);
+        }
+        catch (Exception e)
+        {
+            return "";
+        }
+        String s = (String)sb.get(id);
+        if (s == null)
+            return "";
+        return s;
+    }
+
+    protected static Hashtable GetStringBundle(String locale)
+    {
+        if (locale.equals(""))
+            locale = english;
+        else
+            locale = locale.toLowerCase();
+
+        if (!languages.containsKey(locale))
+        {
+            BufferedReader in = null;
+            try
+            {
+                File f = new File(localizationPath + locale);
+                if (!f.exists())
+                {
+                    // requested locale is not supported, default to English
+                    if (languages.containsKey(english))
+                        return (Hashtable)languages.get(english);
+                    f = new File(localizationPath + english);
+                }
+                in = new BufferedReader(new InputStreamReader(new FileInputStream(f), "UTF-8"));
+                String line;
+                Hashtable sb = new Hashtable();
+                while ((line = in.readLine()) != null)
+                {
+                    line = line.trim();
+                    if (line.equals("") || line.charAt(0) == '#')
+                        continue;
+                    int sep = line.indexOf('=');
+                    if (sep == -1)
+                        continue;
+                    String key = line.substring(0, sep).trim();
+                    if (key.equals(""))
+                        continue;
+                    sb.put(key, line.substring(sep + 1).trim());
+                }
+                languages.put(locale, sb);
+            }
+            catch (Exception e)
+            {
+                return null;
+            }
+            finally
+            {
+                if (in != null)
+                {
+                    try { in.close(); }
+                    catch (Exception e) { }
+                }
+            }
+        }
+        return (Hashtable)languages.get(locale);
+    }
+
+}

Modified: sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln
===================================================================
--- sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln	2012-11-23 03:56:47 UTC (rev 7215)
+++ sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln	2012-11-23 05:19:53 UTC (rev 7216)
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CgiAgent", "CgiAgent\CgiAgent.vcxproj", "{DA3459C2-1430-499F-996F-218DA3DD755D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
@@ -60,6 +60,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebDotNetApi", "DotNetApi\Web\WebDotNetApi.vcxproj", "{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApiEx", "JavaApiEx\JavaApiEx.vcxproj", "{C02F44CB-D916-428D-A1A5-04E225A2A4EC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -308,6 +310,14 @@
 		{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}.Release|Win32.Build.0 = Release|Win32
 		{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}.Release|x64.ActiveCfg = Release|x64
 		{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}.Release|x64.Build.0 = Release|x64
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Win32.Build.0 = Debug|Win32
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.ActiveCfg = Debug|x64
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.Build.0 = Debug|x64
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.ActiveCfg = Release|Win32
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.Build.0 = Release|Win32
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
+		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE



More information about the mapguide-commits mailing list