[mapguide-commits] r7439 - in trunk/MgDev: . Desktop Desktop/DesktopUnmanagedApi Desktop/DesktopUnmanagedApi/DotNet Desktop/DesktopUnmanagedApi/JavaApiEx Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps Desktop/DesktopUnmanagedApi/JavaApiEx/org Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide Desktop/DesktopUnmanagedApi/MapGuideApi Desktop/MapViewer Desktop/MgAppLayout Desktop/MgDesktop/Services
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 3 03:49:56 PDT 2013
Author: jng
Date: 2013-04-03 03:49:56 -0700 (Wed, 03 Apr 2013)
New Revision: 7439
Added:
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/COPYRIGHT
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/DIFFERENCES.txt
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.rc
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj.user
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps/
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/catchall.code
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/getclassid.code
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/java.i
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/javaextensions.i
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgBase64.java
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/
trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/Constants.xml
trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml
Removed:
trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApi/
trunk/MgDev/Desktop/DesktopUnmanagedApi/swig_monolithic/
Modified:
trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile
trunk/MgDev/Desktop/MapViewer/IMapViewer.cs
trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs
trunk/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout
trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp
trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h
trunk/MgDev/Desktop/MgDesktopApi_VS2010.sln
trunk/MgDev/build_desktop.bat
trunk/MgDev/nuget_prepare.bat
Log:
mg-desktop updates:
- Add a new experimental Java wrapper API (MapGuideDesktopApi.jar). This has the same Java API trimmings and enhancements as what's stated in RFC129, using a mg-desktop tweaked version of the JavaApiEx web tier project and SWIG configuration files.
- Add source for a java test app to exercise some bits of the Java wrapper API
- Header cleanup on MgdScrollableFeatureReader
- Merge in r7437 and r7438
Modified: trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopMakefile 2013-04-03 10:49:56 UTC (rev 7439)
@@ -36,10 +36,13 @@
copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.dll $(OUTDIR)\OSGeo.MapGuide.Foundation.dll
copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.dll $(OUTDIR)\OSGeo.MapGuide.Geometry.dll
copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.dll $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll
+ copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.xml $(OUTDIR)\OSGeo.MapGuide.Foundation.xml
+ copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.xml $(OUTDIR)\OSGeo.MapGuide.Geometry.xml
+ copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.xml $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml
copy /Y SignMapGuideApi.exe $(OUTDIR)\SignMapGuideApi.exe
copy /Y maestroapi.key $(OUTDIR)\maestroapi.key
$(SIGNER) $(OUTDIR)
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Desktop.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(OUTDIR)\OSGeo.MapGuide.Desktop.Temp.dll
copy /Y $(WEB_BIN_DIR)\FoundationUnmanagedApi.dll $(OUTDIR)\FoundationUnmanagedApi.dll
copy /Y $(WEB_BIN_DIR)\GeometryUnmanagedApi.dll $(OUTDIR)\GeometryUnmanagedApi.dll
@@ -49,16 +52,23 @@
copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.dll
copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.dll
copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.dll
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Foundation.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Foundation.xml
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.xml
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.xml
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.xml
$(OUTDIR)\OSGeo.MapGuide.Desktop.dll:
echo target - OSGeo.MapGuide.Desktop.dll
copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.dll $(OUTDIR)\OSGeo.MapGuide.Foundation.dll
copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.dll $(OUTDIR)\OSGeo.MapGuide.Geometry.dll
copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.dll $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll
+ copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Foundation.xml $(OUTDIR)\OSGeo.MapGuide.Foundation.xml
+ copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.Geometry.xml $(OUTDIR)\OSGeo.MapGuide.Geometry.xml
+ copy /Y $(WEB_BIN_DIR)\OSGeo.MapGuide.PlatformBase.xml $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml
copy /Y SignMapGuideApi.exe $(OUTDIR)\SignMapGuideApi.exe
copy /Y maestroapi.key $(OUTDIR)\maestroapi.key
$(SIGNER) $(OUTDIR)
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Desktop.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Desktop.xml /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs .\Partials\*.cs
copy /Y $(WEB_BIN_DIR)\FoundationUnmanagedApi.dll $(OUTDIR)\FoundationUnmanagedApi.dll
copy /Y $(WEB_BIN_DIR)\GeometryUnmanagedApi.dll $(OUTDIR)\GeometryUnmanagedApi.dll
copy /Y $(WEB_BIN_DIR)\PlatformBaseUnmanagedApi.dll $(OUTDIR)\PlatformBaseUnmanagedApi.dll
@@ -66,4 +76,8 @@
copy /Y $(OUTDIR)\OSGeo.MapGuide.Foundation.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Foundation.dll
copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.dll
copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.dll
- copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.dll
\ No newline at end of file
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.dll $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.dll
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Foundation.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Foundation.xml
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Geometry.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Geometry.xml
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.PlatformBase.xml
+ copy /Y $(OUTDIR)\OSGeo.MapGuide.Desktop.xml $(ASSEMBLY_DIR)\OSGeo.MapGuide.Desktop.xml
\ No newline at end of file
Property changes on: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/COPYRIGHT
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/COPYRIGHT (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/COPYRIGHT 2013-04-03 10:49:56 UTC (rev 7439)
@@ -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: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/DIFFERENCES.txt
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/DIFFERENCES.txt (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/DIFFERENCES.txt 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,51 @@
+JavaApiEx differences from JavaApi
+==================================
+
+1. MgException/AppThrowable is no longer a checked exception
+
+AppThrowable now extends RuntimeException making it (and MgException and its subclasses) unchecked exceptions, all methods in the MapGuide API no longer have the (throws MgException) clause.
+
+2. Method names follow Java conventions
+
+All method names in the Java proxy classes are now in lowerCamelCase instead of the MapGuide-default UpperCamelCase
+
+ eg. Instead of this:
+
+ MgSiteConnection siteConn = new MgSiteConnection();
+ MgUserInformation userInfo = new MgUserInfomration(sessionId);
+ siteConn.Open(userInfo);
+ MgFeatureService featureSvc = (MgFeatureService)siteConn.CreateService(MgServiceType.FeatureService);
+ MgFeatureSchemaCollection schema = featureSvc.DescribeSchema(new MgResourceIdentifier("Library://Samples/Sheboygan/Data/Parcels.FeatureSource"), "SHP_Schema");
+
+ It is now this:
+
+ MgSiteConnection siteConn = new MgSiteConnection();
+ MgUserInformation userInfo = new MgUserInfomration(sessionId);
+ siteConn.open(userInfo); //Note the lowercase
+ MgFeatureService featureSvc = (MgFeatureService)siteConn.CreateService(MgServiceType.FeatureService);
+ MgFeatureSchemaCollection schema = featureSvc.describeSchema(new MgResourceIdentifier("Library://Samples/Sheboygan/Data/Parcels.FeatureSource"), "SHP_Schema"); //Note the lowercase
+
+3. The following MapGuide collection classes now implement java.util.Collection<T>:
+
+ - MgBatchPropertyCollection (T is MgPropertyCollection)
+ - MgClassDefinitionCollection (T is MgClassDefinition)
+ - MgFeatureSchemaCollection (T is MgFeatureSchema)
+ - MgPropertyCollection (T is MgProperty)
+ - MgStringCollection (T is String)
+
+4. The following classes now implement java.util.Iterable<T> allowing them to be used in an enhanced for-loop
+
+ - MgReadOnlyLayerCollection (T is MgLayerBase)
+
+5. To avoid naming conflicts with SWIG generated code and methods from inherited java classes or interfaces as a result of the above changes, the following class methods have been renamed in the Java MapGuide API:
+
+ - MgPropertyDefinition.Delete is now MgPropertyDefinition.markAsDeleted
+ - MgClassDefinition.Delete is now MgClassDefinition.markAsDeleted
+ - MgFeatureSchema.Delete is now MgFeatureSchema.markAsDeleted
+ - MgException.GetStackTrace is now MgException.getExceptionStackTrace
+ - MgBatchPropertyCollection.Add is now MgBatchPropertyCollection.addItem
+ - MgClassDefinitionCollection.Add is now MgClassDefinitionCollection.addItem
+ - MgFeatureSchemaCollection.Add is now MgFeatureSchemaCollection.addItem
+ - MgIntCollection.Add is now MgIntCollection.addItem
+ - MgPropertyCollection.Add is now MgPropertyCollection.addItem
+ - MgStringCollection.Add is now MgStringCollection.addItem
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.rc
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.rc (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.rc 2013-04-03 10:49:56 UTC (rev 7439)
@@ -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: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,279 @@
+<?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'">MapGuideDesktopApiJNId</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MapGuideDesktopApiJNId</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MapGuideDesktopApiJNI</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MapGuideDesktopApiJNI</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 -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -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 MapGuideDesktopApi -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 $(OutDir)\MapGuideDesktopApid.jar org\osgeo\mapguide\*.class
+echo Building -sources JAR file
+"$(JAVA_HOME)\bin\jar" cf $(OutDir)\MapGuideDesktopApid-sources.jar org\osgeo\mapguide\*.java</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\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>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\debug;..\..\lib\debug;..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\debug\$(TargetName).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 -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -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 MapGuideDesktopApi -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 $(OutDir)\MapGuideDesktopApid.jar org\osgeo\mapguide\*.class
+echo Building -sources JAR file
+"$(JAVA_HOME)\bin\jar" cf $(OutDir)\MapGuideDesktopApid-sources.jar org\osgeo\mapguide\*.java</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\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>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\debug64;..\..\lib\debug64;..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\debug64\$(TargetName).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 -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -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 MapGuideDesktopApi -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 $(OutDir)\MapGuideDesktopApi.jar org\osgeo\mapguide\*.class
+echo Building -sources JAR file
+"$(JAVA_HOME)\bin\jar" cf $(OutDir)\MapGuideDesktopApi-sources.jar org\osgeo\mapguide\*.java
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\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>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\release;..\..\lib\release;..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\release\$(TargetName).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 -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -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 MapGuideDesktopApi -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 $(OutDir)\MapGuideDesktopApi.jar org\osgeo\mapguide\*.class
+echo Building -sources JAR file
+"$(JAVA_HOME)\bin\jar" cf $(OutDir)\MapGuideDesktopApi-sources.jar org\osgeo\mapguide\*.java</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\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>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\release64;..\..\lib\release64;..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\release64\$(TargetName).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\PlatformBase\PlatformBase.vcxproj">
+ <Project>{f7334b1b-0efa-47e3-8e66-df158e61b7e4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj.user
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj.user (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj.user 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,469 @@
+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 -mgjavanothrow -mgjavacasing -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
+ $(JAVA_HOME)/bin/jar cf ../WEB-INF/lib/MapGuideApiEx-sources.jar org/osgeo/mapguide/*.java
Property changes on: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/TestApps/Test.java 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,98 @@
+import org.osgeo.mapguide.*;
+
+/**
+ *
+ * Compile with:
+ *
+ * $JAVAC -classpath .;$JARPATH Test.java
+ *
+ * Run with:
+ *
+ * $JAVA -classpath .;$JARPATH -Djava.library.path=$MGDESKTOPDIR Test
+ *
+ * Where:
+ *
+ * $JAVAC - Path to javac.exe (JDK must be same bitness as mg-desktop dlls)
+ * $JAVA - Path to java.exe (JDK must be same bitness as mg-desktop dlls)
+ * $MGDESKTOPDIR - Path to directory containing mg-desktop dlls
+ * $JARPATH - Path to MapGuideDesktopApi.jar, presumably $MGDESKTOPDIR
+ *
+ */
+
+public class Test
+{
+ public static void main(String[] args) {
+ MgdPlatform.initialize("Platform.ini");
+ MgdServiceFactory factory = new MgdServiceFactory();
+
+ MgFeatureService featSvc = (MgFeatureService)factory.createService(MgServiceType.FeatureService);
+ MgResourceService resSvc = (MgResourceService)factory.createService(MgServiceType.ResourceService);
+
+ System.out.print("Can we make a MgCoordinateSystem? ");
+
+ MgCoordinateSystemFactory csFactory = new MgCoordinateSystemFactory();
+ MgCoordinateSystem cs = csFactory.createFromCode("XY-M");
+ String srsWkt = csFactory.convertCoordinateSystemCodeToWkt("XY-M");
+ System.out.println("YES");
+
+ String scName = "Default";
+ MgResourceIdentifier fsId = new MgResourceIdentifier("Library://UnitTest/JavaApiTest.FeatureSource");
+ System.out.print("Can we make a Feature Source (" + fsId.toString() + ")? ");
+ MgFeatureSchema schema = new MgFeatureSchema("Default", "Test Schema");
+ MgClassDefinition klass = new MgClassDefinition();
+ klass.setName("TestClass");
+
+ MgPropertyDefinitionCollection clsProps = klass.getProperties();
+ MgPropertyDefinitionCollection idProps = klass.getIdentityProperties();
+
+ MgDataPropertyDefinition idProp = new MgDataPropertyDefinition("ID");
+ idProp.setDataType(MgPropertyType.Int32);
+ idProp.setAutoGeneration(true);
+ idProp.setNullable(false);
+
+ clsProps.addItem(idProp);
+ idProps.addItem(idProp);
+
+ MgDataPropertyDefinition nameProp = new MgDataPropertyDefinition("Name");
+ nameProp.setDataType(MgPropertyType.String);
+ nameProp.setLength(255);
+ nameProp.setNullable(true);
+
+ clsProps.addItem(nameProp);
+
+ MgGeometricPropertyDefinition geomProp = new MgGeometricPropertyDefinition("Geom");
+ geomProp.setGeometryTypes(MgFeatureGeometricType.Point | MgFeatureGeometricType.Curve | MgFeatureGeometricType.Surface);
+ geomProp.setSpatialContextAssociation(scName);
+
+ MgClassDefinitionCollection classes = schema.getClasses();
+ classes.addItem(klass);
+
+ MgFileFeatureSourceParams fsParams = new MgFileFeatureSourceParams("OSGeo.SQLite", scName, srsWkt, schema);
+ featSvc.createFeatureSource(fsId, fsParams);
+ System.out.println("YES");
+
+ System.out.print("Can we interrogate our created feature source? ");
+ MgFeatureSchemaCollection schemas = featSvc.describeSchema(fsId, "Default");
+ MgStringCollection classNames = new MgStringCollection();
+ classNames.addItem("TestClass");
+ schemas = featSvc.describeSchema(fsId, "Default", classNames);
+ try {
+ classNames.clear();
+ classNames.addItem("IDontExist");
+ schemas = featSvc.describeSchema(fsId, "Default", classNames);
+ } catch (MgException ex) {
+ }
+ System.out.println("YES");
+
+ System.out.println("Can we get the feature source XML?");
+ MgByteReader content = resSvc.getResourceContent(fsId);
+ System.out.println(content.toString());
+ System.out.println("YES");
+
+ System.out.print("Can we nuke this feature source from orbit? ");
+ resSvc.deleteResource(fsId);
+ System.out.println("YES");
+
+ MgdPlatform.terminate();
+ }
+}
\ No newline at end of file
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/catchall.code
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/catchall.code (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/catchall.code 2013-04-03 10:49:56 UTC (rev 7439)
@@ -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: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/getclassid.code
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/getclassid.code (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/getclassid.code 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,6 @@
+
+/* Get a class identifier from an Object instance */
+JNIEXPORT jint JNICALL Java_org_osgeo_mapguide_MapGuideDesktopApiJNI_getClassId(JNIEnv* jenv, jclass jcls, jlong jarg1)
+{
+ return ((MgObject*)(void*)jarg1)->GetClassId();
+}
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/java.i
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/java.i (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/java.i 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,98 @@
+//
+// 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"
+
+%include "javaextensions.i"
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/javaextensions.i
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/javaextensions.i (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/javaextensions.i 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,345 @@
+//
+// 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
+//
+
+//---------------------- Java interface decorations ------------------------------//
+
+//NOTE: If we're eventually targeting JDK7, change to AutoCloseable for automatic try-with-resources syntax support
+//%typemap(javainterfaces) MgReader "java.io.Closeable"
+//%typemap(javainterfaces) MgFeatureReader "java.io.Closeable"
+//%typemap(javainterfaces) MgDataReader "java.io.Closeable"
+//%typemap(javainterfaces) MgSqlDataReader "java.io.Closeable"
+//%typemap(javainterfaces) MgLongTransactionReader "java.io.Closeable"
+//%typemap(javainterfaces) MgSpatialContextReader "java.io.Closeable"
+
+//---------------------- Renames to avoid Java/C++ API clashes ---------------------------//
+
+//Already defined in Java Exception so rename our proxy method
+%rename(getExceptionStackTrace) MgException::GetStackTrace;
+
+//delete() is the name of the standard SWIG release method called on finalize(). Unfortunately this conflicts with
+//MgPropertyDefinition::Delete, MgClassDefinition::Delete and MgFeatureSchema::Delete when java proxy clases for these
+//classes are generated
+//
+//So rename the java proxies to these methods. This is the most minimally destructive change of all the available options
+//available to us
+%rename(markAsDeleted) MgPropertyDefinition::Delete;
+%rename(markAsDeleted) MgClassDefinition::Delete;
+%rename(markAsDeleted) MgFeatureSchema::Delete;
+
+//If we want to implement java.util.Collection, we need to rename this incompatible API (as add() is expected to
+//return boolean in the java.util.Collection API)
+%rename(addItem) MgBatchPropertyCollection::Add;
+%rename(addItem) MgClassDefinitionCollection::Add;
+%rename(addItem) MgFeatureSchemaCollection::Add;
+%rename(addItem) MgPropertyDefinitionCollection::Add;
+%rename(addItem) MgIntCollection::Add;
+%rename(addItem) MgPropertyCollection::Add;
+%rename(addItem) MgStringCollection::Add;
+%rename(addItem) MgLayerCollection::Add;
+%rename(addItem) MgLayerGroupCollection::Add;
+
+//This is a helper macro to implement the required APIs for collection items
+//
+//This could possibly apply to all proxy classes, but for now we're only interested in classes
+//that are part of any collection class that implements java.util.Collection. This is needed for
+//contains() and other container tests for equality to work
+//
+//Implementation borrowed from OGR swig java bindings
+%define IMPLEMENT_MG_ITEM_API(item_type)
+
+%typemap(javacode) item_type %{
+ public boolean equals(Object obj) {
+ boolean equal=false;
+ if(obj instanceof $javaclassname)
+ equal=((($javaclassname)obj).swigCPtr==this.swigCPtr);
+ return equal;
+ }
+
+ public int hashCode() {
+ return (int)swigCPtr;
+ }
+%}
+
+%enddef
+
+//This is a helper macro to implement the bulk of the java.util.Collection interface for any proxy class
+//that needs one
+//
+//Kinda like C++ templates for Java without the suck. And we all know how much Java generics suck :D
+//
+//TODO: Not sure if a SWIG macro can call into another SWIG macro, but if it can it should call into
+//the IMPLEMENT_MG_JAVA_ITERABLE_API
+%define IMPLEMENT_MG_JAVA_COLLECTION_API(collection_type, item_type)
+//Necessary imports
+%typemap(javaimports) collection_type %{
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+%}
+//Java Interfaces implemented by the java proxy class
+%typemap(javainterfaces) collection_type "Collection<item_type>"
+//This is the java.util.Collection implementation that is injected into each java proxy class
+%typemap(javacode) collection_type %{
+ /**
+ * An iterator to iterate over this collection
+ */
+ class ItemIterator implements Iterator<item_type> {
+ private collection_type _collection;
+ private int _pos;
+ private int _count;
+
+ public ItemIterator(collection_type c) {
+ _collection = c;
+ _count = _collection.getCount();
+ _pos = -1;
+ }
+
+ /**
+ * Returns true if the iteration has more elements
+ */
+ public boolean hasNext() {
+ return _pos + 1 < _count;
+ }
+
+ /**
+ * Returns the next item_type in the collection
+ */
+ public item_type next() {
+ _pos++;
+ if (_pos >= _count)
+ throw new NoSuchElementException();
+ return _collection.getItem(_pos);
+ }
+
+ /**
+ * Removes from the underlying collection the last element returned by the iterator (not supported).
+ */
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ /**
+ * Returns an iterator over the elements in this collection.
+ */
+ public Iterator<item_type> iterator() { return new ItemIterator(this); }
+
+ /**
+ * Ensures that this collection contains the specified element (optional operation).
+ */
+ public boolean add(item_type item) {
+ this.addItem(item);
+ return true;
+ }
+
+ /**
+ * Adds all of the elements in the specified collection to this collection (optional operation).
+ */
+ public boolean addAll(Collection<? extends item_type> c) {
+ int added = 0;
+ for (item_type item : c) {
+ this.addItem(item);
+ added++;
+ }
+ return added > 0;
+ }
+
+ /**
+ * Returns true if this collection contains the specified element.
+ */
+ public boolean contains(Object o) {
+ if (o instanceof item_type) {
+ return this.contains((item_type)o);
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if this collection contains all of the elements in the specified collection.
+ */
+ public boolean containsAll(Collection<?> c) {
+ for (Object o : c) {
+ if (!this.contains(o))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns true if this collection contains no elements.
+ */
+ public boolean isEmpty() { return this.getCount() == 0; }
+
+ /**
+ * Removes a single instance of the specified element from this collection, if it is present (optional operation).
+ */
+ public boolean remove(Object o) {
+ if (o instanceof item_type) {
+ return this.remove((item_type)o);
+ }
+ return false;
+ }
+
+ /**
+ * Removes all of this collection's elements that are also contained in the specified collection (optional operation).
+ */
+ public boolean removeAll(Collection<?> c) {
+ int removed = 0;
+ for (Object o : c) {
+ if (this.remove(o))
+ removed++;
+ }
+ return removed > 0;
+ }
+
+ /**
+ * Retains only the elements in this collection that are contained in the specified collection (optional operation).
+ */
+ public boolean retainAll(Collection<?> c) {
+ int removed = 0;
+ ArrayList<item_type> remove = new ArrayList<item_type>();
+ for (int i = 0; i < this.getCount(); i++) {
+ item_type item = this.getItem(i);
+ if (!c.contains(item))
+ remove.add(item);
+ }
+ if (remove.size() > 0) {
+ return this.removeAll(remove);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Returns the number of elements in this collection.
+ */
+ public int size() { return this.getCount(); }
+
+ /**
+ * Returns an array containing all of the elements in this collection.
+ */
+ public Object[] toArray() {
+ int count = this.getCount();
+ Object[] items = new Object[count];
+ for (int i = 0; i < count; i++) {
+ items[i] = this.getItem(i);
+ }
+ return items;
+ }
+
+ /**
+ * Returns an array containing all of the elements in this collection; the runtime type of the returned array is that of the specified array.
+ */
+ public <item_type> item_type[] toArray(item_type[] a) {
+ Object[] items = this.toArray();
+ if (a.length >= items.length) {
+ for (int i = 0; i < items.length; i++) {
+ a[i] = (item_type)items[i];
+ }
+ for (int i = items.length; i < a.length; i++) {
+ a[i] = null;
+ }
+ return a;
+ } else {
+ item_type[] retVal = (item_type[])java.lang.reflect.Array.newInstance(a.getClass().getComponentType(), items.length);
+ for (int i = 0; i < retVal.length; i++) {
+ retVal[i] = (item_type)items[i];
+ }
+ return retVal;
+ }
+ }
+
+%}
+%enddef
+
+//This helper macro implements the java.lang.Iterable API allowing the instance of the
+//java proxy to be used in an enhanced for loop (akin to IEnumerable/foreach in C#)
+%define IMPLEMENT_MG_JAVA_ITERABLE_API(collection_type, item_type)
+//Necessary imports
+%typemap(javaimports) collection_type %{
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+%}
+//Java Interfaces implemented by the java proxy class
+%typemap(javainterfaces) collection_type "java.lang.Iterable<item_type>"
+//This is the java.lang.Iterable<T> implementation that is injected into each java proxy class
+%typemap(javacode) collection_type %{
+ /**
+ * An iterator to iterate over this collection
+ */
+ class ItemIterator implements Iterator<item_type> {
+ private collection_type _collection;
+ private int _pos;
+ private int _count;
+
+ public ItemIterator(collection_type c) {
+ _collection = c;
+ _count = _collection.getCount();
+ _pos = -1;
+ }
+
+ /**
+ * Returns true if the iteration has more elements
+ */
+ public boolean hasNext() {
+ return _pos + 1 < _count;
+ }
+
+ /**
+ * Returns the next item_type in the collection
+ */
+ public item_type next() {
+ _pos++;
+ if (_pos >= _count)
+ throw new NoSuchElementException();
+ return _collection.getItem(_pos);
+ }
+
+ /**
+ * Removes from the underlying collection the last element returned by the iterator (not supported).
+ */
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ /**
+ * Returns an iterator over the elements in this collection.
+ */
+ public Iterator<item_type> iterator() { return new ItemIterator(this); }
+
+%}
+%enddef
+
+//Plug the stock implementation for our MapGuide collection and item classes
+IMPLEMENT_MG_ITEM_API(MgClassDefinition)
+IMPLEMENT_MG_ITEM_API(MgFeatureSchema)
+IMPLEMENT_MG_ITEM_API(MgPropertyDefinition)
+IMPLEMENT_MG_ITEM_API(MgProperty)
+IMPLEMENT_MG_ITEM_API(MgLayerBase)
+IMPLEMENT_MG_ITEM_API(MgLayerGroup)
+
+//IMPLEMENT_MG_JAVA_COLLECTION_API(MgBatchPropertyCollection, MgPropertyCollection)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgClassDefinitionCollection, MgClassDefinition)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgFeatureSchemaCollection, MgFeatureSchema)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgPropertyDefinitionCollection, MgPropertyDefinition)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgPropertyCollection, MgProperty)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgStringCollection, String)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgLayerCollection, MgLayerBase)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgLayerGroupCollection, MgLayerGroup)
+IMPLEMENT_MG_JAVA_ITERABLE_API(MgReadOnlyLayerCollection, MgLayerBase)
\ No newline at end of file
Property changes on: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/AppThrowable.java (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/AppThrowable.java 2013-04-03 10:49:56 UTC (rev 7439)
@@ -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 RuntimeException
+{
+ 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).getExceptionStackTrace());
+ }
+ catch (MgException e)
+ {
+ }
+ }
+
+ public void delete()
+ {
+ //implemented by derived classes
+ }
+}
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgBase64.java
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgBase64.java (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgBase64.java 2013-04-03 10:49:56 UTC (rev 7439)
@@ -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: trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java 2013-04-03 10:49:56 UTC (rev 7439)
@@ -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);
+ }
+
+}
Property changes on: trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/Constants.xml
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/Constants.xml (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/Constants.xml 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Parameters>
+
+<!--
+ Type replacements.
+-->
+<PHPTypeReplacements>
+ <TypeReplacement oldtype="STRING" newtype="" />
+ <TypeReplacement oldtype="INT8" newtype="" />
+ <TypeReplacement oldtype="INT16" newtype="" />
+ <TypeReplacement oldtype="INT32" newtype="" />
+ <TypeReplacement oldtype="int" newtype="" />
+ <TypeReplacement oldtype="float" newtype="" />
+ <TypeReplacement oldtype="double" newtype="" />
+ <TypeReplacement oldtype="static" newtype="" />
+ <TypeReplacement oldtype="bool" newtype="" />
+</PHPTypeReplacements>
+<CSharpTypeReplacements>
+ <TypeReplacement oldtype="STRING" newtype="string" />
+ <TypeReplacement oldtype="INT8" newtype="byte" />
+ <TypeReplacement oldtype="INT16" newtype="short" />
+ <TypeReplacement oldtype="INT32" newtype="int" />
+ <TypeReplacement oldtype="int" newtype="int" />
+ <TypeReplacement oldtype="float" newtype="float" />
+ <TypeReplacement oldtype="double" newtype="double" />
+ <TypeReplacement oldtype="static" newtype="" />
+ <TypeReplacement oldtype="const" newtype="const" />
+</CSharpTypeReplacements>
+<JavaTypeReplacements>
+ <TypeReplacement oldtype="STRING" newtype="String" />
+ <TypeReplacement oldtype="INT8" newtype="short" />
+ <TypeReplacement oldtype="INT16" newtype="short" />
+ <TypeReplacement oldtype="INT32" newtype="int" />
+ <TypeReplacement oldtype="int" newtype="int" />
+ <TypeReplacement oldtype="float" newtype="float" />
+ <TypeReplacement oldtype="double" newtype="double" />
+ <TypeReplacement oldtype="const" newtype="final" />
+ <TypeReplacement oldtype="bool" newtype="boolean" />
+</JavaTypeReplacements>
+
+<!--
+ Inline section.
+-->
+<Inline>
+//
+// 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
+//
+</Inline>
+
+<Namespace>OSGeo.MapGuide</Namespace>
+<Package>org.osgeo.mapguide</Package>
+
+<Classes>
+ <Class name="MgServiceType" />
+ <Class name="MgUser" />
+ <Class name="MgGroup" />
+ <Class name="MgRole" />
+ <Class name="MgRepositoryType" />
+ <Class name="MgResourceType" />
+ <Class name="MgResourceTag" />
+ <Class name="MgResourceDataName" />
+ <Class name="MgResourceDataType" />
+ <Class name="MgResourcePermission" />
+ <Class name="MgMimeType" />
+ <Class name="MgPropertyType" />
+ <Class name="MgPageUnitsType" />
+ <Class name="MgCoordinateSpace" />
+ <Class name="MgGeometryEntityType" />
+ <Class name="MgCoordinateDimension" />
+ <Class name="MgGeometricPathInstructionType" />
+ <Class name="MgGeometryType" />
+ <Class name="MgGeometryComponentType" />
+ <Class name="MgLayerGroupType" />
+ <Class name="MgLayerType" />
+ <Class name="MgFeatureGeometricType" />
+ <Class name="MgReaderType" />
+ <Class name="MgOrderingOption" />
+ <Class name="MgFeatureSpatialOperations" />
+ <Class name="MgFeatureCommandType" />
+ <Class name="MgFeaturePropertyType" />
+ <Class name="MgObjectPropertyType" />
+ <Class name="MgParameterDirection" />
+ <Class name="MgSpatialContextExtentType" />
+ <Class name="MgConfigProperties" />
+ <Class name="MgLogFileType" />
+ <Class name="MgServerInformationProperties" />
+ <Class name="MgCoordinateSystemCodeFormat" />
+ <Class name="MgCoordinateSystemErrorCode" />
+ <Class name="MgCoordinateSystemGeodeticTransformationMethod" />
+ <Class name="MgCoordinateSystemGridOrientation" />
+ <Class name="MgCoordinateSystemGridSpecializationType" />
+ <Class name="MgCoordinateSystemMgrsGridLevel" />
+ <Class name="MgCoordinateSystemMgrsLetteringScheme" />
+ <Class name="MgCoordinateSystemMgrsGridSquarePosition" />
+ <Class name="MgCoordinateSystemProjectionCode" />
+ <Class name="MgCoordinateSystemProjectionFormatType" />
+ <Class name="MgCoordinateSystemProjectionLogicalType" />
+ <Class name="MgCoordinateSystemProjectionParameterType" />
+ <Class name="MgCoordinateSystemType" />
+ <Class name="MgCoordinateSystemUnitCode" />
+ <Class name="MgCoordinateSystemUnitType" />
+ <Class name="MgCoordinateSystemWktFlavor" />
+ <Class name="MgCoordinateSystemGeodeticTransformDefType" />
+ <Class name="MgCoordinateSystemGeodeticAnalyticalTransformationMethod" />
+ <Class name="MgCoordinateSystemGeodeticMultipleRegressionTransformationMethod" />
+ <Class name="MgCoordinateSystemGeodeticTransformGridFileFormat" />
+ <Class name="MgMapPlotInstruction" />
+ <Class name="MgUnitType" />
+ <Class name="MgPackageStatus" />
+ <Class name="MgRasterDataModelType" />
+</Classes>
+
+<!--
+ C++ Headers section. If you add headers to this section then you
+ must also add them to Makefile.am in the JavaApi and PhpApi folders.
+-->
+<Headers>
+
+ <!-- API -->
+
+ <Header path="../../../Common/Foundation/Data/FeaturePropertyType.h" />
+ <Header path="../../../Common/Foundation/Data/MimeType.h" />
+ <Header path="../../../Common/Foundation/Data/PropertyType.h" />
+
+ <Header path="../../../Common/PlatformBase/MapLayer/LayerGroupType.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/LayerType.h" />
+ <Header path="../../../Common/PlatformBase/Services/BaseServiceDefs.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureCommandType.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureGeometricType.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureSpatialOperations.h" />
+ <Header path="../../../Common/PlatformBase/Services/ObjectPropertyType.h" />
+ <Header path="../../../Common/PlatformBase/Services/OrderingOption.h" />
+ <Header path="../../../Common/PlatformBase/Services/ParameterDirection.h" />
+ <Header path="../../../Common/PlatformBase/Services/RasterTypes.h" />
+ <Header path="../../../Common/PlatformBase/Services/ReaderType.h" />
+ <Header path="../../../Common/PlatformBase/Services/ResourceDefs.h" />
+ <Header path="../../../Common/PlatformBase/Services/SpatialContextExtentType.h" />
+
+ <Header path="../../../Common/Geometry/CoordinateDimension.h" />
+ <Header path="../../../Common/Geometry/GeometricEntityType.h" />
+ <Header path="../../../Common/Geometry/GeometricPathInstructionType.h" />
+ <Header path="../../../Common/Geometry/GeometryComponentType.h" />
+ <Header path="../../../Common/Geometry/GeometryType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h" />
+
+</Headers>
+
+</Parameters>
Added: trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml (rev 0)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/MapGuideApi/MapGuideApiGen.xml 2013-04-03 10:49:56 UTC (rev 7439)
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Parameters>
+<!--
+ Module section.
+-->
+<Module name="MapGuideApi" />
+
+<!--
+ Target section.
+-->
+<Target path="./MapGuideApi.i" />
+<DocTarget path="./MapGuideApi_Doc.i" />
+
+<!--
+ C++ inline section.
+-->
+<CppInline>
+#ifdef _WIN32
+#pragma warning(disable: 4251)
+#endif
+
+#include <string>
+#include <map>
+
+#include "Foundation.h"
+#include "GeometryCommon.h"
+#include "MgDesktop.h"
+
+#if defined(PHP) || defined(JAVA)
+typedef std::wstring STRINGPARAM;
+#else
+typedef wchar_t* STRINGPARAM;
+#endif
+</CppInline>
+
+<!--
+ Type replacements.
+-->
+<TypeReplacements>
+ <TypeReplacement oldtype="CREFSTRING" newtype="STRINGPARAM" />
+ <TypeReplacement oldtype="INT64" newtype="long long" />
+</TypeReplacements>
+
+<!--
+ Swig inline section.
+-->
+<SwigInline>
+ %include "MapGuideApi_Doc.i" //translated doxygen fragments
+ %include "language.i" //typemaps specific for each language
+ %include "../../../Common/Foundation/System/FoundationClassId.h"
+ %include "../../../Common/Geometry/GeometryClassId.h"
+ %include "../../../Common/PlatformBase/Services/PlatformBaseClassId.h"
+ %include "../../MgDesktop/System/ClassId.h"
+
+#if defined(PHPSWIG)
+ // We force UTF-8 encoding for PHP
+ typedef char* STRINGPARAM;
+ typedef char* STRING;
+ typedef char* BYTE_ARRAY_IN;
+ typedef char* BYTE_ARRAY_OUT;
+ typedef unsigned char BYTE;
+#elseif defined(JAVA)
+ typedef std::wstring STRINGPARAM;
+ typedef signed char BYTE; //mapped to byte in Java
+#else // .Net
+ typedef char* BYTE_ARRAY_IN;
+ typedef char* BYTE_ARRAY_OUT;
+ typedef unsigned char BYTE; //mapped to byte in C#
+#endif
+
+ typedef int STATUS;
+ typedef short INT8;
+ typedef short INT16;
+ typedef int INT32;
+ typedef int UINT32;
+
+</SwigInline>
+
+<!--
+ C++ Headers section. If you add headers to this section then you
+ must also add them to Makefile.am in the JavaApi and PhpApi folders.
+-->
+<Headers>
+
+ <!-- Foundation classes -->
+
+ <Header path="../../../Common/Foundation/System/Object.h" />
+ <Header path="../../../Common/Foundation/System/Disposable.h" />
+ <Header path="../../../Common/Foundation/System/GuardDisposable.h" />
+ <Header path="../../../Common/Foundation/System/Serializable.h" />
+ <Header path="../../../Common/Foundation/System/NamedSerializable.h" />
+
+ <Header path="../../../Common/Foundation/Data/Collection.h" />
+ <Header path="../../../Common/Foundation/Data/Property.h" />
+
+ <!-- The MgDisposableCollection depends on the MgCollection above and so must come after it -->
+ <Header path="../../../Common/Foundation/System/DisposableCollection.h" />
+
+ <Header path="../../../Common/Foundation/Data/BatchPropertyCollection.h" />
+ <Header path="../../../Common/Foundation/Data/ByteReader.h" />
+ <Header path="../../../Common/Foundation/Data/ByteSink.h" />
+ <Header path="../../../Common/Foundation/Data/ByteSource.h" />
+ <Header path="../../../Common/Foundation/Data/DateTime.h" />
+ <Header path="../../../Common/Foundation/Data/NullableProperty.h" />
+ <Header path="../../../Common/Foundation/Data/PropertyCollection.h" />
+ <Header path="../../../Common/Foundation/Data/PropertyDefinition.h" />
+ <Header path="../../../Common/Foundation/Data/StringCollection.h" />
+ <Header path="../../../Common/Foundation/Data/StringProperty.h" />
+
+ <Header path="../../../Common/Foundation/Exception/Exception.h" />
+ <Header path="../../../Common/Foundation/Exception/SystemException.h" />
+ <Header path="../../../Common/Foundation/Exception/IoException.h" />
+ <Header path="../../../Common/Foundation/Exception/FileIoException.h" />
+ <Header path="../../../Common/Foundation/Exception/StreamIoException.h" />
+ <Header path="../../../Common/Foundation/Exception/OutOfRangeException.h" />
+
+ <Header path="../../../Common/Foundation/Exception/ApplicationException.h" />
+ <Header path="../../../Common/Foundation/Exception/ArgumentOutOfRangeException.h" />
+ <Header path="../../../Common/Foundation/Exception/ClassNotFoundException.h" />
+ <Header path="../../../Common/Foundation/Exception/ConfigurationException.h" />
+ <Header path="../../../Common/Foundation/Exception/ConfigurationLoadFailedException.h" />
+ <Header path="../../../Common/Foundation/Exception/ConfigurationSaveFailedException.h" />
+ <Header path="../../../Common/Foundation/Exception/DateTimeException.h" />
+ <Header path="../../../Common/Foundation/Exception/DecryptionException.h" />
+ <Header path="../../../Common/Foundation/Exception/DirectoryNotFoundException.h" />
+ <Header path="../../../Common/Foundation/Exception/DivideByZeroException.h" />
+ <Header path="../../../Common/Foundation/Exception/DomainException.h" />
+ <Header path="../../../Common/Foundation/Exception/DuplicateDirectoryException.h" />
+ <Header path="../../../Common/Foundation/Exception/DuplicateFileException.h" />
+ <Header path="../../../Common/Foundation/Exception/DuplicateObjectException.h" />
+ <Header path="../../../Common/Foundation/Exception/EncryptionException.h" />
+ <Header path="../../../Common/Foundation/Exception/FileNotFoundException.h" />
+ <Header path="../../../Common/Foundation/Exception/IndexOutOfRangeException.h" />
+ <Header path="../../../Common/Foundation/Exception/InvalidArgumentException.h" />
+ <Header path="../../../Common/Foundation/Exception/InvalidCastException.h" />
+ <Header path="../../../Common/Foundation/Exception/InvalidOperationException.h" />
+ <Header path="../../../Common/Foundation/Exception/InvalidPropertyTypeException.h" />
+ <Header path="../../../Common/Foundation/Exception/InvalidStreamHeaderException.h" />
+ <Header path="../../../Common/Foundation/Exception/LengthException.h" />
+ <Header path="../../../Common/Foundation/Exception/LogicException.h" />
+ <Header path="../../../Common/Foundation/Exception/NotFiniteNumberException.h" />
+ <Header path="../../../Common/Foundation/Exception/NotImplementedException.h" />
+ <Header path="../../../Common/Foundation/Exception/NullArgumentException.h" />
+ <Header path="../../../Common/Foundation/Exception/NullPropertyValueException.h" />
+ <Header path="../../../Common/Foundation/Exception/NullReferenceException.h" />
+ <Header path="../../../Common/Foundation/Exception/ObjectNotFoundException.h" />
+ <Header path="../../../Common/Foundation/Exception/OutOfMemoryException.h" />
+ <Header path="../../../Common/Foundation/Exception/OverflowException.h" />
+ <Header path="../../../Common/Foundation/Exception/PlatformNotSupportedException.h" />
+ <Header path="../../../Common/Foundation/Exception/ResourcesException.h" />
+ <Header path="../../../Common/Foundation/Exception/ResourcesLoadFailedException.h" />
+ <Header path="../../../Common/Foundation/Exception/RuntimeException.h" />
+ <Header path="../../../Common/Foundation/Exception/TemporaryFileNotAvailableException.h" />
+ <Header path="../../../Common/Foundation/Exception/ThirdPartyException.h" />
+ <Header path="../../../Common/Foundation/Exception/UnclassifiedException.h" />
+ <Header path="../../../Common/Foundation/Exception/UnderflowException.h" />
+ <Header path="../../../Common/Foundation/Exception/XmlException.h" />
+ <Header path="../../../Common/Foundation/Exception/XmlParserException.h" />
+
+ <!-- Geometry classes -->
+
+ <Header path="../../../Common/Geometry/GeometricEntity.h" />
+ <Header path="../../../Common/Geometry/Geometry.h" />
+ <Header path="../../../Common/Geometry/GeometryComponent.h" />
+ <Header path="../../../Common/Geometry/Curve.h" />
+ <Header path="../../../Common/Geometry/CurveSegment.h" />
+ <Header path="../../../Common/Geometry/Ring.h" />
+ <Header path="../../../Common/Geometry/Region.h" />
+
+ <Header path="../../../Common/Geometry/AgfReaderWriter.h" />
+ <Header path="../../../Common/Geometry/AggregateGeometry.h" />
+ <Header path="../../../Common/Geometry/ArcSegment.h" />
+ <Header path="../../../Common/Geometry/Coordinate.h" />
+ <Header path="../../../Common/Geometry/CoordinateCollection.h" />
+ <Header path="../../../Common/Geometry/CoordinateIterator.h" />
+ <Header path="../../../Common/Geometry/CoordinateXY.h" />
+ <Header path="../../../Common/Geometry/CoordinateXYM.h" />
+ <Header path="../../../Common/Geometry/CoordinateXYZ.h" />
+ <Header path="../../../Common/Geometry/CoordinateXYZM.h" />
+ <Header path="../../../Common/Geometry/CurvePolygon.h" />
+ <Header path="../../../Common/Geometry/CurvePolygonCollection.h" />
+ <Header path="../../../Common/Geometry/CurveRing.h" />
+ <Header path="../../../Common/Geometry/CurveRingCollection.h" />
+ <Header path="../../../Common/Geometry/CurveSegmentCollection.h" />
+ <Header path="../../../Common/Geometry/CurveString.h" />
+ <Header path="../../../Common/Geometry/CurveStringCollection.h" />
+ <Header path="../../../Common/Geometry/Envelope.h" />
+ <Header path="../../../Common/Geometry/GeometryCollection.h" />
+ <Header path="../../../Common/Geometry/GeometryFactory.h" />
+ <Header path="../../../Common/Geometry/LinearRing.h" />
+ <Header path="../../../Common/Geometry/LinearRingCollection.h" />
+ <Header path="../../../Common/Geometry/LinearSegment.h" />
+ <Header path="../../../Common/Geometry/LineString.h" />
+ <Header path="../../../Common/Geometry/LineStringCollection.h" />
+ <Header path="../../../Common/Geometry/Measure.h" />
+ <Header path="../../../Common/Geometry/MultiCurvePolygon.h" />
+ <Header path="../../../Common/Geometry/MultiCurveString.h" />
+ <Header path="../../../Common/Geometry/MultiGeometry.h" />
+ <Header path="../../../Common/Geometry/MultiLineString.h" />
+ <Header path="../../../Common/Geometry/MultiPoint.h" />
+ <Header path="../../../Common/Geometry/MultiPolygon.h" />
+ <Header path="../../../Common/Geometry/Point.h" />
+ <Header path="../../../Common/Geometry/PointCollection.h" />
+ <Header path="../../../Common/Geometry/Polygon.h" />
+ <Header path="../../../Common/Geometry/PolygonCollection.h" />
+ <Header path="../../../Common/Geometry/Transform.h" />
+ <Header path="../../../Common/Geometry/WktReaderWriter.h" />
+
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystem.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryBase.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h" />
+ <Header path="../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h" />
+
+ <Header path="../../../Common/Geometry/Exception/CoordinateSystemComputationFailedException.h" />
+ <Header path="../../../Common/Geometry/Exception/CoordinateSystemConversionFailedException.h" />
+ <Header path="../../../Common/Geometry/Exception/CoordinateSystemInitializationFailedException.h" />
+ <Header path="../../../Common/Geometry/Exception/CoordinateSystemLoadFailedException.h" />
+ <Header path="../../../Common/Geometry/Exception/CoordinateSystemMeasureFailedException.h" />
+ <Header path="../../../Common/Geometry/Exception/CoordinateSystemTransformFailedException.h" />
+ <Header path="../../../Common/Geometry/Exception/GeometryException.h" />
+ <Header path="../../../Common/Geometry/Exception/InvalidCoordinateSystemException.h" />
+ <Header path="../../../Common/Geometry/Exception/InvalidCoordinateSystemTypeException.h" />
+ <Header path="../../../Common/Geometry/Exception/InvalidCoordinateSystemUnitsException.h" />
+
+ <!-- PlatformBase classes -->
+
+ <Header path="../../../Common/PlatformBase/Data/BlobProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/BooleanProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/ByteProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/ClobProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/Color.h" />
+ <Header path="../../../Common/PlatformBase/Data/DateTimeProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/DoubleProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/Int16Property.h" />
+ <Header path="../../../Common/PlatformBase/Data/Int32Property.h" />
+ <Header path="../../../Common/PlatformBase/Data/Int64Property.h" />
+ <Header path="../../../Common/PlatformBase/Data/IntCollection.h" />
+ <Header path="../../../Common/PlatformBase/Data/PropertyDefinitionCollection.h" />
+ <Header path="../../../Common/PlatformBase/Data/SingleProperty.h" />
+ <Header path="../../../Common/PlatformBase/Data/StringPropertyCollection.h" />
+
+ <Header path="../../../Common/PlatformBase/Exception/ArrayTypeMismatchException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/DuplicateResourceDataException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/DuplicateResourceException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/EmptyFeatureSetException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/FdoException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/FeatureServiceException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidMapDefinitionException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidRepositoryNameException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidRepositoryTypeException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidResourceDataNameException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidResourceDataTypeException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidResourceNameException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidResourcePathException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidResourcePreProcessingTypeException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/InvalidResourceTypeException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/LayerNotFoundException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/ResourceBusyException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/ResourceDataNotFoundException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/ResourceNotFoundException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/ServiceNotAvailableException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/ServiceNotSupportedException.h" />
+ <Header path="../../../Common/PlatformBase/Exception/UserNotFoundException.h" />
+
+ <Header path="../../../Common/PlatformBase/Services/FeatureCommand.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureQueryOptions.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureSourceParams.h" />
+ <Header path="../../../Common/PlatformBase/Services/Reader.h" />
+ <Header path="../../../Common/PlatformBase/Services/Service.h" />
+
+ <Header path="../../../Common/PlatformBase/Services/BaseService.h" />
+ <Header path="../../../Common/PlatformBase/Services/ClassDefinition.h" />
+ <Header path="../../../Common/PlatformBase/Services/ClassDefinitionCollection.h" />
+ <Header path="../../../Common/PlatformBase/Services/FileFeatureSourceParams.h" />
+ <Header path="../../../Common/PlatformBase/Services/CreateSdfParams.h" />
+ <Header path="../../../Common/PlatformBase/Services/DataPropertyDefinition.h" />
+ <Header path="../../../Common/PlatformBase/Services/DataReader.h" />
+ <Header path="../../../Common/PlatformBase/Services/DeleteFeatures.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureAggregateOptions.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureCommandCollection.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureProperty.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureReader.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureSchema.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureSchemaCollection.h" />
+ <Header path="../../../Common/PlatformBase/Services/FeatureService.h" />
+ <Header path="../../../Common/PlatformBase/Services/GeometricPropertyDefinition.h" />
+ <Header path="../../../Common/PlatformBase/Services/GeometryProperty.h" />
+ <Header path="../../../Common/PlatformBase/Services/GeometryTypeInfo.h" />
+ <Header path="../../../Common/PlatformBase/Services/GwsFeatureReader.h" />
+ <Header path="../../../Common/PlatformBase/Services/InsertFeatures.h" />
+ <Header path="../../../Common/PlatformBase/Services/LongTransactionReader.h" />
+ <Header path="../../../Common/PlatformBase/Services/ObjectPropertyDefinition.h" />
+ <Header path="../../../Common/PlatformBase/Services/Parameter.h" />
+ <Header path="../../../Common/PlatformBase/Services/ParameterCollection.h" />
+ <Header path="../../../Common/PlatformBase/Services/Raster.h" />
+ <Header path="../../../Common/PlatformBase/Services/RasterProperty.h" />
+ <Header path="../../../Common/PlatformBase/Services/RasterPropertyDefinition.h" />
+ <Header path="../../../Common/PlatformBase/Services/Resource.h" />
+ <Header path="../../../Common/PlatformBase/Services/ResourceIdentifier.h" />
+ <Header path="../../../Common/PlatformBase/Services/ResourceService.h" />
+ <Header path="../../../Common/PlatformBase/Services/SpatialContextReader.h" />
+ <Header path="../../../Common/PlatformBase/Services/SqlDataReader.h" />
+ <Header path="../../../Common/PlatformBase/Services/Transaction.h" />
+ <Header path="../../../Common/PlatformBase/Services/UpdateFeatures.h" />
+ <Header path="../../../Common/PlatformBase/Services/Warnings.h" />
+
+ <Header path="../../../Common/PlatformBase/MapLayer/LayerBase.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/LayerCollection.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/LayerGroup.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/LayerGroupCollection.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/MapBase.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/MapCollection.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/ReadOnlyLayerCollection.h" />
+ <Header path="../../../Common/PlatformBase/MapLayer/SelectionBase.h" />
+
+ <!-- mg-desktop classes -->
+ <Header path="../../MgDesktop/Exception/AliasNotFoundException.h" />
+ <Header path="../../MgDesktop/Exception/ConnectionFailedException.h" />
+ <Header path="../../MgDesktop/Exception/DuplicateParameterException.h" />
+ <Header path="../../MgDesktop/Exception/DwfException.h" />
+ <Header path="../../MgDesktop/Exception/DwfSectionNotFoundException.h" />
+ <Header path="../../MgDesktop/Exception/DwfSectionResourceNotFoundException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidDwfPackageException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidDwfSectionException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidFeatureSourceException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidLogEntryException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.h" />
+ <Header path="../../MgDesktop/Exception/ParameterNotFoundException.h" />
+ <Header path="../../MgDesktop/Exception/StylizeLayerFailedException.h" />
+
+ <Header path="../../MgDesktop/Services/DataReader.h" />
+ <Header path="../../MgDesktop/Services/DrawingService.h" />
+ <Header path="../../MgDesktop/Services/FeatureReader.h" />
+ <Header path="../../MgDesktop/Services/FeatureService.h" />
+ <Header path="../../MgDesktop/Services/MappingService.h" />
+ <Header path="../../MgDesktop/Services/ProfilingService.h" />
+ <Header path="../../MgDesktop/Services/RenderingService.h" />
+ <Header path="../../MgDesktop/Services/ResourceService.h" />
+ <Header path="../../MgDesktop/Services/ScrollableFeatureReader.h" />
+ <Header path="../../MgDesktop/Services/ServiceFactory.h" />
+ <Header path="../../MgDesktop/Services/SqlReader.h" />
+ <Header path="../../MgDesktop/Services/TileService.h" />
+ <Header path="../../MgDesktop/Services/Transaction.h" />
+
+ <Header path="../../MgDesktop/Services/Feature/RdbmsFeatureSourceParams.h" />
+
+ <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
+ <Header path="../../MgDesktop/Services/Rendering/FeatureInformation.h" />
+ <Header path="../../MgDesktop/Services/Rendering/Layout.h" />
+ <Header path="../../MgDesktop/Services/Rendering/MapPlot.h" />
+ <Header path="../../MgDesktop/Services/Rendering/DwfVersion.h" />
+ <Header path="../../MgDesktop/Services/Rendering/MapPlotCollection.h" />
+ <Header path="../../MgDesktop/Services/Rendering/PlotSpecification.h" />
+ <Header path="../../MgDesktop/Services/Rendering/RenderingOptions.h" />
+
+ <Header path="../../MgDesktop/System/PlatformInit.h" />
+
+ <Header path="../../MgDesktop/MapLayer/Layer.h" />
+ <Header path="../../MgDesktop/MapLayer/Map.h" />
+ <Header path="../../MgDesktop/MapLayer/Selection.h" />
+
+</Headers>
+
+</Parameters>
Modified: trunk/MgDev/Desktop/MapViewer/IMapViewer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/IMapViewer.cs 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/MapViewer/IMapViewer.cs 2013-04-03 10:49:56 UTC (rev 7439)
@@ -392,6 +392,10 @@
/// If <see cref="P:OSGeo.MapGuide.Viewer.IMapViewer.UseRenderMapIfTiledLayersExist"/> is set
/// to true, this property has no effect.
/// </summary>
+ /// <remarks>
+ /// As of 2.5, images from RenderDynamicOverlay will include any base layers by default. Using this property
+ /// as a workaround is no longer required. This property remains for compatibility purposes.
+ /// </remarks>
bool ConvertTiledGroupsToNonTiled { get; set; }
/// <summary>
@@ -400,6 +404,11 @@
/// of any tile caching mechanisms. Setting this property to true nullifies any effect of the
/// <see cref="P:OSGeo.MapGuide.Viewer.IMapViewer.ConvertTiledGroupsToNonTiled"/> property
/// </summary>
+ /// <remarks>
+ /// As of 2.5, images from RenderDynamicOverlay will include any base layers by default. Setting this property to true is no longer required
+ /// unless you still require map images to be rendered with a pre-filled background (which RenderMap() does). This property remains
+ /// for compatibility purposes.
+ /// </remarks>
bool UseRenderMapIfTiledLayersExist { get; set; }
/// <summary>
Modified: trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs
===================================================================
--- trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/MapViewer/MgMapViewer.cs 2013-04-03 10:49:56 UTC (rev 7439)
@@ -1163,14 +1163,31 @@
#endregion
+ /// <summary>
+ /// Renders the selected feature(s)
+ /// </summary>
+ const int BEHAVIOR_RENDER_SELECTION = 1;
+ /// <summary>
+ /// Renders the dynamic layers on the map
+ /// </summary>
+ const int BEHAVIOR_RENDER_LAYERS = 2;
+ /// <summary>
+ /// Renders the selected feature(s) even if they are outside the current scale
+ /// </summary>
+ const int BEHAVIOR_KEEP_SELECTION = 4;
+ /// <summary>
+ /// Renders the base layers on the map
+ /// </summary>
+ const int BEHAVIOR_RENDER_BASE_LAYERS = 8; //New in 2.5
+
static MgViewerRenderingOptions CreateMapRenderingOptions(short red, short green, short blue)
{
- return new MgViewerRenderingOptions("PNG", 2, new MgColor(red, green, blue)); //NOXLATE
+ return new MgViewerRenderingOptions("PNG", BEHAVIOR_RENDER_LAYERS | BEHAVIOR_RENDER_BASE_LAYERS, new MgColor(red, green, blue)); //NOXLATE
}
static MgViewerRenderingOptions CreateSelectionRenderingOptions(short red, short green, short blue)
{
- return new MgViewerRenderingOptions("PNG", (1 | 4), new MgColor(red, green, blue)); //NOXLATE
+ return new MgViewerRenderingOptions("PNG", (BEHAVIOR_RENDER_SELECTION | BEHAVIOR_KEEP_SELECTION), new MgColor(red, green, blue)); //NOXLATE
}
public void LoadMap(MgMapBase map)
Modified: trunk/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout
===================================================================
--- trunk/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout 2013-04-03 10:49:56 UTC (rev 7439)
@@ -13,7 +13,7 @@
</NameValue>
<NameValue>
<Name>UseRenderMapIfTiledLayersExist</Name>
- <Value>true</Value>
+ <Value>false</Value>
</NameValue>
<NameValue>
<Name>RespectFiniteDisplayScales</Name>
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.cpp 2013-04-03 10:49:56 UTC (rev 7439)
@@ -87,4 +87,9 @@
ret = (UINT32)m_scrollReader->IndexOf(propVals);
MG_FEATURE_SERVICE_CATCH_AND_THROW(L"MgdScrollableFeatureReader::IndexOf")
return ret;
+}
+
+FdoIScrollableFeatureReader* MgdScrollableFeatureReader::GetInternalReader()
+{
+ return FDO_SAFE_ADDREF(m_scrollReader);
}
\ No newline at end of file
Modified: trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/MgDesktop/Services/ScrollableFeatureReader.h 2013-04-03 10:49:56 UTC (rev 7439)
@@ -1,9 +1,9 @@
#ifndef DESKTOP_SCROLLABLE_FEATURE_READER_H
#define DESKTOP_SCROLLABLE_FEATURE_READER_H
-#include "Fdo.h"
#include "MgDesktop.h"
+class FdoIScrollableFeatureReader;
class MgdFeatureConnection;
// The MgdScrollableFeatureReader is an extension to the MgFeatureReader
@@ -39,7 +39,7 @@
virtual void Dispose() { delete this; }
INTERNAL_API:
- FdoIScrollableFeatureReader* GetInternalReader() { return FDO_SAFE_ADDREF(m_scrollReader); }
+ FdoIScrollableFeatureReader* GetInternalReader();
private:
FdoIScrollableFeatureReader* m_scrollReader;
Modified: trunk/MgDev/Desktop/MgDesktopApi_VS2010.sln
===================================================================
--- trunk/MgDev/Desktop/MgDesktopApi_VS2010.sln 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/Desktop/MgDesktopApi_VS2010.sln 2013-04-03 10:49:56 UTC (rev 7439)
@@ -67,6 +67,13 @@
{5FE54BF6-2939-46BB-A811-277D46C901C4} = {5FE54BF6-2939-46BB-A811-277D46C901C4}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApiEx", "DesktopUnmanagedApi\JavaApiEx\JavaApiEx.vcxproj", "{C02F44CB-D916-428D-A1A5-04E225A2A4EC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {85882748-DD71-4D2B-9E5A-03AF8C8D91B7} = {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}
+ {CBC0339F-E68B-48BA-9059-945483BEBDCA} = {CBC0339F-E68B-48BA-9059-945483BEBDCA}
+ {C50254F2-654A-48DE-AF5B-20605AEF8D10} = {C50254F2-654A-48DE-AF5B-20605AEF8D10}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -242,6 +249,14 @@
{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Release|Win32.Build.0 = Release|Win32
{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.Release|x64.ActiveCfg = Release|x64
{AB42A48E-8C9C-4D05-826A-1E5B6C457753}.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
Modified: trunk/MgDev/build_desktop.bat
===================================================================
--- trunk/MgDev/build_desktop.bat 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/build_desktop.bat 2013-04-03 10:49:56 UTC (rev 7439)
@@ -30,8 +30,6 @@
%MSBUILD% /p:Platform=%DESKTOP_PLATFORM% MgDesktopDotNet%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
popd
-echo [build]: .net intellisense files
-DoxyTransform.exe dotnet "%MG_DOC_XML%" "%MG_OUTPUT_DESKTOP%"
echo [install]: binaries
%XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
pushd "%MG_OUTPUT_DESKTOP%"
Modified: trunk/MgDev/nuget_prepare.bat
===================================================================
--- trunk/MgDev/nuget_prepare.bat 2013-04-02 12:07:54 UTC (rev 7438)
+++ trunk/MgDev/nuget_prepare.bat 2013-04-03 10:49:56 UTC (rev 7439)
@@ -82,9 +82,8 @@
echo [install]: Copy api-desktop files to nuget staging
xcopy /S /Y "%DESKTOP_BASEDIR%\*" "%NUGET_CONTENT_DESKTOP%" /EXCLUDE:package_excludes.txt+desktop_package_excludes.txt
xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Desktop.dll" "%NUGET_LIB_DESKTOP%"
+xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Desktop.xml" "%NUGET_LIB_DESKTOP%"
echo [install]: Copy api-web files to nuget staging
-REM Just in case
-DoxyTransform.exe dotnet "%MG_DOC_XML%" "%WEB_BASEDIR%"
xcopy /Y /I "%WEB_BASEDIR%\MgWebApp.dll" "%NUGET_CONTENT_WEB%"
xcopy /Y /I "%WEB_BASEDIR%\MgWebSupport.dll" "%NUGET_CONTENT_WEB%"
xcopy /Y /I "%WEB_BASEDIR%\MgHttpHandler.dll" "%NUGET_CONTENT_WEB%"
More information about the mapguide-commits
mailing list