[mapguide-commits] r6626 - in branches/maestro-4.0.x: Maestro
Maestro.AddIn.Local Maestro.AddIn.Local/FDO
Maestro.AddIn.Local/Resources Maestro.AddIn.Local/UI
OSGeo.MapGuide.MaestroAPI.Local
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 8 09:43:13 EDT 2012
Author: jng
Date: 2012-05-08 06:43:13 -0700 (Tue, 08 May 2012)
New Revision: 6626
Added:
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySQLProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySqlOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/gdal19.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
Removed:
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/gdal17.dll
Modified:
branches/maestro-4.0.x/Maestro.AddIn.Local/ACE.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/ExpressionEngine.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOCommon.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOGeometry.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOSpatial.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/Fdo.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/GRFPMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/GRFPOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/GRFPProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/ODBCProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/OGRProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/OWS.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/OdbcOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/PostgreSQLOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/PostgreSQLProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/RdbmsMsg.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/RdbmsOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SDFMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SDFProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SHPMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SHPOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SHPProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SQLServerSpatialOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SQLServerSpatialProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SQLiteProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SmMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WFSMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WFSProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WMSMessage.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WMSOverrides.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WMSProvider.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/Xalan-C_1_11.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/XalanMessages_1_11.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/boost_date_time-vc90-mt-1_42.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/boost_thread-vc90-mt-1_42.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml
branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/xerces-c_3_1.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/GEOS.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
branches/maestro-4.0.x/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgDesktop.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgFoundation.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgGeometry.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgGwsCommon.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgGwsQueryEngine.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgGwsResource.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgMdfModel.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgMdfParser.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgPlatformBase.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgRenderers.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/MgStylization.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/Resources/mapguide_en.res
branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
branches/maestro-4.0.x/Maestro.AddIn.Local/gd.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/xerces-c_3_1mg.dll
branches/maestro-4.0.x/Maestro/Maestro.csproj
branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj
Log:
Update mg-desktop to 8 May 2012 release (.net 2.0, VC9). FDO binaries is a custom VC9 build of FDO 3.7 (sans ArcSDE provider). Update the Local AddIn and MaestroAPI provider projects to use the split platform assembly structure introduced since these mg-desktop binaries were last updated.
Modified: branches/maestro-4.0.x/Maestro/Maestro.csproj
===================================================================
--- branches/maestro-4.0.x/Maestro/Maestro.csproj 2012-05-08 13:29:44 UTC (rev 6625)
+++ branches/maestro-4.0.x/Maestro/Maestro.csproj 2012-05-08 13:43:13 UTC (rev 6626)
@@ -23,7 +23,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>true</UseVSHostingProcess>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/ACE.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/ExpressionEngine.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOCommon.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOGeometry.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/FDOSpatial.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/Fdo.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/GRFPMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/GRFPOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/GRFPProvider.dll
===================================================================
(Binary files differ)
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleMessage.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleMessage.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleOverrides.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleOverrides.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleProvider.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleProvider.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySQLProvider.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySQLProvider.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySqlOverrides.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySqlOverrides.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/ODBCProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/OGRProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/OWS.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/OdbcOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/PostgreSQLOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/PostgreSQLProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/RdbmsMsg.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/RdbmsOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SDFMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SDFProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SHPMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SHPOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SHPProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SQLServerSpatialOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SQLServerSpatialProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SQLiteProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/SmMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WFSMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WFSProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WMSMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WMSOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/WMSProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/Xalan-C_1_11.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/XalanMessages_1_11.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/boost_date_time-vc90-mt-1_42.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/boost_thread-vc90-mt-1_42.dll
===================================================================
(Binary files differ)
Deleted: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/gdal17.dll
===================================================================
(Binary files differ)
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/gdal19.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/gdal19.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml 2012-05-08 13:29:44 UTC (rev 6625)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml 2012-05-08 13:43:13 UTC (rev 6626)
@@ -1,39 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<FeatureProviderRegistry>
<FeatureProvider>
- <Name>OSGeo.SDF.3.6</Name>
+ <Name>OSGeo.SDF.3.7</Name>
<DisplayName>OSGeo FDO Provider for SDF</DisplayName>
<Description>Read/write access to Autodesk's spatial database format, a file-based personal geodatabase that supports multiple features/attributes, spatial indexing, and file-locking.</Description>
<IsManaged>False</IsManaged>
- <Version>3.6.0.0</Version>
- <FeatureDataObjectsVersion>3.6.0.0</FeatureDataObjectsVersion>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SDFProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.SHP.3.6</Name>
+ <Name>OSGeo.SHP.3.7</Name>
<DisplayName>OSGeo FDO Provider for SHP</DisplayName>
<Description>Read/write access to spatial and attribute data in an ESRI SHP file.</Description>
<IsManaged>False</IsManaged>
- <Version>3.6.0.0</Version>
- <FeatureDataObjectsVersion>3.6.0.0</FeatureDataObjectsVersion>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SHPProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.Gdal.3.6</Name>
+ <Name>OSGeo.WFS.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for WFS</DisplayName>
+ <Description>Read access to OGC WFS-based data store.</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\WFSProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.WMS.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for WMS</DisplayName>
+ <Description>Read access to OGC WMS-based data store.</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\WMSProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.ODBC.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for ODBC</DisplayName>
+ <Description>FDO Provider for ODBC</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\ODBCProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.MySQL.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for MySQL</DisplayName>
+ <Description>FDO Provider for MySql</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\MySQLProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.Gdal.3.7</Name>
<DisplayName>OSGeo FDO Provider for GDAL</DisplayName>
<Description>FDO Provider for GDAL</Description>
<IsManaged>False</IsManaged>
- <Version>3.6.0.0</Version>
- <FeatureDataObjectsVersion>3.6.0.0</FeatureDataObjectsVersion>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\GRFPProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <Name>OSGeo.SQLite.3.6</Name>
+ <Name>OSGeo.OGR.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for OGR</DisplayName>
+ <Description>FDO Access to OGR Data Sources</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\OGRProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.KingOracle.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for Oracle</DisplayName>
+ <Description>Read/write access to spatial and attribute data in an Oracle Spatial.</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\KingOracleProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.SQLServerSpatial.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for SQL Server Spatial</DisplayName>
+ <Description>Read/Write access to feature data in a MS SQL Server spatially enabled data store. Supports geospatial and non-geospatial data and schema.</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\SQLServerSpatialProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.SQLite.3.7</Name>
<DisplayName>OSGeo FDO Provider for SQLite (spatial)</DisplayName>
<Description>Read/write access to feature data in a SQLite file.</Description>
<IsManaged>False</IsManaged>
- <Version>3.6.0.0</Version>
- <FeatureDataObjectsVersion>3.6.0.0</FeatureDataObjectsVersion>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
<LibraryPath>.\SQLiteProvider.dll</LibraryPath>
</FeatureProvider>
+ <FeatureProvider>
+ <Name>OSGeo.PostgreSQL.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for PostgreSQL/PostGIS</DisplayName>
+ <Description>Read/write access to PostgreSQL/PostGIS-based data store. Supports spatial data types and spatial query operations.</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\PostgreSQLProvider.dll</LibraryPath>
+ </FeatureProvider>
</FeatureProviderRegistry>
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/xerces-c_3_1.dll
===================================================================
(Binary files differ)
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/GEOS.dll
===================================================================
(Binary files differ)
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2012-05-08 13:29:44 UTC (rev 6625)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2012-05-08 13:43:13 UTC (rev 6626)
@@ -34,11 +34,31 @@
<Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
<Private>False</Private>
</Reference>
+ <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.\OSGeo.MapGuide.Foundation.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.\OSGeo.MapGuide.Geometry.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="OSGeo.MapGuide.Viewer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\OSGeo.MapGuide.Viewer.dll</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="OSGeo.MapGuide.Viewer.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.\OSGeo.MapGuide.Viewer.Desktop.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -159,7 +179,7 @@
<Content Include="FDO\FDOSpatial.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="FDO\gdal17.dll">
+ <Content Include="FDO\gdal19.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="FDO\GRFPMessage.dll">
@@ -171,6 +191,21 @@
<Content Include="FDO\GRFPProvider.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="FDO\KingOracleMessage.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="FDO\KingOracleOverrides.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="FDO\KingOracleProvider.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="FDO\MySqlOverrides.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="FDO\MySQLProvider.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="FDO\OdbcOverrides.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -183,6 +218,12 @@
<Content Include="FDO\OWS.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="FDO\PostgreSQLOverrides.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="FDO\PostgreSQLProvider.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="FDO\providers.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -243,9 +284,15 @@
<Content Include="FDO\xerces-c_3_1.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="FoundationUnmanagedApi.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="gd.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="GeometryUnmanagedApi.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="GEOS.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -304,9 +351,24 @@
<None Include="Resources\arrow-225.png" />
<None Include="Resources\arrow-135.png" />
<None Include="Resources\arrow-045.png" />
+ <Content Include="OSGeo.MapGuide.Foundation.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="OSGeo.MapGuide.Geometry.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="OSGeo.MapGuide.PlatformBase.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="OSGeo.MapGuide.Viewer.Desktop.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="OSGeo.MapGuide.Viewer.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="PlatformBaseUnmanagedApi.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="xerces-c_3_1mg.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgDesktop.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgFoundation.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgGeometry.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgGwsCommon.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgGwsQueryEngine.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgGwsResource.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgMdfModel.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgMdfParser.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgPlatformBase.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgRenderers.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/MgStylization.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
===================================================================
(Binary files differ)
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
===================================================================
(Binary files differ)
Added: branches/maestro-4.0.x/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
===================================================================
(Binary files differ)
Property changes on: branches/maestro-4.0.x/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/Resources/mapguide_en.res
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/Resources/mapguide_en.res 2012-05-08 13:29:44 UTC (rev 6625)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/Resources/mapguide_en.res 2012-05-08 13:43:13 UTC (rev 6626)
@@ -19,6 +19,7 @@
# E X C E P T I O N S
# *****************************************************************************
[Exceptions]
+MgAliasNotFoundException = The given alias %1 is not defined in the configuration file
MgAllProviderConnectionsUsedException = Cannot create any more connections to the %1 FDO provider.
MgArgumentOutOfRangeException = Argument is out of range.
MgArrayTypeMismatchException = Array type mismatch.
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2012-05-08 13:29:44 UTC (rev 6625)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2012-05-08 13:43:13 UTC (rev 6626)
@@ -32,6 +32,7 @@
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.Viewer;
using ICSharpCode.Core;
+using OSGeo.MapGuide.Viewer.Desktop;
namespace Maestro.AddIn.Local.UI
{
@@ -66,7 +67,12 @@
}
}
}
- viewer.Init(_map);
+ var fact = new MgServiceFactory();
+ viewer.Init(
+ new MgDesktopMapViewerProvider(
+ _map,
+ (MgdResourceService)fact.CreateService(MgServiceType.ResourceService),
+ (MgRenderingService)fact.CreateService(MgServiceType.RenderingService)));
viewer.RefreshMap();
}
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/gd.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/xerces-c_3_1mg.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2012-05-08 13:29:44 UTC (rev 6625)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2012-05-08 13:43:13 UTC (rev 6626)
@@ -39,6 +39,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Maestro.AddIn.Local\OSGeo.MapGuide.Desktop.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro.AddIn.Local\OSGeo.MapGuide.Foundation.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.Geometry, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro.AddIn.Local\OSGeo.MapGuide.Geometry.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.PlatformBase, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro.AddIn.Local\OSGeo.MapGuide.PlatformBase.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
More information about the mapguide-commits
mailing list