[mapguide-commits] r1209 - in trunk/MgDev: Common/MapGuideCommon
Common/MapGuideCommon/Services Server/src/Common/Manager
Server/src/Services/Drawing Server/src/Services/Feature
Server/src/Services/Kml Server/src/Services/Mapping
Server/src/Services/Rendering Server/src/Services/Resource
Server/src/Services/ServerAdmin Server/src/Services/Site
Server/src/Services/Tile
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 13 15:23:22 EDT 2007
Author: brucedechant
Date: 2007-03-13 15:23:17 -0400 (Tue, 13 Mar 2007)
New Revision: 1209
Modified:
trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.h
trunk/MgDev/Common/MapGuideCommon/Services/ProxyDrawingService.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyKmlService.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyRenderingService.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyTileService.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ServerAdmin.cpp
trunk/MgDev/Common/MapGuideCommon/Services/Site.cpp
trunk/MgDev/Server/src/Common/Manager/LogManager.h
trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp
trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp
trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp
trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp
trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp
trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp
Log:
Update operation version checking/processing. All HTTP operations already use the Major.Minor.Phase version format. The web tier and server were using a single version #. This submission updates the web tier and server to use the same version format as the HTTP operations.
Modified: trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.h 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.h 2007-03-13 19:23:17 UTC (rev 1209)
@@ -31,6 +31,21 @@
#define MG_MAPGUIDE_API
#endif
+// This define extracts the operation version
+// 0x00XXYYZZ where XX = Major, YY = Minor nad ZZ = Phase
+#define EXTRACT_VERSION(Version, Major, Minor, Phase) \
+ Major = (Version & 0x00ff0000) >> 16; \
+ Minor = (Version & 0x0000ff00) >> 8; \
+ Phase = (Version & 0x000000ff);
+
+// This define builds the operation version
+// 0x00XXYYZZ where XX = Major, YY = Minor nad ZZ = Phase
+#define BUILD_VERSION(Major, Minor, Phase) ((Major << 16) + (Minor << 8) + Phase)
+
+#define VERSION_NO_PHASE(Version) (Version & 0x00ffff00)
+
+#define VERSION_SUPPORTED(Major, Minor) (Major << 16) + (Minor << 8)
+
#include "System/MapGuideCommonClassId.h"
#include "System/ConfigProperties.h"
#include "System/UserInformation.h"
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyDrawingService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyDrawingService.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyDrawingService.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -83,7 +83,7 @@
MgDrawingServiceOpId::GetDrawing, // Command Code
1, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knNone);
@@ -119,7 +119,7 @@
MgDrawingServiceOpId::DescribeDrawing, // Command Code
1, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knNone);
@@ -162,7 +162,7 @@
MgDrawingServiceOpId::GetSection, // Command Code
2, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, §ionName, // Argument#2
MgCommand::knNone);
@@ -215,7 +215,7 @@
MgDrawingServiceOpId::GetSectionResource, // Command Code
2, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &resourceName, // Argument#2
MgCommand::knNone);
@@ -261,7 +261,7 @@
MgDrawingServiceOpId::EnumerateLayers, // Command Code
2, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, §ionName, // Argument#2
MgCommand::knNone);
@@ -307,7 +307,7 @@
MgDrawingServiceOpId::GetLayer, // Command Code
3, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, §ionName, // Argument#2
MgCommand::knString, &layerName, // Argument#2
@@ -346,7 +346,7 @@
MgDrawingServiceOpId::EnumerateSections, // Command Code
1, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knNone);
@@ -389,7 +389,7 @@
MgDrawingServiceOpId::EnumerateSectionResources, // Command Code
2, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, §ionName, // Argument#2
MgCommand::knNone);
@@ -424,7 +424,7 @@
MgDrawingServiceOpId::GetCoordinateSpace, // Command Code
1, // No of arguments
Drawing_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knNone);
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureService.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -83,7 +83,7 @@
MgFeatureServiceOpId::GetFeatureProviders_Id,// Command Code
0, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone); // End of argument
SetWarning(cmd.GetWarningObject());
@@ -180,7 +180,7 @@
MgFeatureServiceOpId::GetConnectionPropertyValues_Id, // Command Code
3, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &providerName, // Argument#1
MgCommand::knString, &propertyName, // Argument#1
MgCommand::knString, &partialConnString, // Argument#2
@@ -210,7 +210,7 @@
MgFeatureServiceOpId::TestConnection_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &providerName, // Argument#1
MgCommand::knString, &connectionString, // Argument#2
MgCommand::knNone); // End of argument
@@ -239,7 +239,7 @@
MgFeatureServiceOpId::TestConnectionWithResource_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knNone); // End of argument
@@ -282,7 +282,7 @@
MgFeatureServiceOpId::GetCapabilities_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &providerName, // Argument#1
MgCommand::knNone); // End of argument
@@ -318,7 +318,7 @@
MgFeatureServiceOpId::DescribeSchema_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &schemaName, // Argument#2
MgCommand::knNone); // End of argument
@@ -360,7 +360,7 @@
MgFeatureServiceOpId::DescribeSchemaAsXml_Id,// Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &schemaName, // Argument#2
MgCommand::knNone); // End of argument
@@ -396,7 +396,7 @@
MgFeatureServiceOpId::SchemaToXml_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, schema, // Argument#1
MgCommand::knNone); // End of argument
@@ -433,7 +433,7 @@
MgFeatureServiceOpId::XmlToSchema_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &xml, // Argument#1
MgCommand::knNone); // End of argument
@@ -486,7 +486,7 @@
MgFeatureServiceOpId::SelectFeatures_Id, // Command Code
3, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &className, // Argument#2
MgCommand::knObject, options, // Argument#3
@@ -602,7 +602,7 @@
MgFeatureServiceOpId::SelectAggregate_Id, // Command Code
3, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &className, // Argument#2
MgCommand::knObject, options, // Argument#3
@@ -649,7 +649,7 @@
MgFeatureServiceOpId::UpdateFeatures_Id, // Command Code
3, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knObject, commands, // Argument#2
MgCommand::knInt8, (INT8)useTransaction, // Argument#3
@@ -754,7 +754,7 @@
MgFeatureServiceOpId::ExecuteSqlQuery_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &sqlStatement, // Argument#2
MgCommand::knNone); // End of argument
@@ -797,7 +797,7 @@
MgFeatureServiceOpId::ExecuteSqlNonQuery_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &sqlNonSelectStatement, // Argument#2
MgCommand::knNone); // End of argument
@@ -854,7 +854,7 @@
MgFeatureServiceOpId::GetSpatialContexts_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knInt8, (INT8)bActiveOnly, // Argument#2
MgCommand::knNone); // End of argument
@@ -906,7 +906,7 @@
MgFeatureServiceOpId::GetLongTransactions_Id,// Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knInt8, (INT8)bActiveOnly, // Argument#2
MgCommand::knNone); // End of argument
@@ -948,7 +948,7 @@
MgFeatureServiceOpId::SetLongTransaction_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, featureSourceId, // Argument#1
MgCommand::knString, &longTransactionName, // Argument#2
MgCommand::knNone); // End of argument
@@ -970,7 +970,7 @@
MgFeatureServiceOpId::DescribeWfsFeatureType_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, featureSourceId, // Argument#1
MgCommand::knObject, featureClasses, // Argument#2
MgCommand::knNone); // End of argument
@@ -996,7 +996,7 @@
MgFeatureServiceOpId::GetWfsFeature_Id, // Command Code
6, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, featureSourceId, // Argument#1
MgCommand::knString, &featureClass, // Argument#2
MgCommand::knObject, requiredProperties, // Argument#3
@@ -1020,7 +1020,7 @@
MgFeatureServiceOpId::GetFeatures_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, featureReaderId, // Argument#1
MgCommand::knNone); // End of argument
@@ -1039,7 +1039,7 @@
MgFeatureServiceOpId::CloseFeatureReader_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, featureReaderId, // Argument#1
MgCommand::knNone); // End of argument
@@ -1058,7 +1058,7 @@
MgFeatureServiceOpId::GetSqlRows_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, sqlReaderId, // Argument#1
MgCommand::knNone); // End of argument
@@ -1077,7 +1077,7 @@
MgFeatureServiceOpId::CloseSqlReader_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, sqlReaderId, // Argument#1
MgCommand::knNone); // End of argument
@@ -1096,7 +1096,7 @@
MgFeatureServiceOpId::GetSchemas_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knNone); // End of argument
@@ -1115,7 +1115,7 @@
MgFeatureServiceOpId::GetClasses_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &schemaName, // Argument#2
MgCommand::knNone); // End of argument
@@ -1137,7 +1137,7 @@
MgFeatureServiceOpId::GetClassDefinition_Id, // Command Code
3, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &schemaName, // Argument#2
MgCommand::knString, &className, // Argument#3
@@ -1158,7 +1158,7 @@
MgFeatureServiceOpId::GetRaster_Id, // Command Code
4, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, featureReaderId, // Argument#1
MgCommand::knInt32, xSize, // Argument#2
MgCommand::knInt32, ySize, // Argument#3
@@ -1180,7 +1180,7 @@
MgFeatureServiceOpId::GetDataRows_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, dataReaderId, // Argument#1
MgCommand::knNone); // End of argument
@@ -1199,7 +1199,7 @@
MgFeatureServiceOpId::CloseDataReader_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, dataReaderId, // Argument#1
MgCommand::knNone); // End of argument
@@ -1218,7 +1218,7 @@
MgFeatureServiceOpId::CreateFeatureSource_Id,// Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knObject, sourceParams, // Argument#2
MgCommand::knNone); // End of argument
@@ -1240,7 +1240,7 @@
MgFeatureServiceOpId::GetIdentityProperties_Id, // Command Code
3, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument#1
MgCommand::knString, &schemaName, // Argument#2
MgCommand::knString, &className, // Argument#3
@@ -1263,8 +1263,8 @@
MgFeatureServiceOpId::CloseGwsFeatureReader_Id, // Command Code
1, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
- MgCommand::knInt32, (INT32)gwsFeatureReaderId, // Argument#1
+ BUILD_VERSION(1,0,0), // Operation version
+ MgCommand::knInt32, (INT32)gwsFeatureReaderId, // Argument#1
MgCommand::knNone); // End of argument
SetWarning(cmd.GetWarningObject());
@@ -1281,7 +1281,7 @@
MgFeatureServiceOpId::EnumerateDataStores_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &providerName, // Argument#1
MgCommand::knString, &partialConnString, // Argument#2
MgCommand::knNone); // End of argument
@@ -1300,7 +1300,7 @@
MgFeatureServiceOpId::GetSchemaMapping_Id, // Command Code
2, // No of arguments
Feature_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &providerName, // Argument#1
MgCommand::knString, &partialConnString, // Argument#2
MgCommand::knNone); // End of argument
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyKmlService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyKmlService.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyKmlService.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -73,7 +73,7 @@
MgKmlServiceOpId::GetMapKml, // Command Code
4, // No of arguments
Kml_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knDouble, dpi, // Argument#2
MgCommand::knString, &agentUri, // Argument#3
@@ -102,7 +102,7 @@
MgKmlServiceOpId::GetLayerKml, // Command Code
8, // No of arguments
Kml_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, layer, // Argument#1
MgCommand::knObject, extents, // Argument#2
MgCommand::knInt32, width, // Argument#3
@@ -134,7 +134,7 @@
MgKmlServiceOpId::GetFeaturesKml, // Command Code
7, // No of arguments
Kml_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, layer, // Argument#1
MgCommand::knObject, extents, // Argument#2
MgCommand::knInt32, width, // Argument#3
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyRenderingService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyRenderingService.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyRenderingService.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -94,7 +94,7 @@
MgRenderingServiceOpId::RenderTile, // Command Code
4, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knString, &baseMapLayerGroupName, // Argument#2
MgCommand::knInt32, tileColumn, // Argument#3
@@ -170,7 +170,7 @@
MgRenderingServiceOpId::RenderDynamicOverlay, // Command Code
4, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knObject, selection, // Argument#2
MgCommand::knString, &format, // Argument#3
@@ -240,7 +240,7 @@
MgRenderingServiceOpId::RenderMap1, // Command Code
4, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knObject, selection, // Argument#2
MgCommand::knString, &format, // Argument#3
@@ -342,7 +342,7 @@
MgRenderingServiceOpId::RenderMap2, // Command Code
8, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knObject, selection, // Argument#2
MgCommand::knObject, extents, // Argument#3
@@ -454,7 +454,7 @@
MgRenderingServiceOpId::RenderMap3, // Command Code
9, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knObject, selection, // Argument#2
MgCommand::knObject, center, // Argument#3
@@ -506,7 +506,7 @@
MgRenderingServiceOpId::RenderMapLegend,// Command Code
5, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knInt32, width, // Argument#2
MgCommand::knInt32, height, // Argument#3
@@ -602,7 +602,7 @@
MgRenderingServiceOpId::QueryFeatures, // Command Code
6, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knObject, layerNames, // Argument#2
MgCommand::knObject, geometry, // Argument#3
@@ -699,7 +699,7 @@
MgRenderingServiceOpId::QueryFeatureProperties, // Command Code
6, // No of arguments
Rendering_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knObject, layerNames, // Argument#2
MgCommand::knObject, geometry, // Argument#3
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyTileService.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyTileService.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyTileService.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -93,7 +93,7 @@
MgTileServiceOpId::GetTile, // Command Code
4, // No of arguments
Tile_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knString, &baseMapLayerGroupName, // Argument#2
MgCommand::knInt32, tileColumn, // Argument#3
@@ -123,7 +123,7 @@
MgTileServiceOpId::GetTile, // Command Code
5, // No of arguments
Tile_Service, // Service Id
- 2, // Operation version
+ BUILD_VERSION(1,2,0), // Operation version
MgCommand::knObject, mapDefinition, // Argument#1
MgCommand::knString, &baseMapLayerGroupName, // Argument#2
MgCommand::knInt32, tileColumn, // Argument#3
@@ -174,7 +174,7 @@
MgTileServiceOpId::SetTile, // Command Code
6, // No of arguments
Tile_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, img, // Argument#1
MgCommand::knObject, map, // Argument#2
MgCommand::knInt32, scaleIndex, // Argument#3
@@ -203,7 +203,7 @@
MgTileServiceOpId::ClearCache, // Command Code
1, // No of arguments
Tile_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, map, // Argument#1
MgCommand::knNone); // End of arguments
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ServerAdmin.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ServerAdmin.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ServerAdmin.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -158,7 +158,7 @@
MgServerAdminServiceOpId::GetConfigurationProperties, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &propertySection, // Argument#1
MgCommand::knNone);
@@ -195,7 +195,7 @@
MgServerAdminServiceOpId::SetConfigurationProperties, // Command Code
2, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &propertySection, // Argument#1
MgCommand::knObject, properties, // Argument#2
MgCommand::knNone);
@@ -232,7 +232,7 @@
MgServerAdminServiceOpId::RemoveConfigurationProperties, // Command Code
2, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &propertySection, // Argument#1
MgCommand::knObject, properties, // Argument#2
MgCommand::knNone);
@@ -264,7 +264,7 @@
MgServerAdminServiceOpId::ClearLog, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &log, // Argument#1
MgCommand::knNone);
@@ -296,7 +296,7 @@
MgServerAdminServiceOpId::DeleteLog, // Command Code
1, // No. of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &fileName, // Argument #1
MgCommand::knNone);
}
@@ -329,7 +329,7 @@
MgServerAdminServiceOpId::RenameLog, // Command Code
2, // No. of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &oldFileName, // Argument #1
MgCommand::knString, &newFileName, // Argument #2
MgCommand::knNone);
@@ -353,7 +353,7 @@
MgServerAdminServiceOpId::EnumerateLogs,// Command Code
0, // No. of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -386,7 +386,7 @@
MgServerAdminServiceOpId::GetLog, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &log, // Argument#1
MgCommand::knNone);
@@ -424,7 +424,7 @@
MgServerAdminServiceOpId::GetLog, // Command Code
2, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &log, // Argument#1
MgCommand::knInt32, numEntries, // Argument#2
MgCommand::knNone);
@@ -469,7 +469,7 @@
MgServerAdminServiceOpId::GetLog, // Command Code
3, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &log, // Argument#1
MgCommand::knObject, fromDate, // Argument#2
MgCommand::knObject, toDate, // Argument#3
@@ -504,7 +504,7 @@
MgServerAdminServiceOpId::GetLogFile, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &logFile, // Argument#1
MgCommand::knNone);
@@ -531,7 +531,7 @@
MgServerAdminServiceOpId::BringOnline, // Command Code
0, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -557,7 +557,7 @@
MgServerAdminServiceOpId::TakeOffline, // Command Code
0, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -581,7 +581,7 @@
MgServerAdminServiceOpId::IsOnline, // Command Code
0, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -612,7 +612,7 @@
MgServerAdminServiceOpId::GetInformationProperties, // Command Code
0, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -646,7 +646,7 @@
MgServerAdminServiceOpId::DeletePackage,// Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &packageName, // Argument #1
MgCommand::knNone);
@@ -674,7 +674,7 @@
MgServerAdminServiceOpId::EnumeratePackages, // Command Code
0, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -709,7 +709,7 @@
MgServerAdminServiceOpId::GetPackageLog, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &packageName, // Argument #1
MgCommand::knNone);
@@ -740,7 +740,7 @@
MgServerAdminServiceOpId::GetPackageStatus, // Command Code
1, // Number of arguments
ServerAdmin_Service, // Service ID
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &packageName, // Argument #1
MgCommand::knNone);
@@ -764,7 +764,7 @@
MgServerAdminServiceOpId::LoadPackage, // Command Code
1, // Number of arguments
ServerAdmin_Service, // Service ID
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &packageName, // Argument #1
MgCommand::knNone);
@@ -788,7 +788,7 @@
MgServerAdminServiceOpId::MakePackage, // Command Code
3, // Number of arguments
ServerAdmin_Service, // Service ID
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resource, // Argument #1
MgCommand::knString, &packageName, // Argument #2
MgCommand::knString, &packageDescription, // Argument #3
@@ -824,13 +824,13 @@
MG_TRY()
- cmd.ExecuteCommand(m_connProp, // Connection
- MgCommand::knObject, // Return type
- MgServerAdminServiceOpId::RegisterServicesOnServers, // Command code
- 1, // Number of arguments
- ServerAdmin_Service, // Service ID
- 1, // Operation version
- MgCommand::knObject, serverInfoList, // Argument #1
+ cmd.ExecuteCommand(m_connProp, // Connection
+ MgCommand::knObject, // Return type
+ MgServerAdminServiceOpId::RegisterServicesOnServers,// Command code
+ 1, // Number of arguments
+ ServerAdmin_Service, // Service ID
+ BUILD_VERSION(1,0,0), // Operation version
+ MgCommand::knObject, serverInfoList, // Argument #1
MgCommand::knNone );
SetWarning(cmd.GetWarningObject());
@@ -866,13 +866,13 @@
MgCommand cmd;
- cmd.ExecuteCommand(m_connProp, // Connection
- MgCommand::knVoid, // Return type
- MgServerAdminServiceOpId::UnregisterServicesOnServers, // Command code
- 1, // Number of arguments
- ServerAdmin_Service, // Service ID
- 1, // Operation version
- MgCommand::knObject, serverInfoList, // Argument #1
+ cmd.ExecuteCommand(m_connProp, // Connection
+ MgCommand::knVoid, // Return type
+ MgServerAdminServiceOpId::UnregisterServicesOnServers, // Command code
+ 1, // Number of arguments
+ ServerAdmin_Service, // Service ID
+ BUILD_VERSION(1,0,0), // Operation version
+ MgCommand::knObject, serverInfoList, // Argument #1
MgCommand::knNone );
SetWarning(cmd.GetWarningObject());
@@ -897,7 +897,7 @@
MgServerAdminServiceOpId::NotifyResourcesChanged, // Command code
1, // Number of arguments
ServerAdmin_Service, // Service ID
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, resources, // Argument #1
MgCommand::knNone);
@@ -926,7 +926,7 @@
MgServerAdminServiceOpId::SetMaximumLogSize, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt32, size, // Argument#1
MgCommand::knNone);
@@ -952,7 +952,7 @@
MgServerAdminServiceOpId::SetLogsDelimiter, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &delimiter, // Argument #1
MgCommand::knNone);
@@ -983,7 +983,7 @@
MgServerAdminServiceOpId::EnableMaximumLogSize, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt8, (INT8)useMaxSize, // Argument #1
MgCommand::knNone);
@@ -1010,7 +1010,7 @@
MgServerAdminServiceOpId::IsMaximumLogSizeEnabled, // Command Code
0, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -1042,7 +1042,7 @@
MgServerAdminServiceOpId::GetDocument, // Command Code
1, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &identifier, // Argument#1
MgCommand::knNone);
@@ -1078,7 +1078,7 @@
MgServerAdminServiceOpId::SetDocument, // Command Code
2, // No of arguments
ServerAdmin_Service, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &identifier, // Argument#1
MgCommand::knObject, data, // Argument#2
MgCommand::knNone);
Modified: trunk/MgDev/Common/MapGuideCommon/Services/Site.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/Site.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Common/MapGuideCommon/Services/Site.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -207,7 +207,7 @@
MgSiteOpId::CreateSession, // Command Code
0, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone );
SetWarning( cmd.GetWarningObject() );
@@ -245,7 +245,7 @@
MgSiteOpId::DestroySession, // Command Code
1, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &session, // Argument#1
MgCommand::knNone );
@@ -320,7 +320,7 @@
MgSiteOpId::EnumerateUsers, // Command Code
3, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &group, // Argument#1
MgCommand::knString, &role, // Argument#2
MgCommand::knInt8, includeGroups, // Argument#3
@@ -407,7 +407,7 @@
MgSiteOpId::AddUser, // Command Code
4, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &userID, // Argument#1
MgCommand::knString, &userName, // Argument#2
MgCommand::knString, &encryptedPassword, // Argument#3
@@ -470,7 +470,7 @@
MgSiteOpId::UpdateUser, // Command Code
5, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &userID, // Argument#1
MgCommand::knString, &newUserID, // Argument#2
MgCommand::knString, &newUserName, // Argument#3
@@ -511,7 +511,7 @@
MgSiteOpId::DeleteUsers, // Command Code
1, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, users, // Argument#1
MgCommand::knNone );
@@ -552,7 +552,7 @@
MgSiteOpId::GrantRoleMembershipsToUsers,// Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, roles, // Argument#1
MgCommand::knObject, users, // Argument#2
MgCommand::knNone );
@@ -595,7 +595,7 @@
MgSiteOpId::RevokeRoleMembershipsFromUsers,// Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, roles, // Argument#1
MgCommand::knObject, users, // Argument#2
MgCommand::knNone );
@@ -638,7 +638,7 @@
MgSiteOpId::GrantGroupMembershipsToUsers,// Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, groups, // Argument#1
MgCommand::knObject, users, // Argument#2
MgCommand::knNone );
@@ -681,9 +681,9 @@
MgSiteOpId::RevokeGroupMembershipsFromUsers,// Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
- MgCommand::knObject, groups, // Argument#1
- MgCommand::knObject, users, // Argument#2
+ BUILD_VERSION(1,0,0), // Operation version
+ MgCommand::knObject, groups, // Argument#1
+ MgCommand::knObject, users, // Argument#2
MgCommand::knNone );
SetWarning( cmd.GetWarningObject() );
@@ -726,7 +726,7 @@
MgSiteOpId::EnumerateGroups, // Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &user, // Argument#1
MgCommand::knString, &role, // Argument#2
MgCommand::knNone );
@@ -790,7 +790,7 @@
MgSiteOpId::AddGroup, // Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &group, // Argument#1
MgCommand::knString, &description, // Argument#2
MgCommand::knNone );
@@ -837,7 +837,7 @@
MgSiteOpId::UpdateGroup, // Command Code
3, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &group, // Argument#1
MgCommand::knString, &newGroup, // Argument#2
MgCommand::knString, &newDescription, // Argument#3
@@ -877,7 +877,7 @@
MgSiteOpId::DeleteGroups, // Command Code
1, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, groups, // Argument#1
MgCommand::knNone );
@@ -919,7 +919,7 @@
MgSiteOpId::GrantRoleMembershipsToGroups,// Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, roles, // Argument#1
MgCommand::knObject, groups, // Argument#2
MgCommand::knNone );
@@ -962,7 +962,7 @@
MgSiteOpId::RevokeRoleMembershipsFromGroups,// Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, roles, // Argument#1
MgCommand::knObject, groups, // Argument#2
MgCommand::knNone );
@@ -1006,7 +1006,7 @@
MgSiteOpId::EnumerateRoles, // Command Code
2, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &user, // Argument#1
MgCommand::knString, &group, // Argument#2
MgCommand::knNone);
@@ -1039,7 +1039,7 @@
MgSiteOpId::EnumerateServers, // Command Code
0, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knNone);
SetWarning(cmd.GetWarningObject());
@@ -1084,7 +1084,7 @@
MgSiteOpId::AddServer, // Command Code
3, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &name, // Argument#1
MgCommand::knString, &description, // Argument#2
MgCommand::knString, &address, // Argument#3
@@ -1133,7 +1133,7 @@
MgSiteOpId::UpdateServer, // Command Code
4, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &oldName, // Argument#1
MgCommand::knString, &newName, // Argument#1
MgCommand::knString, &newDescription, // Argument#2
@@ -1172,7 +1172,7 @@
MgSiteOpId::RemoveServer, // Command Code
1, // No of arguments
Site_Admin, // Service Id
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knString, &name, // Argument#1
MgCommand::knNone);
@@ -1212,7 +1212,7 @@
MgSiteOpId::RequestServer, // Command code
1, // Number of arguments
Site_Admin, // Service ID
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knInt16, serviceType, // Argument #1
MgCommand::knNone );
@@ -1257,7 +1257,7 @@
MgSiteOpId::Authenticate, // Command code
3, // Number of arguments
Site_Admin, // Service ID
- 1, // Operation version
+ BUILD_VERSION(1,0,0), // Operation version
MgCommand::knObject, userInformation, // Argument #1
MgCommand::knObject, requiredRoles, // Argument #2
MgCommand::knInt8, (int)returnAssignedRoles, // Argument #3
Modified: trunk/MgDev/Server/src/Common/Manager/LogManager.h
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/LogManager.h 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Common/Manager/LogManager.h 2007-03-13 19:23:17 UTC (rev 1209)
@@ -122,8 +122,17 @@
#define MG_LOG_OPERATION_MESSAGE_INIT(Version, Arguments) \
operationMessage += L"."; \
- ACE_OS::itoa(Version, bufferConversion, 10); \
+ INT32 tempVersion = (Version & 0x00ff0000) >> 16; \
+ ACE_OS::itoa(tempVersion, bufferConversion, 10); \
operationMessage += bufferConversion; \
+ operationMessage += L"."; \
+ tempVersion = (Version & 0x0000ff00) >> 8; \
+ ACE_OS::itoa(tempVersion, bufferConversion, 10); \
+ operationMessage += bufferConversion; \
+ operationMessage += L"."; \
+ tempVersion = (Version & 0x000000ff); \
+ ACE_OS::itoa(tempVersion, bufferConversion, 10); \
+ operationMessage += bufferConversion; \
operationMessage += L":"; \
ACE_OS::itoa(Arguments, bufferConversion, 10); \
operationMessage += bufferConversion;
Modified: trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -71,9 +71,9 @@
switch (operationId)
{
case MgDrawingServiceOpId::GetDrawing:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetDrawing());
break;
default:
@@ -83,9 +83,9 @@
break;
case MgDrawingServiceOpId::DescribeDrawing:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDescribeDrawing());
break;
default:
@@ -95,9 +95,9 @@
break;
case MgDrawingServiceOpId::GetSection:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetSection());
break;
default:
@@ -107,9 +107,9 @@
break;
case MgDrawingServiceOpId::GetSectionResource:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetSectionResource());
break;
default:
@@ -119,9 +119,9 @@
break;
case MgDrawingServiceOpId::EnumerateLayers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateLayers());
break;
default:
@@ -131,9 +131,9 @@
break;
case MgDrawingServiceOpId::GetLayer:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetLayer());
break;
default:
@@ -143,9 +143,9 @@
break;
case MgDrawingServiceOpId::EnumerateSections:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateSections());
break;
default:
@@ -155,9 +155,9 @@
break;
case MgDrawingServiceOpId::EnumerateSectionResources:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateSectionResources());
break;
default:
@@ -167,9 +167,9 @@
break;
case MgDrawingServiceOpId::GetCoordinateSpace:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetCoordinateSpace());
break;
default:
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -97,9 +97,9 @@
switch (operationId)
{
case MgFeatureServiceOpId::GetFeatureProviders_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetFeatureProviders());
break;
default:
@@ -109,9 +109,9 @@
break;
case MgFeatureServiceOpId::GetConnectionPropertyValues_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetConnectionPropertyValues());
break;
default:
@@ -121,9 +121,9 @@
break;
case MgFeatureServiceOpId::TestConnection_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpTestConnection());
break;
default:
@@ -133,9 +133,9 @@
break;
case MgFeatureServiceOpId::TestConnectionWithResource_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpTestFeatureSourceConnection());
break;
default:
@@ -145,9 +145,9 @@
break;
case MgFeatureServiceOpId::GetCapabilities_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetCapabilities());
break;
default:
@@ -157,9 +157,9 @@
break;
case MgFeatureServiceOpId::DescribeSchema_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDescribeSchema());
break;
default:
@@ -169,9 +169,9 @@
break;
case MgFeatureServiceOpId::DescribeSchemaAsXml_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDescribeSchemaAsXml());
break;
default:
@@ -181,9 +181,9 @@
break;
case MgFeatureServiceOpId::GetSchemas_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetSchemas());
break;
default:
@@ -193,9 +193,9 @@
break;
case MgFeatureServiceOpId::GetClasses_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetClasses());
break;
default:
@@ -205,9 +205,9 @@
break;
case MgFeatureServiceOpId::GetClassDefinition_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetClassDefinition());
break;
default:
@@ -217,9 +217,9 @@
break;
case MgFeatureServiceOpId::SelectFeatures_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSelectFeatures());
break;
default:
@@ -229,9 +229,9 @@
break;
case MgFeatureServiceOpId::SelectAggregate_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSelectFeaturesSpatial());
break;
default:
@@ -241,9 +241,9 @@
break;
case MgFeatureServiceOpId::ExecuteSqlQuery_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpExecuteSqlQuery());
break;
default:
@@ -253,9 +253,9 @@
break;
case MgFeatureServiceOpId::ExecuteSqlNonQuery_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpExecuteSqlNonQuery());
break;
default:
@@ -265,9 +265,9 @@
break;
case MgFeatureServiceOpId::GetSpatialContexts_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetSpatialContexts());
break;
default:
@@ -277,9 +277,9 @@
break;
case MgFeatureServiceOpId::UpdateFeatures_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpUpdateFeatures());
break;
default:
@@ -289,9 +289,9 @@
break;
case MgFeatureServiceOpId::GetFeatures_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetFeatures());
break;
default:
@@ -301,9 +301,9 @@
break;
case MgFeatureServiceOpId::CloseFeatureReader_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCloseFeatureReader());
break;
default:
@@ -313,9 +313,9 @@
break;
case MgFeatureServiceOpId::GetSqlRows_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetSqlRows());
break;
default:
@@ -325,9 +325,9 @@
break;
case MgFeatureServiceOpId::CloseSqlReader_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCloseSqlReader());
break;
default:
@@ -337,9 +337,9 @@
break;
case MgFeatureServiceOpId::GetDataRows_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetDataRows());
break;
default:
@@ -349,9 +349,9 @@
break;
case MgFeatureServiceOpId::CloseDataReader_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCloseDataReader());
break;
default:
@@ -361,9 +361,9 @@
break;
case MgFeatureServiceOpId::GetLongTransactions_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetLongTransactions());
break;
default:
@@ -373,9 +373,9 @@
break;
case MgFeatureServiceOpId::SetLongTransaction_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetLongTransaction());
break;
default:
@@ -385,9 +385,9 @@
break;
case MgFeatureServiceOpId::GetRaster_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetRaster());
break;
default:
@@ -397,9 +397,9 @@
break;
case MgFeatureServiceOpId::SchemaToXml_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSchemaToXml());
break;
default:
@@ -409,9 +409,9 @@
break;
case MgFeatureServiceOpId::XmlToSchema_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpXmlToSchema());
break;
default:
@@ -421,9 +421,9 @@
break;
case MgFeatureServiceOpId::CreateFeatureSource_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCreateFeatureSource());
break;
default:
@@ -433,9 +433,9 @@
break;
case MgFeatureServiceOpId::GetIdentityProperties_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetIdentityProperties());
break;
default:
@@ -445,9 +445,9 @@
break;
case MgFeatureServiceOpId::DescribeWfsFeatureType_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDescribeWfsFeatureType());
break;
default:
@@ -457,9 +457,9 @@
break;
case MgFeatureServiceOpId::GetWfsFeature_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetWfsFeature());
break;
default:
@@ -469,9 +469,9 @@
break;
case MgFeatureServiceOpId::CloseGwsFeatureReader_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCloseGwsFeatureReader());
break;
default:
@@ -482,9 +482,9 @@
break;
case MgFeatureServiceOpId::EnumerateDataStores_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateDataStores());
break;
default:
@@ -495,9 +495,9 @@
break;
case MgFeatureServiceOpId::GetSchemaMapping_Id:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetSchemaMapping());
break;
default:
Modified: trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -63,9 +63,9 @@
switch (operationId)
{
case MgKmlServiceOpId::GetMapKml:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetMapKml());
break;
default:
@@ -75,9 +75,9 @@
break;
case MgKmlServiceOpId::GetLayerKml:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetLayerKml());
break;
default:
@@ -87,9 +87,9 @@
break;
case MgKmlServiceOpId::GetFeaturesKml:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetFeaturesKml());
break;
default:
Modified: trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -76,9 +76,9 @@
switch (operationId)
{
case MgMappingService::opIdGenerateMap:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGenerateMap());
break;
default:
@@ -88,9 +88,9 @@
break;
case MgMappingService::opIdGenerateMapUpdate:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGenerateMapUpdate());
break;
default:
@@ -100,9 +100,9 @@
break;
case MgMappingService::opIdGeneratePlot:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGeneratePlot());
break;
default:
@@ -112,9 +112,9 @@
break;
case MgMappingService::opIdGeneratePlot2:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGeneratePlot());
break;
default:
@@ -124,9 +124,9 @@
break;
case MgMappingService::opIdGeneratePlot3:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGeneratePlot());
break;
default:
@@ -136,9 +136,9 @@
break;
case MgMappingService::opIdGenerateMultiPlot:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGenerateMultiPlot());
break;
default:
@@ -148,9 +148,9 @@
break;
case MgMappingService::opIdGenerateLegendPlot:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGenerateLegendPlot());
break;
default:
@@ -160,9 +160,9 @@
break;
case MgMappingService::opIdGenerateLegendImage:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGenerateLegendImage());
break;
default:
@@ -172,9 +172,9 @@
break;
case MgMappingService::opIdQueryFeatures:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpMQueryFeatures());
break;
default:
@@ -184,9 +184,9 @@
break;
case MgMappingService::opIdQueryFeaturesWms:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpQueryFeaturesWms());
break;
default:
Modified: trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -62,9 +62,9 @@
switch (operationId)
{
case MgRenderingServiceOpId::RenderTile:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenderTile());
break;
default:
@@ -74,9 +74,9 @@
break;
case MgRenderingServiceOpId::RenderDynamicOverlay:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenderDynamicOverlay());
break;
default:
@@ -86,9 +86,9 @@
break;
case MgRenderingServiceOpId::RenderMap1:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenderMap());
break;
default:
@@ -98,9 +98,9 @@
break;
case MgRenderingServiceOpId::RenderMap2:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenderMap());
break;
default:
@@ -110,9 +110,9 @@
break;
case MgRenderingServiceOpId::RenderMap3:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenderMap());
break;
default:
@@ -122,9 +122,9 @@
break;
case MgRenderingServiceOpId::QueryFeatures:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpQueryFeatures());
break;
default:
@@ -133,9 +133,9 @@
}
break;
case MgRenderingServiceOpId::QueryFeatureProperties:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpQueryFeatureProperties());
break;
default:
@@ -144,9 +144,9 @@
}
break;
case MgRenderingServiceOpId::RenderMapLegend:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenderMapLegend());
break;
default:
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -97,9 +97,9 @@
switch (operationId)
{
case MgResourceService::opIdEnumerateRepositories:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateRepositories());
break;
default:
@@ -109,9 +109,9 @@
break;
case MgResourceService::opIdCreateRepository:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCreateRepository());
break;
default:
@@ -121,9 +121,9 @@
break;
case MgResourceService::opIdDeleteRepository:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDeleteRepository());
break;
default:
@@ -133,9 +133,9 @@
break;
case MgResourceService::opIdUpdateRepository:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpUpdateRepository());
break;
default:
@@ -145,9 +145,9 @@
break;
case MgResourceService::opIdGetRepositoryContent:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetRepositoryContent());
break;
default:
@@ -157,9 +157,9 @@
break;
case MgResourceService::opIdGetRepositoryHeader:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetRepositoryHeader());
break;
default:
@@ -169,9 +169,9 @@
break;
case MgResourceService::opIdApplyResourcePackage:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpApplyResourcePackage());
break;
default:
@@ -181,9 +181,9 @@
break;
case MgResourceService::opIdEnumerateResources:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateResources());
break;
default:
@@ -193,9 +193,9 @@
break;
case MgResourceService::opIdSetResource:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetResource());
break;
default:
@@ -205,9 +205,9 @@
break;
case MgResourceService::opIdDeleteResource:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDeleteResource());
break;
default:
@@ -217,9 +217,9 @@
break;
case MgResourceService::opIdMoveResource:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpMoveResource());
break;
default:
@@ -229,9 +229,9 @@
break;
case MgResourceService::opIdCopyResource:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpCopyResource());
break;
default:
@@ -241,9 +241,9 @@
break;
case MgResourceService::opIdGetResourceContent:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetResourceContent());
break;
default:
@@ -253,9 +253,9 @@
break;
case MgResourceService::opIdGetResourceHeader:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetResourceHeader());
break;
default:
@@ -265,9 +265,9 @@
break;
case MgResourceService::opIdGetResourceModifiedDate:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetResourceModifiedDate());
break;
default:
@@ -277,9 +277,9 @@
break;
case MgResourceService::opIdEnumerateReferences:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateResourceReferences());
break;
default:
@@ -289,9 +289,9 @@
break;
case MgResourceService::opIdEnumerateParentMapDefinitions:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateParentMapDefinitions());
break;
default:
@@ -301,9 +301,9 @@
break;
case MgResourceService::opIdChangeResourceOwner:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpChangeResourceOwner());
break;
default:
@@ -313,9 +313,9 @@
break;
case MgResourceService::opIdInheritPermissionsFrom:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpInheritPermissionsFrom());
break;
default:
@@ -325,9 +325,9 @@
break;
case MgResourceService::opIdEnumerateResourceData:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateResourceData());
break;
default:
@@ -337,9 +337,9 @@
break;
case MgResourceService::opIdSetResourceData:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetResourceData());
break;
default:
@@ -349,9 +349,9 @@
break;
case MgResourceService::opIdDeleteResourceData:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDeleteResourceData());
break;
default:
@@ -361,9 +361,9 @@
break;
case MgResourceService::opIdRenameResourceData:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenameResourceData());
break;
default:
@@ -373,9 +373,9 @@
break;
case MgResourceService::opIdGetResourceData:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetResourceData());
break;
default:
@@ -385,9 +385,9 @@
break;
case MgResourceService::opIdEnumerateUnmanagedData:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateUnmanagedData());
break;
default:
Modified: trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -93,9 +93,9 @@
switch (operationId)
{
case MgServerAdminServiceOpId::GetConfigurationProperties:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetConfigurationProperties());
break;
default:
@@ -104,9 +104,9 @@
break;
case MgServerAdminServiceOpId::SetConfigurationProperties:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetConfigurationProperties());
break;
default:
@@ -115,9 +115,9 @@
break;
case MgServerAdminServiceOpId::RemoveConfigurationProperties:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRemoveConfigurationProperties());
break;
default:
@@ -126,9 +126,9 @@
break;
case MgServerAdminServiceOpId::BringOnline:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpBringOnline());
break;
default:
@@ -137,9 +137,9 @@
break;
case MgServerAdminServiceOpId::TakeOffline:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpTakeOffline());
break;
default:
@@ -148,9 +148,9 @@
break;
case MgServerAdminServiceOpId::IsOnline:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpIsOnline());
break;
default:
@@ -159,9 +159,9 @@
break;
case MgServerAdminServiceOpId::GetLog:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetLog());
break;
default:
@@ -170,9 +170,9 @@
break;
case MgServerAdminServiceOpId::GetLogFile:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetLogFile());
break;
default:
@@ -181,9 +181,9 @@
break;
case MgServerAdminServiceOpId::ClearLog:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpClearLog());
break;
default:
@@ -192,9 +192,9 @@
break;
case MgServerAdminServiceOpId::DeleteLog:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDeleteLog());
break;
default:
@@ -203,9 +203,9 @@
break;
case MgServerAdminServiceOpId::RenameLog:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRenameLog());
break;
default:
@@ -214,9 +214,9 @@
break;
case MgServerAdminServiceOpId::EnumerateLogs:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumerateLogs());
break;
default:
@@ -225,9 +225,9 @@
break;
case MgServerAdminServiceOpId::DeletePackage:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpDeletePackage());
break;
default:
@@ -236,9 +236,9 @@
break;
case MgServerAdminServiceOpId::EnumeratePackages:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnumeratePackages());
break;
default:
@@ -247,9 +247,9 @@
break;
case MgServerAdminServiceOpId::GetPackageLog:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetPackageLog());
break;
default:
@@ -258,9 +258,9 @@
break;
case MgServerAdminServiceOpId::GetPackageStatus:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetPackageStatus());
break;
default:
@@ -269,9 +269,9 @@
break;
case MgServerAdminServiceOpId::LoadPackage:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpLoadPackage());
break;
default:
@@ -280,9 +280,9 @@
break;
case MgServerAdminServiceOpId::MakePackage:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpMakePackage());
break;
default:
@@ -291,9 +291,9 @@
break;
case MgServerAdminServiceOpId::GetInformationProperties:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetInformationProperties());
break;
default:
@@ -302,9 +302,9 @@
break;
case MgServerAdminServiceOpId::RegisterServicesOnServers :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpRegisterServicesOnServers());
break;
default:
@@ -313,9 +313,9 @@
break;
case MgServerAdminServiceOpId::UnregisterServicesOnServers :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpUnregisterServicesOnServers());
break;
default:
@@ -324,9 +324,9 @@
break;
case MgServerAdminServiceOpId::NotifyResourcesChanged :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpNotifyResourcesChanged());
break;
default:
@@ -335,9 +335,9 @@
break;
case MgServerAdminServiceOpId::SetMaximumLogSize :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetMaximumLogSize());
break;
default:
@@ -346,9 +346,9 @@
break;
case MgServerAdminServiceOpId::SetLogsDelimiter :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetLogDelimiter());
break;
default:
@@ -357,9 +357,9 @@
break;
case MgServerAdminServiceOpId::EnableMaximumLogSize :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpEnableMaximumLogSize());
break;
default:
@@ -368,9 +368,9 @@
break;
case MgServerAdminServiceOpId::IsMaximumLogSizeEnabled :
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpIsMaximumLogSizeEnabled());
break;
default:
@@ -379,9 +379,9 @@
break;
case MgServerAdminServiceOpId::GetDocument:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpGetDocument());
break;
default:
@@ -390,9 +390,9 @@
break;
case MgServerAdminServiceOpId::SetDocument:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetDocument());
break;
default:
Modified: trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -105,9 +105,9 @@
switch (operationId)
{
case MgSiteOpId::Authenticate:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpAuthenticate() );
break;
default:
@@ -117,9 +117,9 @@
break;
case MgSiteOpId::EnumerateUsers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpEnumerateUsers() );
break;
default:
@@ -129,9 +129,9 @@
break;
case MgSiteOpId::AddUser:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpAddUser() );
break;
default:
@@ -141,9 +141,9 @@
break;
case MgSiteOpId::UpdateUser:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpUpdateUser() );
break;
default:
@@ -153,9 +153,9 @@
break;
case MgSiteOpId::DeleteUsers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpDeleteUsers() );
break;
default:
@@ -165,9 +165,9 @@
break;
case MgSiteOpId::GrantRoleMembershipsToUsers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpGrantRoleMembershipsToUsers() );
break;
default:
@@ -177,9 +177,9 @@
break;
case MgSiteOpId::RevokeRoleMembershipsFromUsers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpRevokeRoleMembershipsFromUsers() );
break;
default:
@@ -189,9 +189,9 @@
break;
case MgSiteOpId::GrantGroupMembershipsToUsers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpGrantGroupMembershipsToUsers() );
break;
default:
@@ -201,9 +201,9 @@
break;
case MgSiteOpId::RevokeGroupMembershipsFromUsers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpRevokeGroupMembershipsFromUsers() );
break;
default:
@@ -213,9 +213,9 @@
break;
case MgSiteOpId::EnumerateGroups:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpEnumerateGroups() );
break;
default:
@@ -225,9 +225,9 @@
break;
case MgSiteOpId::AddGroup:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpAddGroup() );
break;
default:
@@ -237,9 +237,9 @@
break;
case MgSiteOpId::UpdateGroup:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpUpdateGroup() );
break;
default:
@@ -249,9 +249,9 @@
break;
case MgSiteOpId::DeleteGroups:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpDeleteGroups() );
break;
default:
@@ -261,9 +261,9 @@
break;
case MgSiteOpId::GrantRoleMembershipsToGroups:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpGrantRoleMembershipsToGroups() );
break;
default:
@@ -273,9 +273,9 @@
break;
case MgSiteOpId::RevokeRoleMembershipsFromGroups:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpRevokeRoleMembershipsFromGroups() );
break;
default:
@@ -285,9 +285,9 @@
break;
case MgSiteOpId::EnumerateRoles:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpEnumerateRoles() );
break;
default:
@@ -297,9 +297,9 @@
break;
case MgSiteOpId::EnumerateServers:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpEnumerateServers() );
break;
default:
@@ -309,9 +309,9 @@
break;
case MgSiteOpId::AddServer:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpAddServer() );
break;
default:
@@ -321,9 +321,9 @@
break;
case MgSiteOpId::RemoveServer:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpRemoveServer() );
break;
default:
@@ -333,9 +333,9 @@
break;
case MgSiteOpId::UpdateServer:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpUpdateServer() );
break;
default:
@@ -345,9 +345,9 @@
break;
case MgSiteOpId::RequestServer:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpRequestServer() );
break;
default:
@@ -357,9 +357,9 @@
break;
case MgSiteOpId::CreateSession:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpCreateSession() );
break;
default:
@@ -369,9 +369,9 @@
break;
case MgSiteOpId::DestroySession:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset( new MgOpDestroySession() );
break;
default:
Modified: trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp 2007-03-13 17:50:50 UTC (rev 1208)
+++ trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp 2007-03-13 19:23:17 UTC (rev 1209)
@@ -62,10 +62,10 @@
switch (operationId)
{
case MgTileServiceOpId::GetTile:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
- case 2:
+ case VERSION_SUPPORTED(1,0):
+ case VERSION_SUPPORTED(1,2):
handler.reset(new MgOpGetTile());
break;
default:
@@ -75,9 +75,9 @@
break;
case MgTileServiceOpId::SetTile:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpSetTile());
break;
default:
@@ -87,9 +87,9 @@
break;
case MgTileServiceOpId::ClearCache:
- switch (operationVersion)
+ switch (VERSION_NO_PHASE(operationVersion))
{
- case 1:
+ case VERSION_SUPPORTED(1,0):
handler.reset(new MgOpClearCache());
break;
default:
More information about the mapguide-commits
mailing list