[mapguide-commits] r6902 - in branches/maestro-4.0.x: LocalConfigure/Resources Maestro.AddIn.Local Maestro.AddIn.Local/FDO Maestro.AddIn.Local/Resources Maestro.AddIn.Local/Services Maestro.AddIn.Local/UI OSGeo.MapGuide.MaestroAPI.Local
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jul 15 08:04:11 PDT 2012
Author: jng
Date: 2012-07-15 08:04:11 -0700 (Sun, 15 Jul 2012)
New Revision: 6902
Modified:
branches/maestro-4.0.x/LocalConfigure/Resources/Platform.ini
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/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/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/gdal19.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/FoundationUnmanagedApi.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/GeometryUnmanagedApi.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.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/OSGeo.MapGuide.Viewer.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
branches/maestro-4.0.x/Maestro.AddIn.Local/Resources/mapguide_en.res
branches/maestro-4.0.x/Maestro.AddIn.Local/Services/LocalPreviewer.cs
branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
Log:
Update mg-desktop binaries to 15 July 2012 release and fix a defect with the local previewing mechanism, and fix assorted API breakage
Modified: branches/maestro-4.0.x/LocalConfigure/Resources/Platform.ini
===================================================================
(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)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleMessage.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleOverrides.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/KingOracleProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySQLProvider.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/MySqlOverrides.dll
===================================================================
(Binary files differ)
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)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/gdal19.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml 2012-07-15 14:44:18 UTC (rev 6901)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/providers.xml 2012-07-15 15:04:11 UTC (rev 6902)
@@ -19,6 +19,15 @@
<LibraryPath>.\SHPProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
+ <Name>OSGeo.ArcSDE.3.7</Name>
+ <DisplayName>OSGeo FDO Provider for ArcSDE</DisplayName>
+ <Description>Read/write access to an ESRI ArcSDE-based data store, using Oracle and SQL Server.</Description>
+ <IsManaged>False</IsManaged>
+ <Version>3.7.0.0</Version>
+ <FeatureDataObjectsVersion>3.7.0.0</FeatureDataObjectsVersion>
+ <LibraryPath>.\ArcSDEProvider.dll</LibraryPath>
+ </FeatureProvider>
+ <FeatureProvider>
<Name>OSGeo.WFS.3.7</Name>
<DisplayName>OSGeo FDO Provider for WFS</DisplayName>
<Description>Read access to OGC WFS-based data store.</Description>
@@ -37,17 +46,17 @@
<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>
+ <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>
+ <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>
@@ -64,13 +73,13 @@
<LibraryPath>.\GRFPProvider.dll</LibraryPath>
</FeatureProvider>
<FeatureProvider>
- <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>
+ <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>
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FDO/xerces-c_3_1.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
===================================================================
(Binary files differ)
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-07-15 14:44:18 UTC (rev 6901)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2012-07-15 15:04:11 UTC (rev 6902)
@@ -31,7 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
+ <Reference Include="OSGeo.MapGuide.Desktop, Version=2.4.0.6897, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
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)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
===================================================================
(Binary files differ)
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
===================================================================
(Binary files differ)
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-07-15 14:44:18 UTC (rev 6901)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/Resources/mapguide_en.res 2012-07-15 15:04:11 UTC (rev 6902)
@@ -1,6 +1,6 @@
# *****************************************************************************
# MapGuide Resource File
-# Copyright (C) 2004-2010 by Autodesk, Inc.
+# Copyright (C) 2004-2011 by Autodesk, Inc.
#
# WARNING: DO NOT MODIFY THIS FILE
#
@@ -19,7 +19,6 @@
# 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.
@@ -158,6 +157,7 @@
# *****************************************************************************
[ErrorDescription]
MgArgumentsMismatch = The arguments needed do not match the arguments provided.
+MgArgumentOutOfRange = Argument out of range [%1, %2]: %3
MgClassWOIdentity = A class definition has no identity property.
MgCollectionEmpty = The collection cannot be empty.
MgCoordinateSystemNotReadyException = The object is not ready for this operation.
@@ -225,14 +225,17 @@
MgCoordinateSystemUnknownUnit = Unknown unit.
MgDataReaderIdNotFound = The data reader ID was not found.
MgDocumentIdentifierFilenameFailed = Failed to get the filename from the document identifier because no matching document path found.
+MgDuplicateObject = Duplicate object found for name: %1
MgFailedToGetFileNameForDates = Failed to get the filename for the specified dates.
MgFailedToLoadFdoLibrary = Failed to load FDO library.
MgFailedToRetrieveSystemExceptionMesage = Failed to retrieve the system exception mesage. This message may not be unicode compliant.
MgFailedToRetrieveThirdPartyExceptionMesage = Failed to retrieve the third party exception mesage. This message may not be unicode compliant.
+MgFeatureSourceFormatInnerExceptionMessage = Error occurred in Feature Source (%1): %2 (Cause: %3, Root Cause: %4)
MgFeatureReaderIdNotFound = The feature reader ID was not found.
MgFilenamesIdentical = The filenames cannot be the same.
MgFormatAllExceptionDetail = - %1(%2)
MgFormatAllExceptionStackTrace = - %1(%2) line %3 file %4
+MgFormatFdoExceptionMessage = %1 (Cause: %2, Root Cause: %3)
MgFormatInnerExceptionMessage = %1
MgGeometryEmpty = The geometry cannot be empty.
MgGeometryPropertyEmpty = The geometry property cannot be empty.
@@ -260,6 +263,7 @@
MgInvalidIpConfigurationForSiteServer = The site server (%1) must have the same IP address as this local server (%2).
MgInvalidIpConfigurationForSupportServer = The site server (%1) must have a different IP address than this support server (%2).
MgInvalidLogType = The log type is invalid because it is not recognized.
+MgInvalidLocale = The specified locale (%1) is not a 2-letter ISO 639-1 language code
MgInvalidMapPlotCollectionMapPlotInstruction = The map plot is invalid because it contains an unrecognized map plot instruction.
MgInvalidMicroSecond = The microsecond is invalid because it must be between 0 and 999999.
MgInvalidMinute = The minute is invalid because it must be between 0 and 59.
@@ -285,6 +289,7 @@
MgInvalidWebWidgetType = The web widget type is invalid because it is not recognized.
MgInvalidXmlDateTime = The Xml date time is invalid because not all of the fields were found.
MgInvalidYear = The year is invalid because it must be between 1 and 9999.
+MgLayerBelongsToGroupNotInMap = The layer (%1) belongs to a group (%2) which is not part of the map.
MgMachineIpMustBeLocalHost = The machine IP address must be a local host.
MgMapCacheCleared = The Tile Service map cache has been cleared. Please increase TiledMapCacheSize in serverconfig.ini.
MgMapDisplayDpiCannotBeLessThanOrEqualToZero = The map DPI cannot be less than or equal to zero.
@@ -298,6 +303,9 @@
MgMissingSrs = No coordinate system specified.
MgNameNotFound = The name was not found.
MgNoDataFromRenderer = No data from renderer.
+MgNoNameForObject = No object found for name (%1)
+MgNullArgument = Null argument: %1
+MgNullPointer = Null pointer: %1
MgPropertyValuesEmpty = The property values cannot be empty.
MgReaderIdNotFound = The reader ID was not found.
MgRepositoryAlreadyOpened = The repository is already opened by another process (e.g. If you are running the server interactively as an application from the command line, are you also running the server as a service?).
@@ -309,6 +317,9 @@
MgResourceTypesDifferent = The resource types cannot be different.
MgResourcesIdentical = The resources cannot be the same.
MgSchemaNameMismatch = This schema name does not match the one specified in the qualified class name '%1' provided.
+MgSessionExpired = The session (%1) has expired.
+MgSelectionOpenWithEmptySession = Attempted to open a map selection with an empty or expired session id
+MgSelectionSaveWithEmptySession = Attempted to save a map selection with an empty or expired session id
MgSiteServerIpMustNotBeLocalHost = The site server IP address must not be a local host.
MgSqlReaderIdNotFound = The SQL reader ID was not found.
MgStringContainsReservedCharacters = The string cannot contain reserved characters %1
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/Services/LocalPreviewer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/Services/LocalPreviewer.cs 2012-07-15 14:44:18 UTC (rev 6901)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/Services/LocalPreviewer.cs 2012-07-15 15:04:11 UTC (rev 6902)
@@ -77,7 +77,7 @@
((IMapDefinition2)mapDef).AddWatermark(wm);
}
- var mapResId = new MgResourceIdentifier("Session:" + edSvc.SessionID + "//" + Guid.NewGuid() + "." + res.ResourceType.ToString());
+ var mapResId = new MgResourceIdentifier("Session:" + edSvc.SessionID + "//" + Guid.NewGuid() + "." + mapDef.ResourceType.ToString());
edSvc.ResourceService.SetResourceXmlData(mapResId.ToString(), ResourceTypeRegistry.Serialize(mapDef));
//MgdMap map = new MgdMap(mapResId);
Modified: branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2012-07-15 14:44:18 UTC (rev 6901)
+++ branches/maestro-4.0.x/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2012-07-15 15:04:11 UTC (rev 6902)
@@ -67,12 +67,7 @@
}
}
}
- var fact = new MgServiceFactory();
- viewer.Init(
- new MgDesktopMapViewerProvider(
- _map,
- (MgdResourceService)fact.CreateService(MgServiceType.ResourceService),
- (MgRenderingService)fact.CreateService(MgServiceType.RenderingService)));
+ viewer.Init(new MgDesktopMapViewerProvider(_map));
viewer.RefreshMap();
}
Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs 2012-07-15 14:44:18 UTC (rev 6901)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs 2012-07-15 15:04:11 UTC (rev 6902)
@@ -113,11 +113,11 @@
private string _configFile;
const string PARAM_CONFIG = "ConfigFile";
- private MgResourceService _resSvc;
- private MgFeatureService _featSvc;
- private MgDrawingService _drawSvc;
- private MgRenderingService _renderSvc;
- private MgTileService _tileSvc;
+ private MgdResourceService _resSvc;
+ private MgdFeatureService _featSvc;
+ private MgdDrawingService _drawSvc;
+ private MgdRenderingService _renderSvc;
+ private MgdTileService _tileSvc;
public override void Dispose()
{
@@ -152,42 +152,42 @@
}
}
- private MgResourceService GetResourceService()
+ private MgdResourceService GetResourceService()
{
if (_resSvc == null)
- _resSvc = (MgResourceService)_fact.CreateService(MgServiceType.ResourceService);
+ _resSvc = (MgdResourceService)_fact.CreateService(MgServiceType.ResourceService);
return _resSvc;
}
- private MgFeatureService GetFeatureService()
+ private MgdFeatureService GetFeatureService()
{
if (_featSvc == null)
- _featSvc = (MgFeatureService)_fact.CreateService(MgServiceType.FeatureService);
+ _featSvc = (MgdFeatureService)_fact.CreateService(MgServiceType.FeatureService);
return _featSvc;
}
- private MgDrawingService GetDrawingService()
+ private MgdDrawingService GetDrawingService()
{
if (_drawSvc == null)
- _drawSvc = (MgDrawingService)_fact.CreateService(MgServiceType.DrawingService);
+ _drawSvc = (MgdDrawingService)_fact.CreateService(MgServiceType.DrawingService);
return _drawSvc;
}
- private MgRenderingService GetRenderingService()
+ private MgdRenderingService GetRenderingService()
{
if (_renderSvc == null)
- _renderSvc = (MgRenderingService)_fact.CreateService(MgServiceType.RenderingService);
+ _renderSvc = (MgdRenderingService)_fact.CreateService(MgServiceType.RenderingService);
return _renderSvc;
}
- private MgTileService GetTileService()
+ private MgdTileService GetTileService()
{
if (_tileSvc == null)
- _tileSvc = (MgTileService)_fact.CreateService(MgServiceType.TileService);
+ _tileSvc = (MgdTileService)_fact.CreateService(MgServiceType.TileService);
return _tileSvc;
}
More information about the mapguide-commits
mailing list