[mapguide-commits] r10018 - in trunk/MgDev: Bindings/src/Bindings/DotNet/Portable Portable Portable/MgPortable Portable/MgPortable/Log Portable/MgPortable/MapLayer Portable/MgPortable/Services Portable/MgPortable/Services/Drawing Portable/MgPortable/Services/Feature Portable/MgPortable/Services/Feature/Commands Portable/MgPortable/Services/Rendering Portable/MgPortable/Services/Resource Portable/MgPortable/Services/Stylization Portable/MgPortable/Services/Tile Portable/MgPortable/System Portable/UnitTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Nov 16 06:57:46 PST 2022
Author: jng
Date: 2022-11-16 06:57:45 -0800 (Wed, 16 Nov 2022)
New Revision: 10018
Modified:
trunk/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml
trunk/MgDev/Portable/MgPortable/Log/LogDetail.h
trunk/MgDev/Portable/MgPortable/Log/LogManager.h
trunk/MgDev/Portable/MgPortable/MapLayer/Layer.h
trunk/MgDev/Portable/MgPortable/MapLayer/Map.h
trunk/MgDev/Portable/MgPortable/MapLayer/Selection.h
trunk/MgDev/Portable/MgPortable/MgPortable.h
trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj
trunk/MgDev/Portable/MgPortable/Platform.ini
trunk/MgDev/Portable/MgPortable/Services/CryptoDefs.h
trunk/MgDev/Portable/MgPortable/Services/DataReader.h
trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingDefs.h
trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.h
trunk/MgDev/Portable/MgPortable/Services/DrawingService.cpp
trunk/MgDev/Portable/MgPortable/Services/DrawingService.h
trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.h
trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.h
trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionPool.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionUtil.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureConnection.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureDefs.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCache.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSetReader.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.h
trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureUtil.h
trunk/MgDev/Portable/MgPortable/Services/Feature/GwsConnectionPool.h
trunk/MgDev/Portable/MgPortable/Services/Feature/GwsFeatureReader.h
trunk/MgDev/Portable/MgPortable/Services/Feature/JoinFeatureReader.h
trunk/MgDev/Portable/MgPortable/Services/Feature/MgCSTrans.h
trunk/MgDev/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.h
trunk/MgDev/Portable/MgPortable/Services/Feature/ProxyDataReader.h
trunk/MgDev/Portable/MgPortable/Services/Feature/RasterHelper.h
trunk/MgDev/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h
trunk/MgDev/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.h
trunk/MgDev/Portable/MgPortable/Services/Feature/TransformCache.h
trunk/MgDev/Portable/MgPortable/Services/FeatureReader.h
trunk/MgDev/Portable/MgPortable/Services/FeatureService.cpp
trunk/MgDev/Portable/MgPortable/Services/FeatureService.h
trunk/MgDev/Portable/MgPortable/Services/ImageFormats.h
trunk/MgDev/Portable/MgPortable/Services/MappingService.cpp
trunk/MgDev/Portable/MgPortable/Services/MappingService.h
trunk/MgDev/Portable/MgPortable/Services/ProfilingService.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomLogoInfo.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomTextInfo.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/DwfVersion.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInfoRenderer.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInformation.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/Layout.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/LegendPlotUtil.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlot.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotCollection.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotInstruction.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingDefs.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingUtil.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/PlotSpecification.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/PrintLayout.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgInputStream.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgRaster.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/RenderingOptions.h
trunk/MgDev/Portable/MgPortable/Services/Rendering/UnitType.h
trunk/MgDev/Portable/MgPortable/Services/RenderingService.cpp
trunk/MgDev/Portable/MgPortable/Services/RenderingService.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ByteSourceDwfInputStreamImpl.h
trunk/MgDev/Portable/MgPortable/Services/Resource/OperationInfo.h
trunk/MgDev/Portable/MgPortable/Services/Resource/OperationParameter.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceContentCache.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceDefs.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageHandler.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.cpp
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestHandler.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestParser.h
trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataManager.h
trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataType.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileHandler.h
trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileReader.h
trunk/MgDev/Portable/MgPortable/Services/ResourceService.cpp
trunk/MgDev/Portable/MgPortable/Services/ResourceService.h
trunk/MgDev/Portable/MgPortable/Services/ScrollableFeatureReader.h
trunk/MgDev/Portable/MgPortable/Services/ServiceFactory.h
trunk/MgDev/Portable/MgPortable/Services/SqlReader.h
trunk/MgDev/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h
trunk/MgDev/Portable/MgPortable/Services/Tile/TileCache.h
trunk/MgDev/Portable/MgPortable/Services/Tile/TileDefs.h
trunk/MgDev/Portable/MgPortable/Services/TileService.cpp
trunk/MgDev/Portable/MgPortable/Services/TileService.h
trunk/MgDev/Portable/MgPortable/Services/Transaction.h
trunk/MgDev/Portable/MgPortable/System/ClassId.h
trunk/MgDev/Portable/MgPortable/System/ConfigProperties.h
trunk/MgDev/Portable/MgPortable/System/ExceptionCodes.h
trunk/MgDev/Portable/MgPortable/System/PlatformInit.cpp
trunk/MgDev/Portable/MgPortable/System/PlatformInit.h
trunk/MgDev/Portable/MgPortable/System/ThreadBase.h
trunk/MgDev/Portable/MgPortable/System/TimerUtil.h
trunk/MgDev/Portable/Portable.sln
trunk/MgDev/Portable/UnitTest/UnitTest.vcxproj
Log:
#2852: MgPortable build changes
- Restore MgPortableScrollableFeatureReader header in PortableApiGen.xml
- More "desktop" -> "portable" string replacement
- Remove AnyCpu solution config from Portable.sln
- Fix up debug output paths and post-build event in UnitTest.vcxproj
Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Portable/PortableApiGen.xml 2022-11-16 14:57:45 UTC (rev 10018)
@@ -105,9 +105,7 @@
<Header path="../../../../../Portable/MgPortable/Services/ProfilingService.h" />
<Header path="../../../../../Portable/MgPortable/Services/RenderingService.h" />
<Header path="../../../../../Portable/MgPortable/Services/ResourceService.h" />
- <!--
<Header path="../../../../../Portable/MgPortable/Services/ScrollableFeatureReader.h" />
- -->
<Header path="../../../../../Portable/MgPortable/Services/ServiceFactory.h" />
<!--
<Header path="../../../../../Portable/MgPortable/Services/SqlReader.h" />
Modified: trunk/MgDev/Portable/MgPortable/Log/LogDetail.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Log/LogDetail.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Log/LogDetail.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -36,7 +36,7 @@
// Only error messages without parameters are logged for Resource Service, and
// Error messages and warnings with parameters are logged for Feature Service
//
-class MG_DESKTOP_API MgPortableLogDetail
+class MG_PORTABLE_API MgPortableLogDetail
{
DECLARE_CLASSNAME(MgPortableLogDetail)
Modified: trunk/MgDev/Portable/MgPortable/Log/LogManager.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Log/LogManager.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Log/LogManager.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -33,7 +33,7 @@
class MgPortableLogThread;
-#define MG_DESKTOP_LOG_EXCEPTION() \
+#define MG_PORTABLE_LOG_EXCEPTION() \
STRING locale = MgResources::DefaultMessageLocale; \
STRING message = mgException->GetExceptionMessage(locale); \
STRING details = mgException->GetDetails(locale); \
@@ -204,7 +204,7 @@
STRING connInfoClientIp = L""; \
STRING connInfoUserName = L"";
-class MG_DESKTOP_API MgPortableLogManager : public MgGuardDisposable
+class MG_PORTABLE_API MgPortableLogManager : public MgGuardDisposable
{
DECLARE_CLASSNAME(MgPortableLogManager)
Modified: trunk/MgDev/Portable/MgPortable/MapLayer/Layer.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/MapLayer/Layer.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/MapLayer/Layer.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,16 +15,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAP_LAYER_H
-#define DESKTOP_MAP_LAYER_H
+#ifndef PORTABLE_MAP_LAYER_H
+#define PORTABLE_MAP_LAYER_H
#include "MgPortable.h"
class MgPortableScrollableFeatureReader;
-/// \ingroup Desktop_Map_and_Layers_Module
+/// \ingroup Portable_Map_and_Layers_Module
/// \{
-class MG_DESKTOP_API MgPortableLayer : public MgLayerBase
+class MG_PORTABLE_API MgPortableLayer : public MgLayerBase
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableLayer)
@@ -392,7 +392,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MapLayer_Layer;
+ static const INT32 m_cls_id = MapGuide_Portable_MapLayer_Layer;
};
/// \}
#endif
\ No newline at end of file
Modified: trunk/MgDev/Portable/MgPortable/MapLayer/Map.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/MapLayer/Map.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/MapLayer/Map.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAP_H
-#define DESKTOP_MAP_H
+#ifndef PORTABLE_MAP_H
+#define PORTABLE_MAP_H
#include "MgPortable.h"
#include "MdfModel.h"
@@ -28,9 +28,9 @@
class MgPortableServiceFactory;
-/// \ingroup Desktop_Map_and_Layers_Module
+/// \ingroup Portable_Map_and_Layers_Module
/// \{
-class MG_DESKTOP_API MgPortableMap : public MgMapBase
+class MG_PORTABLE_API MgPortableMap : public MgMapBase
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableMap)
@@ -128,7 +128,7 @@
void InitializeResourceService(MgResourceService* resourceService);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MapLayer_Map;
+ static const INT32 m_cls_id = MapGuide_Portable_MapLayer_Map;
private:
Modified: trunk/MgDev/Portable/MgPortable/MapLayer/Selection.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/MapLayer/Selection.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/MapLayer/Selection.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,15 +15,15 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SELECTION_H
-#define DESKTOP_SELECTION_H
+#ifndef PORTABLE_SELECTION_H
+#define PORTABLE_SELECTION_H
#include "MgPortable.h"
#include "Map.h"
-/// \ingroup Desktop_Map_and_Layers_Module
+/// \ingroup Portable_Map_and_Layers_Module
/// \{
-class MG_DESKTOP_API MgPortableSelection : public MgSelectionBase
+class MG_PORTABLE_API MgPortableSelection : public MgSelectionBase
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableSelection)
@@ -62,7 +62,7 @@
STRING GetResourceName(CREFSTRING sessionId, CREFSTRING mapName);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MapLayer_Selection;
+ static const INT32 m_cls_id = MapGuide_Portable_MapLayer_Selection;
};
/// \}
#endif
\ No newline at end of file
Modified: trunk/MgDev/Portable/MgPortable/MgPortable.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/MgPortable.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/MgPortable.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -22,13 +22,13 @@
#include "PlatformBase.h"
#ifdef _WIN32
-#ifdef DESKTOP_EXPORTS
-# define MG_DESKTOP_API __declspec(dllexport)
+#ifdef PORTABLE_EXPORTS
+# define MG_PORTABLE_API __declspec(dllexport)
#else
-# define MG_DESKTOP_API __declspec(dllimport)
+# define MG_PORTABLE_API __declspec(dllimport)
#endif
#else
-#define MG_DESKTOP_API
+#define MG_PORTABLE_API
#endif
#if !defined(DWFTK_USE_DWFCORE_ZLIB)
Modified: trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj
===================================================================
--- trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/MgPortable.vcxproj 2022-11-16 14:57:45 UTC (rev 10018)
@@ -84,7 +84,7 @@
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;PORTABLE_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,7 +123,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PORTABLE_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -157,7 +157,7 @@
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;PORTABLE_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -199,7 +199,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PORTABLE_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Modified: trunk/MgDev/Portable/MgPortable/Platform.ini
===================================================================
(Binary files differ)
Modified: trunk/MgDev/Portable/MgPortable/Services/CryptoDefs.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/CryptoDefs.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/CryptoDefs.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CRYPTO_DEFS_H
-#define DESKTOP_CRYPTO_DEFS_H
+#ifndef PORTABLE_CRYPTO_DEFS_H
+#define PORTABLE_CRYPTO_DEFS_H
#include "SecurityDefs.h"
#include "CryptographyUtil.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/DataReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/DataReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/DataReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_DATA_READER_H
-#define DESKTOP_DATA_READER_H
+#ifndef PORTABLE_DATA_READER_H
+#define PORTABLE_DATA_READER_H
#include "MgPortable.h"
@@ -23,9 +23,9 @@
class FdoIDataReader;
class MgPortableFeatureConnection;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableDataReader : public MgDataReader
+class MG_PORTABLE_API MgPortableDataReader : public MgDataReader
{
INTERNAL_API:
MgPortableDataReader(MgPortableFeatureConnection* conn, FdoIDataReader* reader);
Modified: trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingDefs.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingDefs.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingDefs.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_DRAWING_DEFS_H
-#define DESKTOP_DRAWING_DEFS_H
+#ifndef PORTABLE_DRAWING_DEFS_H
+#define PORTABLE_DRAWING_DEFS_H
#include "dwfcore/Core.h"
#include "dwfcore/Exception.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Drawing/DrawingServiceUtil.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_DRAWING_SERVICE_UTIL_H
-#define DESKTOP_DRAWING_SERVICE_UTIL_H
+#ifndef PORTABLE_DRAWING_SERVICE_UTIL_H
+#define PORTABLE_DRAWING_SERVICE_UTIL_H
#include "dwfcore/String.h"
#include "dwf/package/reader/PackageReader.h"
@@ -47,7 +47,7 @@
};
/// \cond INTERNAL
-class MG_DESKTOP_API MgPortableDrawingServiceUtil
+class MG_PORTABLE_API MgPortableDrawingServiceUtil
{
/// Constructors/Destructor
Modified: trunk/MgDev/Portable/MgPortable/Services/DrawingService.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/DrawingService.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/DrawingService.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -80,7 +80,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -182,7 +182,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -301,7 +301,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -463,7 +463,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -650,7 +650,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -977,7 +977,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1115,7 +1115,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1276,7 +1276,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1344,7 +1344,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
Modified: trunk/MgDev/Portable/MgPortable/Services/DrawingService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/DrawingService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/DrawingService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,12 +15,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_DRAWING_SERVICE_H
-#define DESKTOP_DRAWING_SERVICE_H
+#ifndef PORTABLE_DRAWING_SERVICE_H
+#define PORTABLE_DRAWING_SERVICE_H
#include "MgPortable.h"
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
////////////////////////////////////////////////////////////////////////////////
@@ -54,7 +54,7 @@
/// provides access to the coordinate space assigned to the DWF
/// in the DrawingSource resource.
///
-class MG_DESKTOP_API MgPortableDrawingService : public MgService
+class MG_PORTABLE_API MgPortableDrawingService : public MgService
{
DECLARE_CLASSNAME(MgPortableDrawingService)
@@ -386,7 +386,7 @@
virtual STRING GetCoordinateSpace(MgResourceIdentifier* resource);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_DrawingService_DrawingService;
+ static const INT32 m_cls_id = MapGuide_Portable_DrawingService_DrawingService;
protected:
virtual INT32 GetClassId() { return m_cls_id; }
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/CreateFeatureSource.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CREATE_FEATURE_SOURCE_H
-#define DESKTOP_CREATE_FEATURE_SOURCE_H
+#ifndef PORTABLE_CREATE_FEATURE_SOURCE_H
+#define PORTABLE_CREATE_FEATURE_SOURCE_H
class FdoIConnection;
class MgResourceIdentifier;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/ExtendedSelectCommand.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_EXTENDED_SELECT_COMMAND_H
-#define DESKTOP_EXTENDED_SELECT_COMMAND_H
+#ifndef PORTABLE_EXTENDED_SELECT_COMMAND_H
+#define PORTABLE_EXTENDED_SELECT_COMMAND_H
class MgPortableFdoFeatureReader;
class MgPortableFdoReaderCollection;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/Commands/SelectFeatures.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SELECT_FEATURES_H_
-#define DESKTOP_SELECT_FEATURES_H_
+#ifndef PORTABLE_SELECT_FEATURES_H_
+#define PORTABLE_SELECT_FEATURES_H_
#include "MgPortable.h"
#include "System/XmlDefs.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionPool.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionPool.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionPool.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -25,7 +25,7 @@
STRING ProviderName;
};
-class MG_DESKTOP_API MgPortableFdoConnectionPool //Needs to be exported for unit testing code
+class MG_PORTABLE_API MgPortableFdoConnectionPool //Needs to be exported for unit testing code
{
public:
static void Initialize(MgConfiguration* config);
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionUtil.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionUtil.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FdoConnectionUtil.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FDO_CONNECTION_UTIL_H
-#define DESKTOP_FDO_CONNECTION_UTIL_H
+#ifndef PORTABLE_FDO_CONNECTION_UTIL_H
+#define PORTABLE_FDO_CONNECTION_UTIL_H
class MgPortableFdoConnectionPool;
class FdoIConnection;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureClassCacheItem.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_CLASS_CACHE_ITEM_H
-#define DESKTOP_FEATURE_CLASS_CACHE_ITEM_H
+#ifndef PORTABLE_FEATURE_CLASS_CACHE_ITEM_H
+#define PORTABLE_FEATURE_CLASS_CACHE_ITEM_H
/// \cond INTERNAL
class MgPortableFeatureClassCacheItem : public MgGuardDisposable
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureConnection.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureConnection.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureConnection.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_CONNECTION_H
-#define DESKTOP_FEATURE_CONNECTION_H
+#ifndef PORTABLE_FEATURE_CONNECTION_H
+#define PORTABLE_FEATURE_CONNECTION_H
class FdoIConnection;
class MgResourceIdentifier;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureDefs.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureDefs.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureDefs.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_DEFS_H
-#define DESKTOP_FEATURE_DEFS_H
+#ifndef PORTABLE_FEATURE_DEFS_H
+#define PORTABLE_FEATURE_DEFS_H
#include "MgPortable.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSchemaCacheItem.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_SCHEMA_CACHE_ITEM_H
-#define DESKTOP_FEATURE_SCHEMA_CACHE_ITEM_H
+#ifndef PORTABLE_FEATURE_SCHEMA_CACHE_ITEM_H
+#define PORTABLE_FEATURE_SCHEMA_CACHE_ITEM_H
class MgGuardDisposable;
class MgStringCollection;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCache.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCache.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCache.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_SERVICE_CACHE_H
-#define DESKTOP_FEATURE_SERVICE_CACHE_H
+#ifndef PORTABLE_FEATURE_SERVICE_CACHE_H
+#define PORTABLE_FEATURE_SERVICE_CACHE_H
#include "MgPortable.h"
#include "FeatureServiceCacheEntry.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureServiceCacheEntry.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_SERVICE_CACHE_ENTRY_H
-#define DESKTOP_FEATURE_SERVICE_CACHE_ENTRY_H
+#ifndef PORTABLE_FEATURE_SERVICE_CACHE_ENTRY_H
+#define PORTABLE_FEATURE_SERVICE_CACHE_ENTRY_H
#include "FeatureSchemaCacheItem.h"
#include "FeatureSourceCacheItem.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSetReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSetReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSetReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_SET_READER_H
-#define DESKTOP_FEATURE_SET_READER_H
+#ifndef PORTABLE_FEATURE_SET_READER_H
+#define PORTABLE_FEATURE_SET_READER_H
class MgPortableFeatureSetReader : public MgFeatureReader
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureSourceCacheItem.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_SOURCE_CACHE_ITEM_H
-#define DESKTOP_FEATURE_SOURCE_CACHE_ITEM_H
+#ifndef PORTABLE_FEATURE_SOURCE_CACHE_ITEM_H
+#define PORTABLE_FEATURE_SOURCE_CACHE_ITEM_H
class MgPortableFeatureSourceCacheItem : public MgGuardDisposable
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureUtil.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureUtil.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/FeatureUtil.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_UTIL
-#define DESKTOP_FEATURE_UTIL
+#ifndef PORTABLE_FEATURE_UTIL
+#define PORTABLE_FEATURE_UTIL
#include "MgPortable.h"
#include "Fdo.h"
@@ -45,7 +45,7 @@
class MgReader;
-class MG_DESKTOP_API MgPortableFeatureUtil
+class MG_PORTABLE_API MgPortableFeatureUtil
{
public:
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/GwsConnectionPool.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/GwsConnectionPool.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/GwsConnectionPool.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_GWS_CONNECTION_POOL_H
-#define DESKTOP_GWS_CONNECTION_POOL_H
+#ifndef PORTABLE_GWS_CONNECTION_POOL_H
+#define PORTABLE_GWS_CONNECTION_POOL_H
#include "GwsQueryEngine.h"
#include "GwsCommonImp.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/GwsFeatureReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/GwsFeatureReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/GwsFeatureReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_GWS_FEATURE_READER_H
-#define DESKTOP_GWS_FEATURE_READER_H
+#ifndef PORTABLE_GWS_FEATURE_READER_H
+#define PORTABLE_GWS_FEATURE_READER_H
#include "FeatureDefs.h"
#include "GwsQueryEngine.h"
@@ -57,7 +57,7 @@
/// Thus, you must call ReadNext to begin accessing any data..
/// </summary>
-class MG_DESKTOP_API MgPortableGwsFeatureReader : public MgFeatureReader
+class MG_PORTABLE_API MgPortableGwsFeatureReader : public MgFeatureReader
{
EXTERNAL_API:
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/JoinFeatureReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/JoinFeatureReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/JoinFeatureReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_JOIN_FEATURE_READER_H
-#define DESKTOP_JOIN_FEATURE_READER_H
+#ifndef PORTABLE_JOIN_FEATURE_READER_H
+#define PORTABLE_JOIN_FEATURE_READER_H
#include "Fdo.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/MgCSTrans.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/MgCSTrans.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/MgCSTrans.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CS_TRANS_H
-#define DESKTOP_CS_TRANS_H
+#ifndef PORTABLE_CS_TRANS_H
+#define PORTABLE_CS_TRANS_H
#include "MgPortable.h"
#include "CSysTransformer.h"
@@ -26,7 +26,7 @@
template class Ptr<MgCoordinateSystemTransform>;
-class MG_DESKTOP_API MgPortableCSTrans : public CSysTransformer
+class MG_PORTABLE_API MgPortableCSTrans : public CSysTransformer
{
public:
MgPortableCSTrans(MgCoordinateSystem* srcCs, MgCoordinateSystem* dstCs);
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/ProjectedFeatureReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_PROJECTED_FEATURE_READER_H
-#define DESKTOP_PROJECTED_FEATURE_READER_H
+#ifndef PORTABLE_PROJECTED_FEATURE_READER_H
+#define PORTABLE_PROJECTED_FEATURE_READER_H
class MgByteReader;
class MgFeatureReader;
@@ -23,7 +23,7 @@
class MgCoordinateSystemTransform;
class MgAgfReaderWriter;
-class MG_DESKTOP_API MgPortableProjectedFeatureReader : public MgFeatureReader
+class MG_PORTABLE_API MgPortableProjectedFeatureReader : public MgFeatureReader
{
INTERNAL_API:
MgPortableProjectedFeatureReader(MgFeatureReader* reader, MgCoordinateSystemTransform* trans);
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/ProxyDataReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/ProxyDataReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/ProxyDataReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -23,7 +23,7 @@
class MgDataReader;
class MgPortableProxyDataReader;
-template class MG_DESKTOP_API Ptr<MgPortableProxyDataReader>;
+template class MG_PORTABLE_API Ptr<MgPortableProxyDataReader>;
/// \cond INTERNAL
/////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@
/// \remarks
/// The initial position of the SqlReader interface is prior to the first item.
/// Thus, you must call ReadNext to begin accessing any data.
-class MG_DESKTOP_API MgPortableProxyDataReader : public MgDataReader
+class MG_PORTABLE_API MgPortableProxyDataReader : public MgDataReader
{
MG_DECL_DYNCREATE();
DECLARE_CLASSNAME(MgPortableProxyDataReader)
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/RasterHelper.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/RasterHelper.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/RasterHelper.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RASTER_HELPER_H
-#define DESKTOP_RASTER_HELPER_H
+#ifndef PORTABLE_RASTER_HELPER_H
+#define PORTABLE_RASTER_HELPER_H
class MgPortableGwsFeatureReader;
template class Ptr<MgPortableFeatureReader>;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/RdbmsFeatureSourceParams.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RDBMS_FEATURE_SOURCE_PARAMS_H
-#define DESKTOP_RDBMS_FEATURE_SOURCE_PARAMS_H
+#ifndef PORTABLE_RDBMS_FEATURE_SOURCE_PARAMS_H
+#define PORTABLE_RDBMS_FEATURE_SOURCE_PARAMS_H
#include "MgPortable.h"
@@ -23,7 +23,7 @@
// Parameter class for creating RDBMS data stores
//
//
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
///\brief
@@ -44,7 +44,7 @@
///
/// You cannot create file Feature Sources using this class. Use the MgFileFeatureSourceParams
/// class if you need to create file-based Feature Sources.
-class MG_DESKTOP_API MgPortableRdbmsFeatureSourceParams : public MgFeatureSourceParams
+class MG_PORTABLE_API MgPortableRdbmsFeatureSourceParams : public MgFeatureSourceParams
{
PUBLISHED_API:
//////////////////////////////////////////////////
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/SpatialContextCacheItem.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SPATIAL_CONTEXT_CACHE_ITEM_H
-#define DESKTOP_SPATIAL_CONTEXT_CACHE_ITEM_H
+#ifndef PORTABLE_SPATIAL_CONTEXT_CACHE_ITEM_H
+#define PORTABLE_SPATIAL_CONTEXT_CACHE_ITEM_H
typedef std::map<STRING, STRING> MgSpatialContextInfo;
Modified: trunk/MgDev/Portable/MgPortable/Services/Feature/TransformCache.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Feature/TransformCache.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Feature/TransformCache.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_TRANSFORM_CACHE
-#define DESKTOP_TRANSFORM_CACHE
+#ifndef PORTABLE_TRANSFORM_CACHE
+#define PORTABLE_TRANSFORM_CACHE
#include "MgPortable.h"
#include "MgCSTrans.h"
@@ -27,7 +27,7 @@
// Class to cache coordinate systems and transforms during processing. Many
// layers will use the same coordinate system so this is an effective way to
// reduce significant overhead.
-class MG_DESKTOP_API MgPortableTransformCache
+class MG_PORTABLE_API MgPortableTransformCache
{
public:
MgPortableTransformCache(MgPortableCSTrans* transform, MgCoordinateSystem* coordinateSystem);
Modified: trunk/MgDev/Portable/MgPortable/Services/FeatureReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/FeatureReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/FeatureReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_READER_H
-#define DESKTOP_FEATURE_READER_H
+#ifndef PORTABLE_FEATURE_READER_H
+#define PORTABLE_FEATURE_READER_H
#include "MgPortable.h"
@@ -25,9 +25,9 @@
class MgAgfReaderWriter;
class MgPortableFeatureConnection;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableFeatureReader : public MgFeatureReader
+class MG_PORTABLE_API MgPortableFeatureReader : public MgFeatureReader
{
INTERNAL_API:
MgPortableFeatureReader(MgPortableFeatureConnection* conn, FdoIFeatureReader* reader, MgStringCollection* forceIdProps = NULL);
Modified: trunk/MgDev/Portable/MgPortable/Services/FeatureService.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/FeatureService.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/FeatureService.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -74,7 +74,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -117,7 +117,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -157,7 +157,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -197,7 +197,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -234,7 +234,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -274,7 +274,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -315,7 +315,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -358,7 +358,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -402,7 +402,7 @@
fsCollection = describe.DescribeSchema(resource, schemaName, findClassNames, serialize);
//In MapGuide Server returning this potentially cached copy is okay as a new instance is created
- //travelling the server/webtier boundary. This is not the case in mg-desktop so we have to clone
+ //travelling the server/webtier boundary. This is not the case in mg-portable so we have to clone
//this result and return the clone instead.
clone = new MgFeatureSchemaCollection();
for (INT32 i = 0; i < fsCollection->GetCount(); i++)
@@ -464,7 +464,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -510,7 +510,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -551,7 +551,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -590,7 +590,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -628,7 +628,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -679,7 +679,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -778,7 +778,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -830,7 +830,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -881,7 +881,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -927,7 +927,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -975,7 +975,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1018,7 +1018,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1063,7 +1063,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1126,7 +1126,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1190,7 +1190,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1233,7 +1233,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1279,7 +1279,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1322,7 +1322,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1366,7 +1366,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1405,7 +1405,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1449,7 +1449,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1488,7 +1488,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1531,7 +1531,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1579,7 +1579,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1654,7 +1654,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1697,7 +1697,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1743,7 +1743,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1783,7 +1783,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1828,7 +1828,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1865,7 +1865,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1904,7 +1904,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1939,7 +1939,7 @@
Ptr<MgClassDefinition> clsDef = cmd.GetClassDefinition(resource, schemaName, className, true);
//In MapGuide Server returning this potentially cached copy is okay as a new instance is created
- //travelling the server/webtier boundary. This is not the case in mg-desktop so we have to clone
+ //travelling the server/webtier boundary. This is not the case in mg-portable so we have to clone
//this result and return the clone instead.
ret = MgPortableFeatureUtil::CloneMgClassDefinition(clsDef);
@@ -1952,7 +1952,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1980,7 +1980,7 @@
classDefinition = describe.GetClassDefinition(resource, schemaName, className, serialize);
//In MapGuide Server returning this potentially cached copy is okay as a new instance is created
- //travelling the server/webtier boundary. This is not the case in mg-desktop so we have to clone
+ //travelling the server/webtier boundary. This is not the case in mg-portable so we have to clone
//this result and return the clone instead.
clone = MgPortableFeatureUtil::CloneMgClassDefinition(classDefinition);
@@ -2017,7 +2017,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2095,7 +2095,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2133,7 +2133,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2180,7 +2180,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2212,7 +2212,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2266,7 +2266,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2311,7 +2311,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -2389,7 +2389,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
Modified: trunk/MgDev/Portable/MgPortable/Services/FeatureService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/FeatureService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/FeatureService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -1,5 +1,5 @@
-#ifndef DESKTOP_FEATURE_SERVICE_H
-#define DESKTOP_FEATURE_SERVICE_H
+#ifndef PORTABLE_FEATURE_SERVICE_H
+#define PORTABLE_FEATURE_SERVICE_H
#include "MgPortable.h"
#include "System/XmlDefs.h"
@@ -28,9 +28,9 @@
{
class Extension;
}
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
-class MG_DESKTOP_API MgPortableFeatureService : public MgFeatureService
+class MG_PORTABLE_API MgPortableFeatureService : public MgFeatureService
{
DECLARE_CLASSNAME(MgPortableFeatureService)
@@ -187,7 +187,7 @@
virtual INT32 UpdateMatchingFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- //------- Desktop API additions --------//
+ //------- Portable API additions --------//
MgPortableScrollableFeatureReader* SelectFeaturesExtended(MgResourceIdentifier* resource,
CREFSTRING className,
MgFeatureQueryOptions* options);
@@ -264,7 +264,7 @@
INT32 fetchSize);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_FeatureService_FeatureService;
+ static const INT32 m_cls_id = MapGuide_Portable_FeatureService_FeatureService;
protected:
virtual INT32 GetClassId() { return m_cls_id; }
Modified: trunk/MgDev/Portable/MgPortable/Services/ImageFormats.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/ImageFormats.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/ImageFormats.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,13 +15,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_IMAGE_FORMATS_H
-#define DESKTOP_IMAGE_FORMATS_H
+#ifndef PORTABLE_IMAGE_FORMATS_H
+#define PORTABLE_IMAGE_FORMATS_H
#include "MgPortable.h"
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableImageFormats
+class MG_PORTABLE_API MgPortableImageFormats
{
PUBLISHED_API:
/// \internal
Modified: trunk/MgDev/Portable/MgPortable/Services/MappingService.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/MappingService.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/MappingService.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -301,7 +301,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -367,7 +367,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -439,7 +439,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -526,7 +526,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -564,7 +564,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
Modified: trunk/MgDev/Portable/MgPortable/Services/MappingService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/MappingService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/MappingService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -1,5 +1,5 @@
-#ifndef DESKTOP_MAPPING_SERVICE_H
-#define DESKTOP_MAPPING_SERVICE_H
+#ifndef PORTABLE_MAPPING_SERVICE_H
+#define PORTABLE_MAPPING_SERVICE_H
#include "MgPortable.h"
@@ -14,7 +14,7 @@
class FeatureTypeStyle;
}
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
/// Performs map related operations such as getting an eMap DWF
/// representing a map or updates to a map, or querying features
/// from maps or layers of a map.
-class MG_DESKTOP_API MgPortableMappingService : public MgService
+class MG_PORTABLE_API MgPortableMappingService : public MgService
{
DECLARE_CLASSNAME(MgPortableMappingService)
@@ -228,7 +228,7 @@
virtual void Dispose() { delete this; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_RenderingService_RenderingService;
+ static const INT32 m_cls_id = MapGuide_Portable_RenderingService_RenderingService;
};
/// \}
#endif
\ No newline at end of file
Modified: trunk/MgDev/Portable/MgPortable/Services/ProfilingService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/ProfilingService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/ProfilingService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -1,5 +1,5 @@
-#ifndef DESKTOP_PROFILING_SERVICE_H
-#define DESKTOP_PROFILING_SERVICE_H
+#ifndef PORTABLE_PROFILING_SERVICE_H
+#define PORTABLE_PROFILING_SERVICE_H
#include "MgPortable.h"
@@ -6,12 +6,12 @@
class MgPortableRenderingOptions;
class MgPortableRenderingService;
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
/// \brief
/// This class provides services to profile existing MapGuide APIs
-class MG_DESKTOP_API MgPortableProfilingService : public MgService
+class MG_PORTABLE_API MgPortableProfilingService : public MgService
{
PUBLISHED_API:
@@ -120,7 +120,7 @@
MgPortableRenderingService* m_svcRendering;
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_ProfilingService_ProfilingService;
+ static const INT32 m_cls_id = MapGuide_Portable_ProfilingService_ProfilingService;
};
/// \}
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomLogoInfo.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomLogoInfo.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomLogoInfo.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,11 +15,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CUSTOM_LOGO_INFO_H
-#define DESKTOP_CUSTOM_LOGO_INFO_H
+#ifndef PORTABLE_CUSTOM_LOGO_INFO_H
+#define PORTABLE_CUSTOM_LOGO_INFO_H
/// \cond INTERNAL
-class MG_DESKTOP_API MgPortableCustomLogoInfo
+class MG_PORTABLE_API MgPortableCustomLogoInfo
{
DECLARE_CLASSNAME(MgPortableCustomLogoInfo)
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomTextInfo.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomTextInfo.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/CustomTextInfo.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,11 +15,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CUSTOM_TEXT_INFO_H
-#define DESKTOP_CUSTOM_TEXT_INFO_H
+#ifndef PORTABLE_CUSTOM_TEXT_INFO_H
+#define PORTABLE_CUSTOM_TEXT_INFO_H
/// \cond INTERNAL
-class MG_DESKTOP_API MgPortableCustomTextInfo
+class MG_PORTABLE_API MgPortableCustomTextInfo
{
DECLARE_CLASSNAME(MgPortableCustomTextInfo)
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/DwfVersion.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/DwfVersion.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/DwfVersion.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,10 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_DWF_VERSION_H
-#define DEKSTOP_DWF_VERSION_H
+#ifndef PORTABLE_DWF_VERSION_H
+#define PORTABLE_DWF_VERSION_H
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
/////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@
/// These parameters should be set by the client so the MapGuide
/// server generates client-side compatible DWFs.
///
-class MG_DESKTOP_API MgPortableDwfVersion : public MgSerializable
+class MG_PORTABLE_API MgPortableDwfVersion : public MgSerializable
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableDwfVersion)
@@ -180,7 +180,7 @@
virtual INT32 GetClassId() { return m_cls_id; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_DwfVersion;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_DwfVersion;
INTERNAL_API:
//////////////////////////////////////////////////////////////////
@@ -213,4 +213,4 @@
};
/// \}
-#endif // DESKTOP_DWF_VERSION_H
+#endif // PORTABLE_DWF_VERSION_H
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInfoRenderer.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInfoRenderer.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInfoRenderer.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_FEATURE_INFO_RENDERER_H
-#define DESKTOP_FEATURE_INFO_RENDERER_H
+#ifndef PORTABLE_FEATURE_INFO_RENDERER_H
+#define PORTABLE_FEATURE_INFO_RENDERER_H
#include "SE_Renderer.h"
#include "RS_FontEngine.h"
@@ -31,7 +31,7 @@
//RenderingService API. Accumulates feature IDs and also attributes
//for one feature (case where a tooltip or attribute info needs to
//be displayed in the AJAX viewer)
-class MG_DESKTOP_API MgPortableFeatureInfoRenderer : public SE_Renderer, public RS_FontEngine
+class MG_PORTABLE_API MgPortableFeatureInfoRenderer : public SE_Renderer, public RS_FontEngine
{
public:
MgPortableFeatureInfoRenderer(MgPortableSelection* selection,
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInformation.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInformation.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/FeatureInformation.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -19,16 +19,16 @@
#define _MG_FEATUREINFORMATION_H_
class MgPortableFeatureInformation;
-template class MG_DESKTOP_API Ptr<MgPortableFeatureInformation>;
+template class MG_PORTABLE_API Ptr<MgPortableFeatureInformation>;
class MgPortableSelection;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
///////////////////////////////////////////////////////////
/// \brief
/// Information about features.
///
-class MG_DESKTOP_API MgPortableFeatureInformation : public MgSerializable
+class MG_PORTABLE_API MgPortableFeatureInformation : public MgSerializable
{
MG_DECL_DYNCREATE();
DECLARE_CLASSNAME(MgPortableFeatureInformation)
@@ -168,7 +168,7 @@
virtual INT32 GetClassId() { return m_cls_id; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_RenderingService_FeatureInformation;
+ static const INT32 m_cls_id = MapGuide_Portable_RenderingService_FeatureInformation;
protected:
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/Layout.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/Layout.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/Layout.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,12 +15,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_LAYOUT_H
-#define DESKTOP_LAYOUT_H
+#ifndef PORTABLE_LAYOUT_H
+#define PORTABLE_LAYOUT_H
#include "UnitType.h"
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
class MgResourceIdentifier;
@@ -28,7 +28,7 @@
/// \brief
/// Specifies the ResourceId of the PrintLayout to use for a particular
/// map, the title and the type of units to use in the layout.
-class MG_DESKTOP_API MgPortableLayout : public MgSerializable
+class MG_PORTABLE_API MgPortableLayout : public MgSerializable
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableLayout)
@@ -224,7 +224,7 @@
virtual INT32 GetClassId() { return m_cls_id; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_Layout;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_Layout;
INTERNAL_API:
@@ -269,4 +269,4 @@
};
/// \}
-#endif // DESKTOP_LAYOUT_H
+#endif // PORTABLE_LAYOUT_H
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/LegendPlotUtil.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/LegendPlotUtil.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/LegendPlotUtil.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_LEGEND_PLOT_UTIL_H
-#define DESKTOP_LEGEND_PLOT_UTIL_H
+#ifndef PORTABLE_LEGEND_PLOT_UTIL_H
+#define PORTABLE_LEGEND_PLOT_UTIL_H
class EPlotRenderer;
@@ -24,7 +24,7 @@
typedef std::map<STRING, LayerGroupList> LayerGroupChildMap;
typedef std::map<STRING, int> VisibleLayerCountMap;
-class MG_DESKTOP_API MgPortableLegendPlotUtil
+class MG_PORTABLE_API MgPortableLegendPlotUtil
{
public:
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlot.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlot.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlot.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,14 +15,14 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAP_PLOT_H_
-#define DESKTOP_MAP_PLOT_H_
+#ifndef PORTABLE_MAP_PLOT_H_
+#define PORTABLE_MAP_PLOT_H_
class MgPortableMap;
class MgPortableLayer;
class MgPortablePlotSpecification;
class MgPortableLayout;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
/////////////////////////////////////////////////////////////////
/// \brief
@@ -29,7 +29,7 @@
/// The MgPortableMapPlot class allows the developer to specify the map,
/// the view of the map, the plot specification, and the layout
/// for one sheet within a call to GenerateMultiPlot.
-class MG_DESKTOP_API MgPortableMapPlot : public MgNamedSerializable
+class MG_PORTABLE_API MgPortableMapPlot : public MgNamedSerializable
{
DECLARE_CLASSNAME(MgPortableMapPlot)
@@ -498,7 +498,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_MapPlot;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_MapPlot;
private:
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotCollection.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotCollection.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotCollection.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,19 +15,19 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAP_PLOT_COLLECTION_H_
-#define DESKTOP_MAP_PLOT_COLLECTION_H_
+#ifndef PORTABLE_MAP_PLOT_COLLECTION_H_
+#define PORTABLE_MAP_PLOT_COLLECTION_H_
class MgPortableMapPlotCollection;
-template class MG_DESKTOP_API Ptr<MgPortableMapPlotCollection>;
+template class MG_PORTABLE_API Ptr<MgPortableMapPlotCollection>;
class MgPortableMapPlot;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
/////////////////////////////////////////////////////////////////
/// \brief
/// Manipulates collections of MgPortableMapPlot objects.
-class MG_DESKTOP_API MgPortableMapPlotCollection : public MgSerializable
+class MG_PORTABLE_API MgPortableMapPlotCollection : public MgSerializable
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableMapPlotCollection)
@@ -419,7 +419,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_MapPlotCollection;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_MapPlotCollection;
private:
MgNamedCollection* m_mapPlots;
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotInstruction.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotInstruction.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/MapPlotInstruction.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,10 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAPPLOT_INSTRUCTION_H
-#define DESKTOP_MAPPLOT_INSTRUCTION_H
+#ifndef PORTABLE_MAPPLOT_INSTRUCTION_H
+#define PORTABLE_MAPPLOT_INSTRUCTION_H
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
///////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -25,7 +25,7 @@
/// MgPortableMapPlotInstruction defines enumerated values used to indicate whether the plot
/// should be based on the center and scale of the map,
/// an overridden center and scale, or an overridden extent.
-class MG_DESKTOP_API MgPortableMapPlotInstruction
+class MG_PORTABLE_API MgPortableMapPlotInstruction
{
DECLARE_CLASSNAME(MgPortableMapPlotInstruction)
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingDefs.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingDefs.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingDefs.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAPPING_DEFS_H
-#define DESKTOP_MAPPING_DEFS_H
+#ifndef PORTABLE_MAPPING_DEFS_H
+#define PORTABLE_MAPPING_DEFS_H
#include "MgPortable.h"
#include <assert.h>
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingUtil.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingUtil.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/MappingUtil.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_MAPPING_UTIL_H
-#define DESKTOP_MAPPING_UTIL_H
+#ifndef PORTABLE_MAPPING_UTIL_H
+#define PORTABLE_MAPPING_UTIL_H
#include "MgPortable.h"
#include "MapLayer/Layer.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/PlotSpecification.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/PlotSpecification.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/PlotSpecification.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,18 +15,18 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_PLOT_SPECIFICATION_H
-#define DESKTOP_PLOT_SPECIFICATION_H
+#ifndef PORTABLE_PLOT_SPECIFICATION_H
+#define PORTABLE_PLOT_SPECIFICATION_H
#include "MgPortable.h"
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
////////////////////////////////////////////////////////////
/// \brief
/// Specifies the size and format of the \link ePlot ePlot \endlink
/// sheet to be created by the Mapping Service operations.
-class MG_DESKTOP_API MgPortablePlotSpecification : public MgSerializable
+class MG_PORTABLE_API MgPortablePlotSpecification : public MgSerializable
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortablePlotSpecification)
@@ -297,7 +297,7 @@
virtual INT32 GetClassId() { return m_cls_id; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_PlotSpecification;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_PlotSpecification;
INTERNAL_API:
//////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/PrintLayout.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/PrintLayout.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/PrintLayout.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_PRINTLAYOUT_H_
-#define DESKTOP_PRINTLAYOUT_H_
+#ifndef PORTABLE_PRINTLAYOUT_H_
+#define PORTABLE_PRINTLAYOUT_H_
#include <vector>
@@ -41,7 +41,7 @@
/// Future directions for this class (time permitting) are to
/// remove and/or rewrite the functionality of this class
/// in more appropriate utility class.
-class MG_DESKTOP_API MgPortablePrintLayout : public MgSerializable
+class MG_PORTABLE_API MgPortablePrintLayout : public MgSerializable
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortablePrintLayout)
@@ -209,7 +209,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_PrintLayout;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_PrintLayout;
INTERNAL_API:
/// Layout element constants
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgFeatureReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RS_FEATURE_READER_H
-#define DESKTOP_RS_FEATURE_READER_H
+#ifndef PORTABLE_RS_FEATURE_READER_H
+#define PORTABLE_RS_FEATURE_READER_H
#include "MgPortable.h"
#include "RS_FeatureReader.h"
@@ -35,7 +35,7 @@
class RS_InputStream;
//RS_FeatureReader implementation based on an MgFeatureReader
-class MG_DESKTOP_API RSMgPortableFeatureReader : public RS_FeatureReader
+class MG_PORTABLE_API RSMgPortableFeatureReader : public RS_FeatureReader
{
public:
RSMgPortableFeatureReader(MgFeatureReader* reader, MgFeatureService* svcFeature, MgResourceIdentifier* featResId, MgFeatureQueryOptions* options, const STRING& geomPropName);
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgInputStream.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgInputStream.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgInputStream.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RS_INPUT_STREAM_H
-#define DESKTOP_RS_INPUT_STREAM_H
+#ifndef PORTABLE_RS_INPUT_STREAM_H
+#define PORTABLE_RS_INPUT_STREAM_H
#include "RS_InputStream.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgRaster.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgRaster.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgRaster.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RS_RASTER_H
-#define DESKTOP_RS_RASTER_H
+#ifndef PORTABLE_RS_RASTER_H
+#define PORTABLE_RS_RASTER_H
#include "MgPortable.h"
#include "RS_Raster.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/RSMgSymbolManager.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RS_SYMBOL_MANAGER_H
-#define DESKTOP_RS_SYMBOL_MANAGER_H
+#ifndef PORTABLE_RS_SYMBOL_MANAGER_H
+#define PORTABLE_RS_SYMBOL_MANAGER_H
#include "MgPortable.h"
#include "RS_SymbolManager.h"
@@ -24,7 +24,7 @@
// MappingService specific implementation of the RS_SymbolManager interface.
// It retrieves DWF symbol data from the resource service and caches it
// for reuse by stylization.
-class MG_DESKTOP_API RSMgPortableSymbolManager : public RS_SymbolManager
+class MG_PORTABLE_API RSMgPortableSymbolManager : public RS_SymbolManager
{
public:
RSMgPortableSymbolManager(MgResourceService* svc);
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/RenderingOptions.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/RenderingOptions.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/RenderingOptions.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,12 +15,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RENDERING_OPTIONS_H
-#define DESKTOP_RENDERING_OPTIONS_H
+#ifndef PORTABLE_RENDERING_OPTIONS_H
+#define PORTABLE_RENDERING_OPTIONS_H
#include "MgPortable.h"
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
///////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@
/// \brief
/// Options for Rendering Service.
///
-class MG_DESKTOP_API MgPortableRenderingOptions: public MgSerializable
+class MG_PORTABLE_API MgPortableRenderingOptions: public MgSerializable
{
MG_DECL_DYNCREATE();
DECLARE_CLASSNAME(MgPortableRenderingOptions)
@@ -153,7 +153,7 @@
INT32 m_behavior;
Ptr<MgColor> m_selectionColor;
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_RenderingService_RenderingOptions;
+ static const INT32 m_cls_id = MapGuide_Portable_RenderingService_RenderingOptions;
};
/// \}
Modified: trunk/MgDev/Portable/MgPortable/Services/Rendering/UnitType.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Rendering/UnitType.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Rendering/UnitType.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,10 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_UNITTYPE_H
-#define DESKTOP_UNITTYPE_H
+#ifndef PORTABLE_UNITTYPE_H
+#define PORTABLE_UNITTYPE_H
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
///////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,7 @@
/// \brief
/// MgPortableUnitType defines enumerated values used to determine the type
/// of units for plot decorations (scale bar).
-class MG_DESKTOP_API MgPortableUnitType
+class MG_PORTABLE_API MgPortableUnitType
{
PUBLISHED_API:
/// \if INTERNAL
@@ -47,7 +47,7 @@
/// * [[TO DO: I should change my examples to use this
/// instead of hardcoding the string.]]
///
-class MG_DESKTOP_API MgPortablePageUnitsType
+class MG_PORTABLE_API MgPortablePageUnitsType
{
PUBLISHED_API:
/// \if INTERNAL
@@ -63,7 +63,7 @@
/// \}
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
///////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -70,7 +70,7 @@
/// Specifies the coordinate space for feature geometry returned from QueryFeatures.
/// Can also specify that only non-geometric data should be returned by QueryFeature.
///
-class MG_DESKTOP_API MgPortableCoordinateSpace
+class MG_PORTABLE_API MgPortableCoordinateSpace
{
PUBLISHED_API:
/// \if INTERNAL
Modified: trunk/MgDev/Portable/MgPortable/Services/RenderingService.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/RenderingService.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/RenderingService.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -215,7 +215,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -335,7 +335,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -385,7 +385,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -432,7 +432,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -483,7 +483,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -529,7 +529,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -580,7 +580,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -819,7 +819,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -868,7 +868,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -922,7 +922,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1492,7 +1492,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
Modified: trunk/MgDev/Portable/MgPortable/Services/RenderingService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/RenderingService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/RenderingService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RENDERING_SERVICE_H
-#define DESKTOP_RENDERING_SERVICE_H
+#ifndef PORTABLE_RENDERING_SERVICE_H
+#define PORTABLE_RENDERING_SERVICE_H
class MgPortableMap;
class MgPortableFeatureInformation;
@@ -37,12 +37,12 @@
template class Ptr<MgPortableDrawingService>;
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
/// \brief
/// This class provides services to render a map into an image
-class MG_DESKTOP_API MgPortableRenderingService : public MgService
+class MG_PORTABLE_API MgPortableRenderingService : public MgService
{
DECLARE_CLASSNAME(MgPortableRenderingService)
@@ -549,7 +549,7 @@
virtual void Dispose() { delete this; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_MappingService_MappingService;
+ static const INT32 m_cls_id = MapGuide_Portable_MappingService_MappingService;
};
/// \}
#endif
\ No newline at end of file
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ByteSourceDwfInputStreamImpl.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ByteSourceDwfInputStreamImpl.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ByteSourceDwfInputStreamImpl.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_BYTE_SOURCE_DWF_INPUT_STREAM_IMPL_H
-#define DESKTOP_BYTE_SOURCE_DWF_INPUT_STREAM_IMPL_H
+#ifndef PORTABLE_BYTE_SOURCE_DWF_INPUT_STREAM_IMPL_H
+#define PORTABLE_BYTE_SOURCE_DWF_INPUT_STREAM_IMPL_H
///////////////////////////////////////////////////////////////////////////////
/// <summary>
@@ -24,7 +24,7 @@
/// stream source.
/// </summary>
///
-class MG_DESKTOP_API MgPortableByteSourceDwfInputStreamImpl : public ByteSourceImpl
+class MG_PORTABLE_API MgPortableByteSourceDwfInputStreamImpl : public ByteSourceImpl
{
public:
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/OperationInfo.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/OperationInfo.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/OperationInfo.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_OPERATION_INFO_H
-#define DESKTOP_OPERATION_INFO_H
+#ifndef PORTABLE_OPERATION_INFO_H
+#define PORTABLE_OPERATION_INFO_H
#include "OperationParameter.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/OperationParameter.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/OperationParameter.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/OperationParameter.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_OPERATION_PARAMETER_H
-#define DESKTOP_OPERATION_PARAMETER_H
+#ifndef PORTABLE_OPERATION_PARAMETER_H
+#define PORTABLE_OPERATION_PARAMETER_H
class MgPortableOperationParameter
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceContentCache.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceContentCache.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceContentCache.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,12 +15,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_CONTENT_CACHE_H
-#define DESKTOP_RESOURCE_CONTENT_CACHE_H
+#ifndef PORTABLE_RESOURCE_CONTENT_CACHE_H
+#define PORTABLE_RESOURCE_CONTENT_CACHE_H
#include "MgPortable.h"
-class MG_DESKTOP_API MgPortableResourceContentCache : public MgGuardDisposable
+class MG_PORTABLE_API MgPortableResourceContentCache : public MgGuardDisposable
{
private:
static Ptr<MgPortableResourceContentCache> smInstance;
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceDefs.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceDefs.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourceDefs.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_DEFS_H
-#define DESKTOP_RESOURCE_DEFS_H
+#ifndef PORTABLE_RESOURCE_DEFS_H
+#define PORTABLE_RESOURCE_DEFS_H
#include <assert.h>
#include <map>
@@ -28,7 +28,7 @@
/// \brief
/// Package API names
///
-class MG_DESKTOP_API MgPortablePackageApiName
+class MG_PORTABLE_API MgPortablePackageApiName
{
INTERNAL_API:
static const STRING LoadPackage; /// value("LoadPackage")
@@ -40,7 +40,7 @@
/// \brief
/// Status codes for packages
///
-class MG_DESKTOP_API MgPortablePackageStatusCode
+class MG_PORTABLE_API MgPortablePackageStatusCode
{
EXTERNAL_API:
/// Indicates a package was successfully loaded/made.
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageHandler.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageHandler.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageHandler.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_PACKAGE_HANDLER_H
-#define DESKTOP_RESOURCE_PACKAGE_HANDLER_H
+#ifndef PORTABLE_RESOURCE_PACKAGE_HANDLER_H
+#define PORTABLE_RESOURCE_PACKAGE_HANDLER_H
class MgPortableResourcePackageHandler
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -236,7 +236,7 @@
void MgPortableResourcePackageLoader::UpdateRepository(
const MgOperationInfo& opInfo)
{
- //NOOP. mg-desktop doesn't implement this operation
+ //NOOP. mg-portable doesn't implement this operation
}
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageLoader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_PACKAGE_LOADER_H
-#define DESKTOP_RESOURCE_PACKAGE_LOADER_H
+#ifndef PORTABLE_RESOURCE_PACKAGE_LOADER_H
+#define PORTABLE_RESOURCE_PACKAGE_LOADER_H
#include "ResourcePackageHandler.h"
#include "ZipFileReader.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestHandler.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestHandler.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestHandler.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_PACKAGE_MANIFEST_HANDLER_H
-#define DESKTOP_RESOURCE_PACKAGE_MANIFEST_HANDLER_H
+#ifndef PORTABLE_RESOURCE_PACKAGE_MANIFEST_HANDLER_H
+#define PORTABLE_RESOURCE_PACKAGE_MANIFEST_HANDLER_H
#include "System/XmlUtil.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestParser.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestParser.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ResourcePackageManifestParser.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_PACKAGE_MANIFEST_PARSER_H
-#define DESKTOP_RESOURCE_PACKAGE_MANIFEST_PARSER_H
+#ifndef PORTABLE_RESOURCE_PACKAGE_MANIFEST_PARSER_H
+#define PORTABLE_RESOURCE_PACKAGE_MANIFEST_PARSER_H
#include "ResourcePackageManifestHandler.h"
#include "OperationInfo.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataManager.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataManager.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataManager.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_UNMANAGED_DATA_MANAGER_H
-#define DESKTOP_UNMANAGED_DATA_MANAGER_H
+#ifndef PORTABLE_UNMANAGED_DATA_MANAGER_H
+#define PORTABLE_UNMANAGED_DATA_MANAGER_H
class MgPortableUnmanagedDataManager : public MgGuardDisposable
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataType.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataType.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/UnmanagedDataType.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,11 +15,11 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_UNMANAGED_DATA_TYPE_H
-#define DESKTOP_UNMANAGED_DATA_TYPE_H
-/// \ingroup Desktop_Misc_Module
+#ifndef PORTABLE_UNMANAGED_DATA_TYPE_H
+#define PORTABLE_UNMANAGED_DATA_TYPE_H
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableUnmanagedDataType
+class MG_PORTABLE_API MgPortableUnmanagedDataType
{
PUBLISHED_API:
/// \internal
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileHandler.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileHandler.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileHandler.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_ZIP_FILE_HANDLER_H
-#define DESKTOP_ZIP_FILE_HANDLER_H
+#ifndef PORTABLE_ZIP_FILE_HANDLER_H
+#define PORTABLE_ZIP_FILE_HANDLER_H
class MgPortableZipFileHandler
{
Modified: trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Resource/ZipFileReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_ZIP_FILE_READER_H
-#define DESKTOP_ZIP_FILE_READER_H
+#ifndef PORTABLE_ZIP_FILE_READER_H
+#define PORTABLE_ZIP_FILE_READER_H
#include "ZipFileHandler.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/ResourceService.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/ResourceService.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/ResourceService.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -262,7 +262,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
if (!packagePathname.empty())
@@ -441,7 +441,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -496,7 +496,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -624,7 +624,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -661,7 +661,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -763,7 +763,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -831,7 +831,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -878,7 +878,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -938,7 +938,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -975,7 +975,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1178,7 +1178,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1323,7 +1323,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1391,7 +1391,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1450,7 +1450,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1498,7 +1498,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1583,7 +1583,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1776,7 +1776,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -1830,7 +1830,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
Modified: trunk/MgDev/Portable/MgPortable/Services/ResourceService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/ResourceService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/ResourceService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,13 +15,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_RESOURCE_SERVICE_H
-#define DESKTOP_RESOURCE_SERVICE_H
+#ifndef PORTABLE_RESOURCE_SERVICE_H
+#define PORTABLE_RESOURCE_SERVICE_H
#include "MgPortable.h"
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
-class MG_DESKTOP_API MgPortableResourceService : public MgResourceService
+class MG_PORTABLE_API MgPortableResourceService : public MgResourceService
{
friend class MgPortableFdoConnectionUtil;
@@ -113,7 +113,7 @@
void AddAliasMapping(CREFSTRING aliasName, CREFSTRING path);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_ResourceService_ResourceService;
+ static const INT32 m_cls_id = MapGuide_Portable_ResourceService_ResourceService;
protected:
virtual INT32 GetClassId() { return m_cls_id; }
Modified: trunk/MgDev/Portable/MgPortable/Services/ScrollableFeatureReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/ScrollableFeatureReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/ScrollableFeatureReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SCROLLABLE_FEATURE_READER_H
-#define DESKTOP_SCROLLABLE_FEATURE_READER_H
+#ifndef PORTABLE_SCROLLABLE_FEATURE_READER_H
+#define PORTABLE_SCROLLABLE_FEATURE_READER_H
#include "MgPortable.h"
@@ -25,9 +25,9 @@
// The MgPortableScrollableFeatureReader is an extension to the MgFeatureReader
// that can be traversed in the forward and backward direction (scrollable)
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableScrollableFeatureReader : public MgPortableFeatureReader
+class MG_PORTABLE_API MgPortableScrollableFeatureReader : public MgPortableFeatureReader
{
INTERNAL_API:
MgPortableScrollableFeatureReader(MgPortableFeatureConnection* conn, FdoIScrollableFeatureReader* reader);
Modified: trunk/MgDev/Portable/MgPortable/Services/ServiceFactory.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/ServiceFactory.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/ServiceFactory.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SERVICE_FACTORY_H
-#define DESKTOP_SERVICE_FACTORY_H
+#ifndef PORTABLE_SERVICE_FACTORY_H
+#define PORTABLE_SERVICE_FACTORY_H
class MgService;
class MgPortableTileService;
@@ -25,13 +25,13 @@
class MgPortableResourceService;
class MgPortableDrawingService;
class MgPortableRenderingService;
-/// \ingroup Desktop_Module
+/// \ingroup Portable_Module
/// \{
///\brief
/// The MgPortableServiceFactory class allows you to create instances of service
/// classes
-class MG_DESKTOP_API MgPortableServiceFactory : public MgGuardDisposable
+class MG_PORTABLE_API MgPortableServiceFactory : public MgGuardDisposable
{
MG_DECL_DYNCREATE()
DECLARE_CLASSNAME(MgPortableServiceFactory)
@@ -67,7 +67,7 @@
static void Initialize();
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_ServiceFactory;
+ static const INT32 m_cls_id = MapGuide_Portable_ServiceFactory;
protected:
~MgPortableServiceFactory();
Modified: trunk/MgDev/Portable/MgPortable/Services/SqlReader.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/SqlReader.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/SqlReader.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,16 +15,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SQL_READER_H
-#define DESKTOP_SQL_READER_H
+#ifndef PORTABLE_SQL_READER_H
+#define PORTABLE_SQL_READER_H
#include "MgPortable.h"
class FdoISQLDataReader;
class MgPortableFeatureConnection;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableSqlDataReader : public MgSqlDataReader
+class MG_PORTABLE_API MgPortableSqlDataReader : public MgSqlDataReader
{
INTERNAL_API:
MgPortableSqlDataReader(MgPortableFeatureConnection* conn, FdoISQLDataReader* reader);
Modified: trunk/MgDev/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Stylization/SEMgSymbolManager.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_SE_SYMBOL_MANAGER_H
-#define DESKTOP_SE_SYMBOL_MANAGER_H
+#ifndef PORTABLE_SE_SYMBOL_MANAGER_H
+#define PORTABLE_SE_SYMBOL_MANAGER_H
#include "MgPortable.h"
#include "SE_SymbolManager.h"
Modified: trunk/MgDev/Portable/MgPortable/Services/Tile/TileCache.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Tile/TileCache.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Tile/TileCache.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_TILE_CACHE_H
-#define DESKTOP_TILE_CACHE_H
+#ifndef PORTABLE_TILE_CACHE_H
+#define PORTABLE_TILE_CACHE_H
class MgResourceIdentifier;
class MgMapBase;
Modified: trunk/MgDev/Portable/MgPortable/Services/Tile/TileDefs.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Tile/TileDefs.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Tile/TileDefs.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,12 +15,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_TILE_DEFS_H
-#define DESKTOP_TILE_DEFS_H
+#ifndef PORTABLE_TILE_DEFS_H
+#define PORTABLE_TILE_DEFS_H
#include "MgPortable.h"
-class MG_DESKTOP_API MgPortableTileParameters
+class MG_PORTABLE_API MgPortableTileParameters
{
INTERNAL_API:
static INT32 tileWidth; // width for all tiles
Modified: trunk/MgDev/Portable/MgPortable/Services/TileService.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/TileService.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/TileService.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -281,7 +281,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
if (NULL != lockFile)
@@ -416,7 +416,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
if (NULL != lockFile)
@@ -600,7 +600,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -738,7 +738,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
@@ -772,7 +772,7 @@
{
// Failed operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Failure.c_str());
- MG_DESKTOP_LOG_EXCEPTION();
+ MG_PORTABLE_LOG_EXCEPTION();
}
// Add access log entry for operation
Modified: trunk/MgDev/Portable/MgPortable/Services/TileService.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/TileService.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/TileService.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,13 +15,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_TILE_SERVICE_H
-#define DESKTOP_TILE_SERVICE_H
+#ifndef PORTABLE_TILE_SERVICE_H
+#define PORTABLE_TILE_SERVICE_H
#include "Tile/TileCache.h"
-/// \ingroup Desktop_Service_Module
+/// \ingroup Portable_Service_Module
/// \{
-class MG_DESKTOP_API MgPortableTileService : public MgService
+class MG_PORTABLE_API MgPortableTileService : public MgService
{
DECLARE_CLASSNAME(MgPortableTileService)
@@ -71,7 +71,7 @@
virtual void Dispose() { delete this; }
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Desktop_TileService_TileService;
+ static const INT32 m_cls_id = MapGuide_Portable_TileService_TileService;
private:
Modified: trunk/MgDev/Portable/MgPortable/Services/Transaction.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/Services/Transaction.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/Services/Transaction.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,16 +15,16 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_TRANSACTION_H
-#define DESKTOP_TRANSACTION_H
+#ifndef PORTABLE_TRANSACTION_H
+#define PORTABLE_TRANSACTION_H
#include "MgPortable.h"
class MgPortableFeatureConnection;
class FdoITransaction;
-/// \ingroup Desktop_Misc_Module
+/// \ingroup Portable_Misc_Module
/// \{
-class MG_DESKTOP_API MgPortableTransaction : public MgTransaction
+class MG_PORTABLE_API MgPortableTransaction : public MgTransaction
{
INTERNAL_API:
MgPortableTransaction(MgPortableFeatureConnection* conn, MgResourceIdentifier* resource);
Modified: trunk/MgDev/Portable/MgPortable/System/ClassId.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/ClassId.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/ClassId.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,133 +15,133 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CLASSID_H
-#define DESKTOP_CLASSID_H
+#ifndef PORTABLE_CLASSID_H
+#define PORTABLE_CLASSID_H
// Predefined ranges for each service
-#define MAPGUIDE_DESKTOP_EXCEPTION_ID 40000
-#define MAPGUIDE_DESKTOP_MAPLAYER_ID 40500
-#define MAPGUIDE_DESKTOP_SERVICE_ID 40600
-#define MAPGUIDE_DESKTOP_DRAWINGSERVICE_ID 40700
-#define MAPGUIDE_DESKTOP_FEATURESERVICE_ID 40800
-#define MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID 40900
-#define MAPGUIDE_DESKTOP_RENDERINGSERVICE_ID 41000
-#define MAPGUIDE_DESKTOP_RESOURCESERVICE_ID 41100
-#define MAPGUIDE_DESKTOP_TILESERVICE_ID 41200
-#define MAPGUIDE_DESKTOP_KMLSERVICE_ID 41300
-#define MAPGUIDE_DESKTOP_PROFILING_SERVICE_ID 41400
+#define MAPGUIDE_PORTABLE_EXCEPTION_ID 40000
+#define MAPGUIDE_PORTABLE_MAPLAYER_ID 40500
+#define MAPGUIDE_PORTABLE_SERVICE_ID 40600
+#define MAPGUIDE_PORTABLE_DRAWINGSERVICE_ID 40700
+#define MAPGUIDE_PORTABLE_FEATURESERVICE_ID 40800
+#define MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID 40900
+#define MAPGUIDE_PORTABLE_RENDERINGSERVICE_ID 41000
+#define MAPGUIDE_PORTABLE_RESOURCESERVICE_ID 41100
+#define MAPGUIDE_PORTABLE_TILESERVICE_ID 41200
+#define MAPGUIDE_PORTABLE_KMLSERVICE_ID 41300
+#define MAPGUIDE_PORTABLE_PROFILING_SERVICE_ID 41400
// MapLayer API
-#define MapGuide_Desktop_MapLayer_Map MAPGUIDE_DESKTOP_MAPLAYER_ID+0
-#define MapGuide_Desktop_MapLayer_Layer MAPGUIDE_DESKTOP_MAPLAYER_ID+1
-#define MapGuide_Desktop_MapLayer_Selection MAPGUIDE_DESKTOP_MAPLAYER_ID+2
-#define MapGuide_Desktop_MapLayer_Controller MAPGUIDE_DESKTOP_MAPLAYER_ID+3
-#define MapGuide_Desktop_MapLayer_AdvController MAPGUIDE_DESKTOP_MAPLAYER_ID+4
-#define MapGuide_Desktop_MapLayer_ZcvController MAPGUIDE_DESKTOP_MAPLAYER_ID+5
+#define MapGuide_Portable_MapLayer_Map MAPGUIDE_PORTABLE_MAPLAYER_ID+0
+#define MapGuide_Portable_MapLayer_Layer MAPGUIDE_PORTABLE_MAPLAYER_ID+1
+#define MapGuide_Portable_MapLayer_Selection MAPGUIDE_PORTABLE_MAPLAYER_ID+2
+#define MapGuide_Portable_MapLayer_Controller MAPGUIDE_PORTABLE_MAPLAYER_ID+3
+#define MapGuide_Portable_MapLayer_AdvController MAPGUIDE_PORTABLE_MAPLAYER_ID+4
+#define MapGuide_Portable_MapLayer_ZcvController MAPGUIDE_PORTABLE_MAPLAYER_ID+5
// MapGuide Exceptions
-#define MapGuide_Desktop_Exception_AuthenticationFailedException MAPGUIDE_DESKTOP_EXCEPTION_ID+0
-#define MapGuide_Desktop_Exception_ConnectionFailedException MAPGUIDE_DESKTOP_EXCEPTION_ID+1
-#define MapGuide_Desktop_Exception_ConnectionNotOpenException MAPGUIDE_DESKTOP_EXCEPTION_ID+2
-#define MapGuide_Desktop_Exception_DbException MAPGUIDE_DESKTOP_EXCEPTION_ID+3
-#define MapGuide_Desktop_Exception_DbXmlException MAPGUIDE_DESKTOP_EXCEPTION_ID+4
-#define MapGuide_Desktop_Exception_DuplicateGroupException MAPGUIDE_DESKTOP_EXCEPTION_ID+5
-#define MapGuide_Desktop_Exception_DuplicateNameException MAPGUIDE_DESKTOP_EXCEPTION_ID+6
-#define MapGuide_Desktop_Exception_DuplicateParameterException MAPGUIDE_DESKTOP_EXCEPTION_ID+7
-#define MapGuide_Desktop_Exception_DuplicateRepositoryException MAPGUIDE_DESKTOP_EXCEPTION_ID+8
-#define MapGuide_Desktop_Exception_DuplicateRoleException MAPGUIDE_DESKTOP_EXCEPTION_ID+9
-#define MapGuide_Desktop_Exception_DuplicateServerException MAPGUIDE_DESKTOP_EXCEPTION_ID+10
-#define MapGuide_Desktop_Exception_DuplicateSessionException MAPGUIDE_DESKTOP_EXCEPTION_ID+11
-#define MapGuide_Desktop_Exception_DuplicateUserException MAPGUIDE_DESKTOP_EXCEPTION_ID+12
-#define MapGuide_Desktop_Exception_DwfException MAPGUIDE_DESKTOP_EXCEPTION_ID+13
-#define MapGuide_Desktop_Exception_DwfSectionNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+14
-#define MapGuide_Desktop_Exception_DwfSectionResourceNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+15
-#define MapGuide_Desktop_Exception_EndOfStreamException MAPGUIDE_DESKTOP_EXCEPTION_ID+16
-#define MapGuide_Desktop_Exception_EvaluationExpiredException MAPGUIDE_DESKTOP_EXCEPTION_ID+17
-#define MapGuide_Desktop_Exception_GroupNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+18
-#define MapGuide_Desktop_Exception_InvalidDwfPackageException MAPGUIDE_DESKTOP_EXCEPTION_ID+19
-#define MapGuide_Desktop_Exception_InvalidDwfSectionException MAPGUIDE_DESKTOP_EXCEPTION_ID+20
-#define MapGuide_Desktop_Exception_InvalidFeatureSourceException MAPGUIDE_DESKTOP_EXCEPTION_ID+21
-#define MapGuide_Desktop_Exception_InvalidIpAddressException MAPGUIDE_DESKTOP_EXCEPTION_ID+22
-#define MapGuide_Desktop_Exception_InvalidLicenseException MAPGUIDE_DESKTOP_EXCEPTION_ID+23
-#define MapGuide_Desktop_Exception_InvalidLogEntryException MAPGUIDE_DESKTOP_EXCEPTION_ID+24
-#define MapGuide_Desktop_Exception_InvalidOperationVersionException MAPGUIDE_DESKTOP_EXCEPTION_ID+25
-#define MapGuide_Desktop_Exception_InvalidPasswordException MAPGUIDE_DESKTOP_EXCEPTION_ID+26
-#define MapGuide_Desktop_Exception_InvalidPrintLayoutFontSizeUnitsException MAPGUIDE_DESKTOP_EXCEPTION_ID+27
-#define MapGuide_Desktop_Exception_InvalidPrintLayoutPositionUnitsException MAPGUIDE_DESKTOP_EXCEPTION_ID+28
-#define MapGuide_Desktop_Exception_InvalidPrintLayoutSizeUnitsException MAPGUIDE_DESKTOP_EXCEPTION_ID+29
-#define MapGuide_Desktop_Exception_InvalidSerialNumberException MAPGUIDE_DESKTOP_EXCEPTION_ID+30
-#define MapGuide_Desktop_Exception_InvalidServerNameException MAPGUIDE_DESKTOP_EXCEPTION_ID+31
-#define MapGuide_Desktop_Exception_LicenseException MAPGUIDE_DESKTOP_EXCEPTION_ID+32
-#define MapGuide_Desktop_Exception_LicenseExpiredException MAPGUIDE_DESKTOP_EXCEPTION_ID+33
-#define MapGuide_Desktop_Exception_LogOpenFailedException MAPGUIDE_DESKTOP_EXCEPTION_ID+34
-#define MapGuide_Desktop_Exception_OperationProcessingException MAPGUIDE_DESKTOP_EXCEPTION_ID+35
-#define MapGuide_Desktop_Exception_ParameterNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+36
-#define MapGuide_Desktop_Exception_PathTooLongException MAPGUIDE_DESKTOP_EXCEPTION_ID+37
-#define MapGuide_Desktop_Exception_PermissionDeniedException MAPGUIDE_DESKTOP_EXCEPTION_ID+38
-#define MapGuide_Desktop_Exception_PortNotAvailableException MAPGUIDE_DESKTOP_EXCEPTION_ID+39
-#define MapGuide_Desktop_Exception_PrintToScaleModeNotSelectedException MAPGUIDE_DESKTOP_EXCEPTION_ID+40
-#define MapGuide_Desktop_Exception_RepositoryCreationFailedException MAPGUIDE_DESKTOP_EXCEPTION_ID+41
-#define MapGuide_Desktop_Exception_RepositoryNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+42
-#define MapGuide_Desktop_Exception_RepositoryNotOpenException MAPGUIDE_DESKTOP_EXCEPTION_ID+43
-#define MapGuide_Desktop_Exception_RepositoryOpenFailedException MAPGUIDE_DESKTOP_EXCEPTION_ID+44
-#define MapGuide_Desktop_Exception_RoleNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+45
-#define MapGuide_Desktop_Exception_ServerNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+46
-#define MapGuide_Desktop_Exception_ServerNotOnlineException MAPGUIDE_DESKTOP_EXCEPTION_ID+47
-#define MapGuide_Desktop_Exception_SessionExpiredException MAPGUIDE_DESKTOP_EXCEPTION_ID+48
-#define MapGuide_Desktop_Exception_UnauthorizedAccessException MAPGUIDE_DESKTOP_EXCEPTION_ID+49
-#define MapGuide_Desktop_Exception_UriFormatException MAPGUIDE_DESKTOP_EXCEPTION_ID+50
-#define MapGuide_Desktop_Exception_StylizeLayerFailedException MAPGUIDE_DESKTOP_EXCEPTION_ID+51
-#define MapGuide_Desktop_Exception_SessionNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+52
-#define MapGuide_Desktop_Exception_UnsupportedProviderThreadModelException MAPGUIDE_DESKTOP_EXCEPTION_ID+53
-#define MapGuide_Desktop_Exception_AllProviderConnectionsUsedException MAPGUIDE_DESKTOP_EXCEPTION_ID+54
-#define MapGuide_Desktop_Exception_RasterTransformationNotSupportedException MAPGUIDE_DESKTOP_EXCEPTION_ID+55
-#define MapGuide_Desktop_Exception_AliasNotFoundException MAPGUIDE_DESKTOP_EXCEPTION_ID+56
+#define MapGuide_Portable_Exception_AuthenticationFailedException MAPGUIDE_PORTABLE_EXCEPTION_ID+0
+#define MapGuide_Portable_Exception_ConnectionFailedException MAPGUIDE_PORTABLE_EXCEPTION_ID+1
+#define MapGuide_Portable_Exception_ConnectionNotOpenException MAPGUIDE_PORTABLE_EXCEPTION_ID+2
+#define MapGuide_Portable_Exception_DbException MAPGUIDE_PORTABLE_EXCEPTION_ID+3
+#define MapGuide_Portable_Exception_DbXmlException MAPGUIDE_PORTABLE_EXCEPTION_ID+4
+#define MapGuide_Portable_Exception_DuplicateGroupException MAPGUIDE_PORTABLE_EXCEPTION_ID+5
+#define MapGuide_Portable_Exception_DuplicateNameException MAPGUIDE_PORTABLE_EXCEPTION_ID+6
+#define MapGuide_Portable_Exception_DuplicateParameterException MAPGUIDE_PORTABLE_EXCEPTION_ID+7
+#define MapGuide_Portable_Exception_DuplicateRepositoryException MAPGUIDE_PORTABLE_EXCEPTION_ID+8
+#define MapGuide_Portable_Exception_DuplicateRoleException MAPGUIDE_PORTABLE_EXCEPTION_ID+9
+#define MapGuide_Portable_Exception_DuplicateServerException MAPGUIDE_PORTABLE_EXCEPTION_ID+10
+#define MapGuide_Portable_Exception_DuplicateSessionException MAPGUIDE_PORTABLE_EXCEPTION_ID+11
+#define MapGuide_Portable_Exception_DuplicateUserException MAPGUIDE_PORTABLE_EXCEPTION_ID+12
+#define MapGuide_Portable_Exception_DwfException MAPGUIDE_PORTABLE_EXCEPTION_ID+13
+#define MapGuide_Portable_Exception_DwfSectionNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+14
+#define MapGuide_Portable_Exception_DwfSectionResourceNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+15
+#define MapGuide_Portable_Exception_EndOfStreamException MAPGUIDE_PORTABLE_EXCEPTION_ID+16
+#define MapGuide_Portable_Exception_EvaluationExpiredException MAPGUIDE_PORTABLE_EXCEPTION_ID+17
+#define MapGuide_Portable_Exception_GroupNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+18
+#define MapGuide_Portable_Exception_InvalidDwfPackageException MAPGUIDE_PORTABLE_EXCEPTION_ID+19
+#define MapGuide_Portable_Exception_InvalidDwfSectionException MAPGUIDE_PORTABLE_EXCEPTION_ID+20
+#define MapGuide_Portable_Exception_InvalidFeatureSourceException MAPGUIDE_PORTABLE_EXCEPTION_ID+21
+#define MapGuide_Portable_Exception_InvalidIpAddressException MAPGUIDE_PORTABLE_EXCEPTION_ID+22
+#define MapGuide_Portable_Exception_InvalidLicenseException MAPGUIDE_PORTABLE_EXCEPTION_ID+23
+#define MapGuide_Portable_Exception_InvalidLogEntryException MAPGUIDE_PORTABLE_EXCEPTION_ID+24
+#define MapGuide_Portable_Exception_InvalidOperationVersionException MAPGUIDE_PORTABLE_EXCEPTION_ID+25
+#define MapGuide_Portable_Exception_InvalidPasswordException MAPGUIDE_PORTABLE_EXCEPTION_ID+26
+#define MapGuide_Portable_Exception_InvalidPrintLayoutFontSizeUnitsException MAPGUIDE_PORTABLE_EXCEPTION_ID+27
+#define MapGuide_Portable_Exception_InvalidPrintLayoutPositionUnitsException MAPGUIDE_PORTABLE_EXCEPTION_ID+28
+#define MapGuide_Portable_Exception_InvalidPrintLayoutSizeUnitsException MAPGUIDE_PORTABLE_EXCEPTION_ID+29
+#define MapGuide_Portable_Exception_InvalidSerialNumberException MAPGUIDE_PORTABLE_EXCEPTION_ID+30
+#define MapGuide_Portable_Exception_InvalidServerNameException MAPGUIDE_PORTABLE_EXCEPTION_ID+31
+#define MapGuide_Portable_Exception_LicenseException MAPGUIDE_PORTABLE_EXCEPTION_ID+32
+#define MapGuide_Portable_Exception_LicenseExpiredException MAPGUIDE_PORTABLE_EXCEPTION_ID+33
+#define MapGuide_Portable_Exception_LogOpenFailedException MAPGUIDE_PORTABLE_EXCEPTION_ID+34
+#define MapGuide_Portable_Exception_OperationProcessingException MAPGUIDE_PORTABLE_EXCEPTION_ID+35
+#define MapGuide_Portable_Exception_ParameterNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+36
+#define MapGuide_Portable_Exception_PathTooLongException MAPGUIDE_PORTABLE_EXCEPTION_ID+37
+#define MapGuide_Portable_Exception_PermissionDeniedException MAPGUIDE_PORTABLE_EXCEPTION_ID+38
+#define MapGuide_Portable_Exception_PortNotAvailableException MAPGUIDE_PORTABLE_EXCEPTION_ID+39
+#define MapGuide_Portable_Exception_PrintToScaleModeNotSelectedException MAPGUIDE_PORTABLE_EXCEPTION_ID+40
+#define MapGuide_Portable_Exception_RepositoryCreationFailedException MAPGUIDE_PORTABLE_EXCEPTION_ID+41
+#define MapGuide_Portable_Exception_RepositoryNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+42
+#define MapGuide_Portable_Exception_RepositoryNotOpenException MAPGUIDE_PORTABLE_EXCEPTION_ID+43
+#define MapGuide_Portable_Exception_RepositoryOpenFailedException MAPGUIDE_PORTABLE_EXCEPTION_ID+44
+#define MapGuide_Portable_Exception_RoleNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+45
+#define MapGuide_Portable_Exception_ServerNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+46
+#define MapGuide_Portable_Exception_ServerNotOnlineException MAPGUIDE_PORTABLE_EXCEPTION_ID+47
+#define MapGuide_Portable_Exception_SessionExpiredException MAPGUIDE_PORTABLE_EXCEPTION_ID+48
+#define MapGuide_Portable_Exception_UnauthorizedAccessException MAPGUIDE_PORTABLE_EXCEPTION_ID+49
+#define MapGuide_Portable_Exception_UriFormatException MAPGUIDE_PORTABLE_EXCEPTION_ID+50
+#define MapGuide_Portable_Exception_StylizeLayerFailedException MAPGUIDE_PORTABLE_EXCEPTION_ID+51
+#define MapGuide_Portable_Exception_SessionNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+52
+#define MapGuide_Portable_Exception_UnsupportedProviderThreadModelException MAPGUIDE_PORTABLE_EXCEPTION_ID+53
+#define MapGuide_Portable_Exception_AllProviderConnectionsUsedException MAPGUIDE_PORTABLE_EXCEPTION_ID+54
+#define MapGuide_Portable_Exception_RasterTransformationNotSupportedException MAPGUIDE_PORTABLE_EXCEPTION_ID+55
+#define MapGuide_Portable_Exception_AliasNotFoundException MAPGUIDE_PORTABLE_EXCEPTION_ID+56
//Basic Service functionality
-#define MapGuide_Desktop_ServiceFactory MAPGUIDE_DESKTOP_SERVICE_ID+0
-//#define MapGuide_Desktop_Service_ServerConnection MAPGUIDE_DESKTOP_SERVICE_ID+0
-//#define MapGuide_Desktop_Service_SiteConnection MAPGUIDE_DESKTOP_SERVICE_ID+1
-//#define MapGuide_Desktop_Service_ConnectionProperties MAPGUIDE_DESKTOP_SERVICE_ID+2
-//#define MapGuide_Desktop_Service_ServerInformation MAPGUIDE_DESKTOP_SERVICE_ID+3
-//#define MapGuide_Desktop_Service_PackageStatusInformation MAPGUIDE_DESKTOP_SERVICE_ID+4
-//#define MapGuide_Desktop_Service_Site MAPGUIDE_DESKTOP_SERVICE_ID+5
-//#define MapGuide_Desktop_Service_UserInformation MAPGUIDE_DESKTOP_SERVICE_ID+6
-//#define MapGuide_Desktop_Service_ServerAdmin MAPGUIDE_DESKTOP_SERVICE_ID+7
-//#define MapGuide_Desktop_Service_SiteInfo MAPGUIDE_DESKTOP_SERVICE_ID+8
-//#define MapGuide_Desktop_Service_SqlResult MAPGUIDE_DESKTOP_SERVICE_ID+9
+#define MapGuide_Portable_ServiceFactory MAPGUIDE_PORTABLE_SERVICE_ID+0
+//#define MapGuide_Portable_Service_ServerConnection MAPGUIDE_PORTABLE_SERVICE_ID+0
+//#define MapGuide_Portable_Service_SiteConnection MAPGUIDE_PORTABLE_SERVICE_ID+1
+//#define MapGuide_Portable_Service_ConnectionProperties MAPGUIDE_PORTABLE_SERVICE_ID+2
+//#define MapGuide_Portable_Service_ServerInformation MAPGUIDE_PORTABLE_SERVICE_ID+3
+//#define MapGuide_Portable_Service_PackageStatusInformation MAPGUIDE_PORTABLE_SERVICE_ID+4
+//#define MapGuide_Portable_Service_Site MAPGUIDE_PORTABLE_SERVICE_ID+5
+//#define MapGuide_Portable_Service_UserInformation MAPGUIDE_PORTABLE_SERVICE_ID+6
+//#define MapGuide_Portable_Service_ServerAdmin MAPGUIDE_PORTABLE_SERVICE_ID+7
+//#define MapGuide_Portable_Service_SiteInfo MAPGUIDE_PORTABLE_SERVICE_ID+8
+//#define MapGuide_Portable_Service_SqlResult MAPGUIDE_PORTABLE_SERVICE_ID+9
-#define MapGuide_Desktop_FeatureService_FeatureService MAPGUIDE_DESKTOP_FEATURESERVICE_ID+0
+#define MapGuide_Portable_FeatureService_FeatureService MAPGUIDE_PORTABLE_FEATURESERVICE_ID+0
// Drawing Service
-#define MapGuide_Desktop_DrawingService_DrawingService MAPGUIDE_DESKTOP_DRAWINGSERVICE_ID+0
+#define MapGuide_Portable_DrawingService_DrawingService MAPGUIDE_PORTABLE_DRAWINGSERVICE_ID+0
// Mapping Service
-#define MapGuide_Desktop_MappingService_MappingService MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+0
-#define MapGuide_Desktop_MappingService_DwfVersion MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+1
-#define MapGuide_Desktop_MappingService_PlotSpecification MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+2
-#define MapGuide_Desktop_MappingService_PrintLayout MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+3
-#define MapGuide_Desktop_MappingService_Layout MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+4
-#define MapGuide_Desktop_MappingService_MapPlot MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+5
-#define MapGuide_Desktop_MappingService_MapPlotCollection MAPGUIDE_DESKTOP_MAPPINGSERVICE_ID+6
+#define MapGuide_Portable_MappingService_MappingService MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+0
+#define MapGuide_Portable_MappingService_DwfVersion MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+1
+#define MapGuide_Portable_MappingService_PlotSpecification MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+2
+#define MapGuide_Portable_MappingService_PrintLayout MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+3
+#define MapGuide_Portable_MappingService_Layout MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+4
+#define MapGuide_Portable_MappingService_MapPlot MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+5
+#define MapGuide_Portable_MappingService_MapPlotCollection MAPGUIDE_PORTABLE_MAPPINGSERVICE_ID+6
// Rendering Service
-#define MapGuide_Desktop_RenderingService_RenderingService MAPGUIDE_DESKTOP_RENDERINGSERVICE_ID+0
-#define MapGuide_Desktop_RenderingService_FeatureInformation MAPGUIDE_DESKTOP_RENDERINGSERVICE_ID+1
-#define MapGuide_Desktop_RenderingService_RenderingOptions MAPGUIDE_DESKTOP_RENDERINGSERVICE_ID+2
+#define MapGuide_Portable_RenderingService_RenderingService MAPGUIDE_PORTABLE_RENDERINGSERVICE_ID+0
+#define MapGuide_Portable_RenderingService_FeatureInformation MAPGUIDE_PORTABLE_RENDERINGSERVICE_ID+1
+#define MapGuide_Portable_RenderingService_RenderingOptions MAPGUIDE_PORTABLE_RENDERINGSERVICE_ID+2
// Resource Service
-#define MapGuide_Desktop_ResourceService_ResourceService MAPGUIDE_DESKTOP_RESOURCESERVICE_ID+0
+#define MapGuide_Portable_ResourceService_ResourceService MAPGUIDE_PORTABLE_RESOURCESERVICE_ID+0
// Tile Service
-#define MapGuide_Desktop_TileService_TileService MAPGUIDE_DESKTOP_TILESERVICE_ID+0
+#define MapGuide_Portable_TileService_TileService MAPGUIDE_PORTABLE_TILESERVICE_ID+0
// KML Service
-#define MapGuide_Desktop_KmlService_KmlService MAPGUIDE_DESKTOP_KMLSERVICE_ID+0
+#define MapGuide_Portable_KmlService_KmlService MAPGUIDE_PORTABLE_KMLSERVICE_ID+0
// Profiling
-#define MapGuide_Desktop_ProfilingService_ProfilingService MAPGUIDE_DESKTOP_PROFILING_SERVICE_ID+0
+#define MapGuide_Portable_ProfilingService_ProfilingService MAPGUIDE_PORTABLE_PROFILING_SERVICE_ID+0
#endif
\ No newline at end of file
Modified: trunk/MgDev/Portable/MgPortable/System/ConfigProperties.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/ConfigProperties.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/ConfigProperties.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_CONFIG_PROPERTIES_H
-#define DESKTOP_CONFIG_PROPERTIES_H
+#ifndef PORTABLE_CONFIG_PROPERTIES_H
+#define PORTABLE_CONFIG_PROPERTIES_H
#include "MgPortable.h"
@@ -29,7 +29,7 @@
/// organized into Property Sections. These sections may be used in the API to
/// set/get groups of configuration properties.
/// INTERNAL_ONLY:
-class MG_DESKTOP_API MgPortableConfigProperties
+class MG_PORTABLE_API MgPortableConfigProperties
{
DECLARE_CLASSNAME(MgPortableConfigProperties)
Modified: trunk/MgDev/Portable/MgPortable/System/ExceptionCodes.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/ExceptionCodes.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/ExceptionCodes.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,10 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_EXCEPTION_CODES_H
-#define DESKTOP_EXCEPTION_CODES_H
+#ifndef PORTABLE_EXCEPTION_CODES_H
+#define PORTABLE_EXCEPTION_CODES_H
-class MG_DESKTOP_API MgPortableExceptionCodes
+class MG_PORTABLE_API MgPortableExceptionCodes
{
PUBLISHED_API:
static const STRING MgAliasNotFoundException; ///\if INTERNAL value("MgAliasNotFoundException") \endif
Modified: trunk/MgDev/Portable/MgPortable/System/PlatformInit.cpp
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/PlatformInit.cpp 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/PlatformInit.cpp 2022-11-16 14:57:45 UTC (rev 10018)
@@ -242,7 +242,7 @@
static bool initStatic = InitializeStaticPlatformData();
#define EXCEPTION_CLASS_CREATOR(className) \
- fact->Register(MapGuide_Desktop_Exception_##className, MgPortable##className::CreateObject);
+ fact->Register(MapGuide_Portable_Exception_##className, MgPortable##className::CreateObject);
bool InitializeStaticPlatformData()
{
@@ -249,9 +249,9 @@
MgClassFactory* fact = MgClassFactory::GetInstance();
//put in the map any class that can be serialized
- fact->Register(MapGuide_Desktop_MapLayer_Map, MgPortableMap::CreateObject);
- fact->Register(MapGuide_Desktop_MapLayer_Layer, MgPortableLayer::CreateObject);
- fact->Register(MapGuide_Desktop_MapLayer_Selection, MgPortableSelection::CreateObject);
+ fact->Register(MapGuide_Portable_MapLayer_Map, MgPortableMap::CreateObject);
+ fact->Register(MapGuide_Portable_MapLayer_Layer, MgPortableLayer::CreateObject);
+ fact->Register(MapGuide_Portable_MapLayer_Selection, MgPortableSelection::CreateObject);
return true;
}
\ No newline at end of file
Modified: trunk/MgDev/Portable/MgPortable/System/PlatformInit.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/PlatformInit.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/PlatformInit.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,10 +15,10 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_PLATFORM_INIT_H
-#define DESKTOP_PLATFORM_INIT_H
+#ifndef PORTABLE_PLATFORM_INIT_H
+#define PORTABLE_PLATFORM_INIT_H
-/// \ingroup Desktop_Module
+/// \ingroup Portable_Module
/// \{
///\brief
@@ -25,12 +25,12 @@
/// A static utility class that provides the means for initializing and tearing down
/// the MapGuide Platform. You must initialize the platform before you can use any
/// service classes or the Coordinate System API.
-class MG_DESKTOP_API MgPortablePlatform
+class MG_PORTABLE_API MgPortablePlatform
{
PUBLISHED_API:
///////////////////////////////////////////////////////////////////////////////
///\brief
- /// Gets whether the the MapGuide Desktop Platform has been initialized. You
+ /// Gets whether the the MapGuide Portable Platform has been initialized. You
/// cannot use most MapGuide service classes until the platform has been
/// initialized. Call MgPortablePlatform::Initialize(CREFSTRING) to initialize the
/// platform.
@@ -41,17 +41,17 @@
///////////////////////////////////////////////////////////////////////////////
///\brief
- /// Initializes the MapGuide Desktop Platform. This must be called at least
+ /// Initializes the MapGuide Portable Platform. This must be called at least
/// once before using any service classes in the MapGuide API. Subsequent calls
/// will do nothing.
///
///\param configFile (String/string)
- /// The path to the MapGuide Desktop Platform configuration file (Platform.ini)
+ /// The path to the MapGuide Portable Platform configuration file (Platform.ini)
static void Initialize(CREFSTRING configFile);
///////////////////////////////////////////////////////////////////////////////
///\brief
- /// Performs cleanup of the MapGuide Desktop Platform. This should be called
+ /// Performs cleanup of the MapGuide Portable Platform. This should be called
/// as part of your application's cleanup or exit routine. You should not use
/// any other classes in the MapGuide API after completing this call.
static void Terminate();
Modified: trunk/MgDev/Portable/MgPortable/System/ThreadBase.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/ThreadBase.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/ThreadBase.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -21,7 +21,7 @@
#include "MgPortable.h"
#include "Foundation.h"
-class MG_DESKTOP_API MgPortableThreadBase : public ACE_Task<ACE_MT_SYNCH>
+class MG_PORTABLE_API MgPortableThreadBase : public ACE_Task<ACE_MT_SYNCH>
{
///////////////////////////////////////////////////////
/// Methods
Modified: trunk/MgDev/Portable/MgPortable/System/TimerUtil.h
===================================================================
--- trunk/MgDev/Portable/MgPortable/System/TimerUtil.h 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/MgPortable/System/TimerUtil.h 2022-11-16 14:57:45 UTC (rev 10018)
@@ -15,8 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#ifndef DESKTOP_TIMER_UTIL_H
-#define DESKTOP_TIMER_UTIL_H
+#ifndef PORTABLE_TIMER_UTIL_H
+#define PORTABLE_TIMER_UTIL_H
#ifdef WIN32
#include <windows.h>
@@ -25,7 +25,7 @@
#endif
/// \cond INTERNAL
-class MG_DESKTOP_API MgPortableTimerUtil
+class MG_PORTABLE_API MgPortableTimerUtil
{
DECLARE_CLASSNAME(MgPortableTimerUtil)
Modified: trunk/MgDev/Portable/Portable.sln
===================================================================
--- trunk/MgDev/Portable/Portable.sln 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/Portable.sln 2022-11-16 14:57:45 UTC (rev 10018)
@@ -109,286 +109,192 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
- Release|Any CPU = Release|Any CPU
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Any CPU.ActiveCfg = Debug|x64
- {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Any CPU.Build.0 = Debug|x64
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Win32.ActiveCfg = Debug|Win32
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|Win32.Build.0 = Debug|Win32
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x64.ActiveCfg = Debug|x64
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Debug|x64.Build.0 = Debug|x64
- {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Any CPU.ActiveCfg = Release|x64
- {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Any CPU.Build.0 = Release|x64
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Win32.ActiveCfg = Release|Win32
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|Win32.Build.0 = Release|Win32
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.ActiveCfg = Release|x64
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}.Release|x64.Build.0 = Release|x64
- {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Any CPU.ActiveCfg = Debug|x64
- {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Any CPU.Build.0 = Debug|x64
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Win32.ActiveCfg = Debug|Win32
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|Win32.Build.0 = Debug|Win32
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.ActiveCfg = Debug|x64
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Debug|x64.Build.0 = Debug|x64
- {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Any CPU.ActiveCfg = Release|x64
- {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Any CPU.Build.0 = Release|x64
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Win32.ActiveCfg = Release|Win32
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|Win32.Build.0 = Release|Win32
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.ActiveCfg = Release|x64
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}.Release|x64.Build.0 = Release|x64
- {F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Any CPU.ActiveCfg = Debug|x64
- {F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Any CPU.Build.0 = Debug|x64
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Win32.ActiveCfg = Debug|Win32
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|Win32.Build.0 = Debug|Win32
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x64.ActiveCfg = Debug|x64
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Debug|x64.Build.0 = Debug|x64
- {F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Any CPU.ActiveCfg = Release|x64
- {F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Any CPU.Build.0 = Release|x64
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Win32.ActiveCfg = Release|Win32
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|Win32.Build.0 = Release|Win32
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.ActiveCfg = Release|x64
{F7334B1B-0EFA-47E3-8E66-DF158E61B7E4}.Release|x64.Build.0 = Release|x64
- {C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Any CPU.ActiveCfg = Debug|x64
- {C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Any CPU.Build.0 = Debug|x64
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Win32.ActiveCfg = Debug|Win32
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|Win32.Build.0 = Debug|Win32
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x64.ActiveCfg = Debug|x64
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Debug|x64.Build.0 = Debug|x64
- {C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Any CPU.ActiveCfg = Release|x64
- {C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Any CPU.Build.0 = Release|x64
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Win32.ActiveCfg = Release|Win32
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|Win32.Build.0 = Release|Win32
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.ActiveCfg = Release|x64
{C50254F2-654A-48DE-AF5B-20605AEF8D10}.Release|x64.Build.0 = Release|x64
- {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Any CPU.ActiveCfg = Debug|x64
- {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Any CPU.Build.0 = Debug|x64
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Win32.ActiveCfg = Debug|Win32
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|Win32.Build.0 = Debug|Win32
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x64.ActiveCfg = Debug|x64
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Debug|x64.Build.0 = Debug|x64
- {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Any CPU.ActiveCfg = Release|x64
- {85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Any CPU.Build.0 = Release|x64
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Win32.ActiveCfg = Release|Win32
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|Win32.Build.0 = Release|Win32
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.ActiveCfg = Release|x64
{85882748-DD71-4D2B-9E5A-03AF8C8D91B7}.Release|x64.Build.0 = Release|x64
- {38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Any CPU.ActiveCfg = Debug|x64
- {38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Any CPU.Build.0 = Debug|x64
{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Win32.ActiveCfg = Debug|Win32
{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|Win32.Build.0 = Debug|Win32
{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|x64.ActiveCfg = Debug|x64
{38161685-88ED-415E-A545-CCC17BE069AE}.Debug|x64.Build.0 = Debug|x64
- {38161685-88ED-415E-A545-CCC17BE069AE}.Release|Any CPU.ActiveCfg = Release|x64
- {38161685-88ED-415E-A545-CCC17BE069AE}.Release|Any CPU.Build.0 = Release|x64
{38161685-88ED-415E-A545-CCC17BE069AE}.Release|Win32.ActiveCfg = Release|Win32
{38161685-88ED-415E-A545-CCC17BE069AE}.Release|Win32.Build.0 = Release|Win32
{38161685-88ED-415E-A545-CCC17BE069AE}.Release|x64.ActiveCfg = Release|x64
{38161685-88ED-415E-A545-CCC17BE069AE}.Release|x64.Build.0 = Release|x64
- {341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Any CPU.ActiveCfg = Debug|x64
- {341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Any CPU.Build.0 = Debug|x64
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Win32.ActiveCfg = Debug|Win32
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|Win32.Build.0 = Debug|Win32
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|x64.ActiveCfg = Debug|x64
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Debug|x64.Build.0 = Debug|x64
- {341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Any CPU.ActiveCfg = Release|x64
- {341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Any CPU.Build.0 = Release|x64
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Win32.ActiveCfg = Release|Win32
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|Win32.Build.0 = Release|Win32
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|x64.ActiveCfg = Release|x64
{341D5463-186E-49BA-B942-3D3BE28D65C0}.Release|x64.Build.0 = Release|x64
- {DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Any CPU.ActiveCfg = Debug|x64
- {DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Any CPU.Build.0 = Debug|x64
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Win32.ActiveCfg = Debug|Win32
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|Win32.Build.0 = Debug|Win32
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|x64.ActiveCfg = Debug|x64
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Debug|x64.Build.0 = Debug|x64
- {DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Any CPU.ActiveCfg = Release|x64
- {DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Any CPU.Build.0 = Release|x64
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Win32.ActiveCfg = Release|Win32
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|Win32.Build.0 = Release|Win32
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|x64.ActiveCfg = Release|x64
{DB2CC2E3-4754-4932-B865-424A44E58FD0}.Release|x64.Build.0 = Release|x64
- {8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Any CPU.ActiveCfg = Debug|x64
- {8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Any CPU.Build.0 = Debug|x64
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Win32.ActiveCfg = Debug|Win32
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|Win32.Build.0 = Debug|Win32
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|x64.ActiveCfg = Debug|x64
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Debug|x64.Build.0 = Debug|x64
- {8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Any CPU.ActiveCfg = Release|x64
- {8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Any CPU.Build.0 = Release|x64
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Win32.ActiveCfg = Release|Win32
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|Win32.Build.0 = Release|Win32
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|x64.ActiveCfg = Release|x64
{8D947123-A12C-45DA-BD00-8B62DD5A0459}.Release|x64.Build.0 = Release|x64
- {8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Any CPU.ActiveCfg = Debug|x64
- {8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Any CPU.Build.0 = Debug|x64
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Win32.ActiveCfg = Debug|Win32
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|Win32.Build.0 = Debug|Win32
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|x64.ActiveCfg = Debug|x64
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Debug|x64.Build.0 = Debug|x64
- {8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Any CPU.ActiveCfg = Release|x64
- {8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Any CPU.Build.0 = Release|x64
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Win32.ActiveCfg = Release|Win32
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|Win32.Build.0 = Release|Win32
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|x64.ActiveCfg = Release|x64
{8F654896-85DC-4F32-99B2-670D66B0FBF1}.Release|x64.Build.0 = Release|x64
- {E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Any CPU.ActiveCfg = Debug|x64
- {E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Any CPU.Build.0 = Debug|x64
{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Win32.ActiveCfg = Debug|Win32
{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|Win32.Build.0 = Debug|Win32
{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|x64.ActiveCfg = Debug|x64
{E6B0012F-58F6-42F4-8F02-065C35829569}.Debug|x64.Build.0 = Debug|x64
- {E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Any CPU.ActiveCfg = Release|x64
- {E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Any CPU.Build.0 = Release|x64
{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Win32.ActiveCfg = Release|Win32
{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|Win32.Build.0 = Release|Win32
{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|x64.ActiveCfg = Release|x64
{E6B0012F-58F6-42F4-8F02-065C35829569}.Release|x64.Build.0 = Release|x64
- {CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Any CPU.ActiveCfg = Debug|x64
- {CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Any CPU.Build.0 = Debug|x64
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Win32.ActiveCfg = Debug|Win32
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|Win32.Build.0 = Debug|Win32
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|x64.ActiveCfg = Debug|x64
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Debug|x64.Build.0 = Debug|x64
- {CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Any CPU.ActiveCfg = Release|x64
- {CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Any CPU.Build.0 = Release|x64
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Win32.ActiveCfg = Release|Win32
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|Win32.Build.0 = Release|Win32
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|x64.ActiveCfg = Release|x64
{CBC0339F-E68B-48BA-9059-945483BEBDCA}.Release|x64.Build.0 = Release|x64
- {67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Any CPU.ActiveCfg = Debug|x64
- {67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Any CPU.Build.0 = Debug|x64
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Win32.ActiveCfg = Debug|Win32
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|Win32.Build.0 = Debug|Win32
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|x64.ActiveCfg = Debug|x64
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Debug|x64.Build.0 = Debug|x64
- {67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Any CPU.ActiveCfg = Release|x64
- {67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Any CPU.Build.0 = Release|x64
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Win32.ActiveCfg = Release|Win32
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|Win32.Build.0 = Release|Win32
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|x64.ActiveCfg = Release|x64
{67505883-F667-4C18-BCCA-63F3B76C64FF}.Release|x64.Build.0 = Release|x64
- {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Any CPU.ActiveCfg = Debug|x64
- {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Any CPU.Build.0 = Debug|x64
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.ActiveCfg = Debug|Win32
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.Build.0 = Debug|Win32
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.ActiveCfg = Debug|x64
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.Build.0 = Debug|x64
- {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Any CPU.ActiveCfg = Release|x64
- {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Any CPU.Build.0 = Release|x64
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.ActiveCfg = Release|Win32
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.Build.0 = Release|Win32
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.ActiveCfg = Release|x64
{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.Build.0 = Release|x64
- {94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Debug|Any CPU.ActiveCfg = Debug|x64
- {94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Debug|Any CPU.Build.0 = Debug|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Debug|Win32.ActiveCfg = Debug|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Debug|Win32.Build.0 = Debug|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Debug|x64.ActiveCfg = Debug|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Debug|x64.Build.0 = Debug|x64
- {94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Release|Any CPU.ActiveCfg = Release|x64
- {94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Release|Any CPU.Build.0 = Release|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Release|Win32.ActiveCfg = Release|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Release|Win32.Build.0 = Release|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Release|x64.ActiveCfg = Release|x64
{94580073-62BC-4E59-86DE-DF36EC6DAAEA}.Release|x64.Build.0 = Release|x64
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.ActiveCfg = Debug|x64
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.Build.0 = Debug|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.ActiveCfg = Debug|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.Build.0 = Debug|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|x64
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.ActiveCfg = Release|x64
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.Build.0 = Release|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.ActiveCfg = Release|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
- {73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|Any CPU.ActiveCfg = Debug|x64
- {73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|Any CPU.Build.0 = Debug|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|Win32.ActiveCfg = Debug|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|Win32.Build.0 = Debug|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|x64.ActiveCfg = Debug|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Debug|x64.Build.0 = Debug|x64
- {73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|Any CPU.ActiveCfg = Release|x64
- {73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|Any CPU.Build.0 = Release|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|Win32.ActiveCfg = Release|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|Win32.Build.0 = Release|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|x64.ActiveCfg = Release|x64
{73C62FF2-C188-4A61-929E-2F112D7E17AA}.Release|x64.Build.0 = Release|x64
- {B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|Any CPU.ActiveCfg = Debug|x64
- {B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|Any CPU.Build.0 = Debug|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|Win32.ActiveCfg = Debug|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|Win32.Build.0 = Debug|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|x64.ActiveCfg = Debug|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Debug|x64.Build.0 = Debug|x64
- {B994F673-EB8E-4C65-8884-B56AB8783115}.Release|Any CPU.ActiveCfg = Release|x64
- {B994F673-EB8E-4C65-8884-B56AB8783115}.Release|Any CPU.Build.0 = Release|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|Win32.ActiveCfg = Release|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|Win32.Build.0 = Release|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|x64.ActiveCfg = Release|x64
{B994F673-EB8E-4C65-8884-B56AB8783115}.Release|x64.Build.0 = Release|x64
- {3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|Any CPU.ActiveCfg = Debug|x64
- {3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|Any CPU.Build.0 = Debug|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|Win32.ActiveCfg = Debug|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|Win32.Build.0 = Debug|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|x64.ActiveCfg = Debug|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Debug|x64.Build.0 = Debug|x64
- {3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|Any CPU.ActiveCfg = Release|x64
- {3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|Any CPU.Build.0 = Release|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|Win32.ActiveCfg = Release|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|Win32.Build.0 = Release|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|x64.ActiveCfg = Release|x64
{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}.Release|x64.Build.0 = Release|x64
- {DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Debug|Win32.ActiveCfg = Debug|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Debug|Win32.Build.0 = Debug|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Debug|x64.ActiveCfg = Debug|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Debug|x64.Build.0 = Debug|Any CPU
- {DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Release|Any CPU.Build.0 = Release|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Release|Win32.ActiveCfg = Release|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Release|Win32.Build.0 = Release|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Release|x64.ActiveCfg = Release|Any CPU
{DC28F4ED-B1EC-4A65-9866-F629D2A12782}.Release|x64.Build.0 = Release|Any CPU
- {26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Debug|Win32.ActiveCfg = Debug|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Debug|Win32.Build.0 = Debug|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Debug|x64.ActiveCfg = Debug|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Debug|x64.Build.0 = Debug|Any CPU
- {26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Release|Any CPU.Build.0 = Release|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Release|Win32.ActiveCfg = Release|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Release|Win32.Build.0 = Release|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Release|x64.ActiveCfg = Release|Any CPU
{26A8B65F-D08B-4BD1-9DDC-0DC68488DD0A}.Release|x64.Build.0 = Release|Any CPU
- {8A85841D-9475-456B-929F-C3B6C49679EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8A85841D-9475-456B-929F-C3B6C49679EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Debug|Win32.ActiveCfg = Debug|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Debug|Win32.Build.0 = Debug|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Debug|x64.ActiveCfg = Debug|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Debug|x64.Build.0 = Debug|Any CPU
- {8A85841D-9475-456B-929F-C3B6C49679EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8A85841D-9475-456B-929F-C3B6C49679EF}.Release|Any CPU.Build.0 = Release|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Release|Win32.ActiveCfg = Release|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Release|Win32.Build.0 = Release|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Release|x64.ActiveCfg = Release|Any CPU
{8A85841D-9475-456B-929F-C3B6C49679EF}.Release|x64.Build.0 = Release|Any CPU
- {D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Debug|Win32.ActiveCfg = Debug|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Debug|Win32.Build.0 = Debug|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Debug|x64.ActiveCfg = Debug|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Debug|x64.Build.0 = Debug|Any CPU
- {D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Release|Any CPU.Build.0 = Release|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Release|Win32.ActiveCfg = Release|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Release|Win32.Build.0 = Release|Any CPU
{D319AD4A-7233-42BF-ABE8-445D99EA5F65}.Release|x64.ActiveCfg = Release|Any CPU
Modified: trunk/MgDev/Portable/UnitTest/UnitTest.vcxproj
===================================================================
--- trunk/MgDev/Portable/UnitTest/UnitTest.vcxproj 2022-11-16 13:17:56 UTC (rev 10017)
+++ trunk/MgDev/Portable/UnitTest/UnitTest.vcxproj 2022-11-16 14:57:45 UTC (rev 10018)
@@ -66,11 +66,11 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Configuration)64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\release64\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Configuration)64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -141,8 +141,8 @@
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\debug64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\debug64\ACEd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug64\xerces-c_3_1mgD.dll $(OutDir)
+xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib64\debug\ACEd.dll $(OutDir)
+xcopy /S /Y /I ..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Debug64\GEOSd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug64\gd.dll $(OutDir)
xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug64\*.* $(OutDir)FDO\
More information about the mapguide-commits
mailing list