[mapguide-commits] r4261 - in sandbox/rfc60/MgDev/Server/src:
Common/Manager Common/Thread Core Gws/GwsCommon
Gws/GwsQueryEngine Gws/Include PostBuild Services/Rendering
Services/Resource
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 24 10:12:24 EDT 2009
Author: uvlite
Date: 2009-09-24 10:12:23 -0400 (Thu, 24 Sep 2009)
New Revision: 4261
Modified:
sandbox/rfc60/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
sandbox/rfc60/MgDev/Server/src/Common/Manager/ServerManager.vcproj
sandbox/rfc60/MgDev/Server/src/Common/Manager/UnmanagedDataManager.cpp
sandbox/rfc60/MgDev/Server/src/Common/Thread/ServerThread.vcproj
sandbox/rfc60/MgDev/Server/src/Core/EventTimer.h
sandbox/rfc60/MgDev/Server/src/Core/Server.cpp
sandbox/rfc60/MgDev/Server/src/Core/ServerCore.vcproj
sandbox/rfc60/MgDev/Server/src/Core/ServerCoreBuild.cpp
sandbox/rfc60/MgDev/Server/src/Core/TimedEvent.h
sandbox/rfc60/MgDev/Server/src/Core/TimedEventHandler.cpp
sandbox/rfc60/MgDev/Server/src/Gws/GwsCommon/stdafx.h
sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/stdafx.h
sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsCommon.h
sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsQueryEngine.h
sandbox/rfc60/MgDev/Server/src/PostBuild/PostBuild.mak
sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.h
sandbox/rfc60/MgDev/Server/src/Services/Resource/OpEnumerateResourceDocuments.cpp
sandbox/rfc60/MgDev/Server/src/Services/Resource/OpMoveResource.cpp
Log:
rfc60 last changes to make it compile
Modified: sandbox/rfc60/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -2002,7 +2002,7 @@
{
resId = resource->ToString();
}
-
+
if (resId.empty())
{
MgStringCollection arguments;
@@ -2034,7 +2034,7 @@
FdoConnectionCacheEntry* pFdoConnectionCacheEntry = iter->second;
if (pFdoConnectionCacheEntry)
{
- // Mark all the connections that use this resource as invalid because the something bad
+ // Mark all the connections that use this resource as invalid because the something bad
// happened to the underlying connection. This will force new connections to be created aand cached.
pFdoConnectionCacheEntry->bValid = false;
}
Modified: sandbox/rfc60/MgDev/Server/src/Common/Manager/ServerManager.vcproj
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Common/Manager/ServerManager.vcproj 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Common/Manager/ServerManager.vcproj 2009-09-24 14:12:23 UTC (rev 4261)
@@ -52,6 +52,7 @@
RuntimeLibrary="3"
DisableLanguageExtensions="false"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -65,11 +66,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib FDO.lib FDOCommon.lib pdh.lib"
+ AdditionalDependencies="ACEd.lib Fdo.lib FdoCommon.lib pdh.lib"
OutputFile="$(OutDir)\MgServerManagerd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\FDO\lib"
- DelayLoadDLLs="FDO.dll;FDOCommon.dll"
+ DelayLoadDLLs="Fdo.dll;FdoCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerManagerd.pdb"
SubSystem="2"
@@ -134,6 +135,7 @@
RuntimeLibrary="3"
DisableLanguageExtensions="false"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
@@ -147,11 +149,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib FDO.lib FDOCommon.lib pdh.lib"
+ AdditionalDependencies="ACEd.lib Fdo.lib FdoCommon.lib pdh.lib"
OutputFile="$(OutDir)\MgServerManagerd.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\FDO\lib64"
- DelayLoadDLLs="FDO.dll;FDOCommon.dll"
+ DelayLoadDLLs="Fdo.dll;FdoCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerManagerd.pdb"
SubSystem="2"
@@ -207,11 +209,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Common\Renderers;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\Inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -225,11 +228,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib FDO.lib FDOCommon.lib pdh.lib"
+ AdditionalDependencies="ACE.lib Fdo.lib FdoCommon.lib pdh.lib"
OutputFile="$(OutDir)\MgServerManager.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\FDO\lib"
- DelayLoadDLLs="FDO.dll;FDOCommon.dll"
+ DelayLoadDLLs="Fdo.dll;FdoCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerManager.pdb"
SubSystem="2"
@@ -293,6 +296,7 @@
ExceptionHandling="2"
RuntimeLibrary="2"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -306,11 +310,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib FDO.lib FDOCommon.lib pdh.lib"
+ AdditionalDependencies="ACE.lib Fdo.lib FdoCommon.lib pdh.lib"
OutputFile="$(OutDir)\MgServerManager.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\FDO\lib64"
- DelayLoadDLLs="FDO.dll;FDOCommon.dll"
+ DelayLoadDLLs="Fdo.dll;FdoCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerManager.pdb"
SubSystem="2"
Modified: sandbox/rfc60/MgDev/Server/src/Common/Manager/UnmanagedDataManager.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Common/Manager/UnmanagedDataManager.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Common/Manager/UnmanagedDataManager.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -441,7 +441,7 @@
// find the mapping name in the map, and then replace it
Ptr<MgPropertyCollection> unmanagedDataMappings = MgUnmanagedDataManager::GetInstance()->GetUnmanagedDataMappings();
-
+
if (NULL != unmanagedDataMappings.p)
{
Ptr<MgStringProperty> stringProp = dynamic_cast<MgStringProperty*>(unmanagedDataMappings->FindItem(MgUtil::MultiByteToWideChar(mappingName)));
Modified: sandbox/rfc60/MgDev/Server/src/Common/Thread/ServerThread.vcproj
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Common/Thread/ServerThread.vcproj 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Common/Thread/ServerThread.vcproj 2009-09-24 14:12:23 UTC (rev 4261)
@@ -50,6 +50,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -129,6 +130,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
@@ -205,6 +207,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_THREAD_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -284,6 +287,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_THREAD_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Modified: sandbox/rfc60/MgDev/Server/src/Core/EventTimer.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Core/EventTimer.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Core/EventTimer.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -20,7 +20,7 @@
class MgTimedEventHandler;
-const int MG_MAX_EVENT_TIMERS = 8;
+const int MG_MAX_EVENT_TIMERS = 7;
class MgEventTimer
{
@@ -37,7 +37,6 @@
RepositoryCheckpoint = 4,
ResourceChange = 5,
FeatureServiceCacheTimeLimit = 6,
- DataTransactionTimeout = 7,
};
/// Constructors/Destructor
Modified: sandbox/rfc60/MgDev/Server/src/Core/Server.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Core/Server.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Core/Server.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -28,7 +28,6 @@
#include "FontManager.h"
#include "LongTransactionManager.h"
#include "CacheManager.h"
-#include "ServerFeatureTransactionPool.h"
#include "Stylizer.h"
#include "Bounds.h"
@@ -986,12 +985,6 @@
MgFdoConnectionManager* pFdoConnectionManager = MgFdoConnectionManager::GetInstance();
pFdoConnectionManager->Initialize(bDataConnectionPoolEnabled, nDataConnectionPoolSize, dataConnectionTimer.GetEventTimeout(), dataConnectionPoolExcludedProviders, dataConnectionPoolSizeCustom);
- // Initialize the transaction pool
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%t) MgServer::open() - Initializing transaction pool.\n")));
- MgEventTimer& dataTransactionTimer = m_eventTimerManager.GetEventTimer(MgEventTimer::DataTransactionTimeout);
- MgServerFeatureTransactionPool* pTransactionPool = MgServerFeatureTransactionPool::GetInstance();
- pTransactionPool->Initialize(dataTransactionTimer.GetEventTimeout());
-
// On startup, perform the service registration for the Site server.
// Note that this event will be perfomed by a timer for the Support server.
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) MgServer::open() - Registering Services.\n")));
Modified: sandbox/rfc60/MgDev/Server/src/Core/ServerCore.vcproj
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Core/ServerCore.vcproj 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Core/ServerCore.vcproj 2009-09-24 14:12:23 UTC (rev 4261)
@@ -50,6 +50,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4267"
/>
@@ -130,6 +131,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4267"
/>
@@ -210,6 +212,7 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4267"
/>
@@ -292,6 +295,7 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
DisableSpecificWarnings="4267"
/>
@@ -428,78 +432,6 @@
>
</File>
<File
- RelativePath=".\DataTransactionTimeoutEventHandler.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseTopobase|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseTopobase|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DebugTopobase|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DebugTopobase|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\DataTransactionTimeoutEventHandler.h"
- >
- </File>
- <File
RelativePath=".\EventTimer.cpp"
>
<FileConfiguration
Modified: sandbox/rfc60/MgDev/Server/src/Core/ServerCoreBuild.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Core/ServerCoreBuild.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Core/ServerCoreBuild.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -18,7 +18,6 @@
#include "ClientAcceptor.cpp"
#include "ConnectionTimeoutEventHandler.cpp"
#include "DataConnectionTimeoutEventHandler.cpp"
-#include "DataTransactionTimeoutEventHandler.cpp"
#include "EventTimer.cpp"
#include "EventTimerManager.cpp"
#include "FeatureServiceCacheTimeLimitEventHandler.cpp"
Modified: sandbox/rfc60/MgDev/Server/src/Core/TimedEvent.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Core/TimedEvent.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Core/TimedEvent.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -33,7 +33,6 @@
RepositoryCheckpoint = 50,
ResourceChange = 60,
FeatureServiceCacheTimeLimit = 70,
- DataTransactionTimeout = 80,
};
/// Constructors/Destructor
Modified: sandbox/rfc60/MgDev/Server/src/Core/TimedEventHandler.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Core/TimedEventHandler.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Core/TimedEventHandler.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -87,10 +87,6 @@
eventHandler.reset(new MgFeatureServiceCacheTimeLimitEventHandler(timer));
break;
- case MgEventTimer::DataTransactionTimeout:
- eventHandler.reset(new MgDataTransactionTimeoutEventHandler(timer));
- break;
-
default:
throw new MgInvalidArgumentException(
L"MgTimedEventHandler.Create", __LINE__, __WFILE__, NULL, L"", NULL);
Modified: sandbox/rfc60/MgDev/Server/src/Gws/GwsCommon/stdafx.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Gws/GwsCommon/stdafx.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Gws/GwsCommon/stdafx.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -20,14 +20,16 @@
#endif
#if defined (_MSC_VER)
-// disable deprecation and non-conforming warning introduced by VC8
-#define _CRT_SECURE_NO_DEPRECATE 1
-#define _CRT_NON_CONFORMING_SWPRINTFS 1
-#pragma warning(disable: 4996)
+// Disable deprecation and non-conforming warning introduced by VC8
+# define _CRT_SECURE_NO_DEPRECATE 1
+# define _CRT_NON_CONFORMING_SWPRINTFS 1
+# pragma warning (disable:4996)
#endif
+// #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+//#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#ifdef _WIN32
-// Windows Header Files:
#include <windows.h>
#include <limits.h>
#else
Modified: sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -308,12 +308,12 @@
}
-// TODO - This method is executed 2 times on a join.
-// 1) SelectFeatures() creates a MgServerGwsFeatureReader() object and inside this constructor it calls
+// TODO - This method is executed 2 times on a join.
+// 1) SelectFeatures() creates a MgServerGwsFeatureReader() object and inside this constructor it calls
// m_gwsGetFeatures->GetMgClassDefinition() which uses the iterator copy to generate the class definition.
// 2) ReadNext() on the actual reader. This one is expected.
//
-// Would be nice if we did not require the iterator copy and could therefore remove the 1st call.
+// Would be nice if we did not require the iterator copy and could therefore remove the 1st call.
FdoDataValueCollection * CGwsBatchSortedBlockJoinQueryResults::GetJoinValues ()
{
#ifdef _DEBUG_BATCHSORT_JOIN
Modified: sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/stdafx.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/stdafx.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Gws/GwsQueryEngine/stdafx.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -20,18 +20,16 @@
#endif
#if defined (_MSC_VER)
-// disable deprecation and non-conforming warning introduced by VC8
-#define _CRT_SECURE_NO_DEPRECATE 1
-#define _CRT_NON_CONFORMING_SWPRINTFS 1
-#pragma warning(disable: 4996)
+// Disable deprecation and non-conforming warning introduced by VC8
+# define _CRT_SECURE_NO_DEPRECATE 1
+# define _CRT_NON_CONFORMING_SWPRINTFS 1
+# pragma warning (disable:4996)
#endif
#ifdef _WIN32
-
-// exclude rarely-used stuff from Windows headers
-#define WIN32_LEAN_AND_MEAN
-
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
+
#include <windows.h>
#include <limits.h>
#else
@@ -42,6 +40,7 @@
#include <string>
#endif
+//#include "io.h"
#include "assert.h"
#include <Fdo.h>
Modified: sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsCommon.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsCommon.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsCommon.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -28,6 +28,10 @@
#include <Fdo.h>
+#ifdef _WIN32
+#pragma warning( disable : 4290 ) //ignore C++ specific exception specification
+#endif
+
#ifdef GWS_MULTHREADED_CLIENT
#define GWSThreadModel GWSMultiThreadModel
#else
Modified: sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsQueryEngine.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsQueryEngine.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Gws/Include/GwsQueryEngine.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -30,7 +30,9 @@
#include <GwsCommon.h>
#ifdef _WIN32
-#pragma warning(disable: 4505) // ignore 'function' : unreferenced local function has been removed
+#pragma warning( disable : 4505 ) // ignore 'function' : unreferenced local function has been removed
+#pragma warning( disable : 4290 ) // ignore C++ specific exception specification
+#else
#endif
// forward definitions
Modified: sandbox/rfc60/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- sandbox/rfc60/MgDev/Server/src/PostBuild/PostBuild.mak 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/PostBuild/PostBuild.mak 2009-09-24 14:12:23 UTC (rev 4261)
@@ -93,7 +93,7 @@
CopyFdoComponentsDebug : ..\..\..\Oem\FDO\*.*
if NOT EXIST ..\..\bin\debug\FDO\nul mkdir ..\..\bin\debug\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\debug\FDO\
+ xcopy /r /d /y /s ..\..\..\Oem\FDO\bin ..\..\bin\debug\FDO\
CopyFdoProvidersDebug : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug\FDO\
@@ -587,7 +587,7 @@
CopyFdoComponentsRelease : ..\..\..\Oem\FDO\*.*
if NOT EXIST ..\..\bin\release\FDO\nul mkdir ..\..\bin\release\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\release\FDO\
+ xcopy /r /d /y /s ..\..\..\Oem\FDO\bin ..\..\bin\release\FDO\
CopyFdoProvidersRelease : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release\FDO\
Modified: sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -823,7 +823,7 @@
// begin map stylization
dr->StartMap(&mapInfo, b, scale, map->GetDisplayDpi(), map->GetMetersPerUnit(), NULL);
- MG_TRY()
+// MG_TRY()
// if no layer collection is supplied, then put all layers in a temporary collection
Ptr<MgReadOnlyLayerCollection> tempLayers = SAFE_ADDREF(roLayers);
if (tempLayers == NULL) // if called from renderMap not RenderTile
@@ -942,7 +942,7 @@
//-------------------------------------------------------
/// we examine the expressions collected from xml definitions of all layer.
/// the color Palette for the renderer is a list<RSColor>
- PRSCOLORLIST tileColorPalette = new RSCOLORLIST();
+ PRSCOLORS tileColorPalette = new RSCOLORS();
/// the map object has a list from all color entries found in the most recent Layerstylization
/// TODO currently they are interpreted as ffffffff 32 bit RGBA string values.
/// adding expresssions and other interpretations could be done here.
@@ -959,9 +959,9 @@
} catch (exception e) {
if (tileColorPalette) // cleanup the bare pointer (its a STL list so we do it by hand
{
- RSCOLORLIST::iterator it;
- for (it = tileColorPalette->begin();it != tileColorPalette->end(); it++)
- delete *it; // the RS_Color is on the heap and needs destruction
+ //RSCOLORS::iterator it;
+ //for (it = tileColorPalette->begin();it != tileColorPalette->end(); it++)
+ // delete *it; // the RS_Color is on the heap and needs destruction
delete tileColorPalette;
}
ACE_DEBUG((LM_DEBUG, L"(%t) %w caught in RenderingService ColorPaletteGeneration\n", e.what()));
@@ -997,7 +997,7 @@
/// the map object has a list from all color entries found in the most recent Layerstylization
/// TODO currently they are interpreted as ffffffff 32 bit RGBA string values.
/// adding expresssions and other interpretations could be done here.
-void MgServerRenderingService::ParseColorStrings (PRSCOLORLIST tileColorPalette, MgMap* map)
+void MgServerRenderingService::ParseColorStrings (PRSCOLORS tileColorPalette, MgMap* map)
{
assert(tileColorPalette);
assert(map);
@@ -1015,8 +1015,7 @@
// but it* is in argb order ergo => r=a, g=r, b=g, a=b
MgColor c(*it);
// set the RS_Color(r,g,b,a) assign the crossed over colors
- tileColorPalette->push_back(
- new RS_Color(c.GetGreen(), c.GetBlue(), c.GetAlpha(), c.GetRed()));
+ tileColorPalette->push_back(RS_Color(c.GetGreen(), c.GetBlue(), c.GetAlpha(), c.GetRed()));
}
}
}
Modified: sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.h
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.h 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Services/Rendering/ServerRenderingService.h 2009-09-24 14:12:23 UTC (rev 4261)
@@ -208,7 +208,7 @@
/// the map object has a list from all color entries found in the most recent Layerstylization
/// TODO currently they are interpreted as ffffffff 32 bit RGBA string values.
/// the color Palette passed to the renderer is a std::list<RSColor>
- void ParseColorStrings (PRSCOLORLIST tileColorPalette, MgMap* map);
+ void ParseColorStrings (PRSCOLORS tileColorPalette, MgMap* map);
// member data
Ptr<MgFeatureService> m_svcFeature;
Modified: sandbox/rfc60/MgDev/Server/src/Services/Resource/OpEnumerateResourceDocuments.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Services/Resource/OpEnumerateResourceDocuments.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Services/Resource/OpEnumerateResourceDocuments.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -67,7 +67,7 @@
STRING type;
INT32 properties;
Ptr<MgStringCollection> resources = (MgStringCollection*)m_stream->GetObject();
-
+
m_stream->GetString(type);
m_stream->GetInt32(properties);
Modified: sandbox/rfc60/MgDev/Server/src/Services/Resource/OpMoveResource.cpp
===================================================================
--- sandbox/rfc60/MgDev/Server/src/Services/Resource/OpMoveResource.cpp 2009-09-23 22:25:10 UTC (rev 4260)
+++ sandbox/rfc60/MgDev/Server/src/Services/Resource/OpMoveResource.cpp 2009-09-24 14:12:23 UTC (rev 4261)
@@ -62,7 +62,7 @@
ACE_ASSERT(m_stream != NULL);
- if (3 == m_packet.m_NumArguments || 4 == m_packet.m_NumArguments)
+ if (3 == m_packet.m_NumArguments)
{
Ptr<MgResourceIdentifier> sourceResource =
(MgResourceIdentifier*)m_stream->GetObject();
@@ -70,11 +70,6 @@
(MgResourceIdentifier*)m_stream->GetObject();
bool overwrite;
m_stream->GetBoolean(overwrite);
- bool cascade = false;
- if(4 == m_packet.m_NumArguments)
- {
- m_stream->GetBoolean(cascade);
- }
BeginExecution();
@@ -84,13 +79,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == destResource) ? L"MgResourceIdentifier" : destResource->ToString().c_str());
MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(overwrite);
- MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
- MG_LOG_OPERATION_MESSAGE_ADD_BOOL(cascade);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
Validate();
- m_service->MoveResource(sourceResource, destResource, overwrite, cascade);
+ m_service->MoveResource(sourceResource, destResource, overwrite);
EndExecution();
}
More information about the mapguide-commits
mailing list