[mapguide-commits] r4557 - trunk/MgDev/Server/src/Core

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2010-01-29 17:28:03 -0500 (Fri, 29 Jan 2010)
New Revision: 4557

Modified:
   trunk/MgDev/Server/src/Core/Server.cpp
   trunk/MgDev/Server/src/Core/ServerCore.vcproj
Log:
Fix for trac ticket 1256 - Update MapGuide to turn on global thread locking of FdoIDisposable objects
http://trac.osgeo.org/mapguide/ticket/1256

Notes:
- Add support for FDO RFC 47. http://trac.osgeo.org/fdo/wiki/FDORfc47


Modified: trunk/MgDev/Server/src/Core/Server.cpp
===================================================================
--- trunk/MgDev/Server/src/Core/Server.cpp	2010-01-29 22:17:24 UTC (rev 4556)
+++ trunk/MgDev/Server/src/Core/Server.cpp	2010-01-29 22:28:03 UTC (rev 4557)
@@ -991,6 +991,9 @@
                      __LINE__, __WFILE__, NULL, L"MgFailedToLoadFdoLibrary", NULL);
             }
 
+            // Initialize the FdoIDisposable global thread locking
+            FdoIDisposable::EnableGlobalThreadLocking(true);
+
             // Initialize the FDO Connection Manager
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%t) MgServer::open() - Initializing FDO Connection Manager.\n")));
             MgEventTimer& dataConnectionTimer = m_eventTimerManager.GetEventTimer(MgEventTimer::DataConnectionTimeout);

Modified: trunk/MgDev/Server/src/Core/ServerCore.vcproj
===================================================================
--- trunk/MgDev/Server/src/Core/ServerCore.vcproj	2010-01-29 22:17:24 UTC (rev 4556)
+++ trunk/MgDev/Server/src/Core/ServerCore.vcproj	2010-01-29 22:28:03 UTC (rev 4557)
@@ -64,10 +64,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+				AdditionalDependencies="ACEd.lib xerces-c_2D.lib  FdoCommon.lib"
 				OutputFile="$(OutDir)\mgserver.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib"
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;&quot;..\..\..\Oem\dbxml-2.3.10\lib&quot;;..\..\..\Oem\FDO\lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
 				SubSystem="1"
@@ -144,10 +144,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+				AdditionalDependencies="ACEd.lib xerces-c_2D.lib  FdoCommon.lib"
 				OutputFile="$(OutDir)\mgserver.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64"
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;&quot;..\..\..\Oem\dbxml-2.3.10\lib64&quot;;..\..\..\Oem\FDO\lib64"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
 				SubSystem="1"
@@ -224,10 +224,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib xerces-c_2.lib"
+				AdditionalDependencies="ACE.lib xerces-c_2.lib  FdoCommon.lib"
 				OutputFile="$(OutDir)\mgserver.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib"
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;&quot;..\..\..\Oem\dbxml-2.3.10\lib&quot;;..\..\..\Oem\FDO\lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
 				SubSystem="1"
@@ -306,10 +306,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ACE.lib xerces-c_2.lib"
+				AdditionalDependencies="ACE.lib xerces-c_2.lib  FdoCommon.lib"
 				OutputFile="$(OutDir)\mgserver.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64"
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;&quot;..\..\..\Oem\dbxml-2.3.10\lib64&quot;;..\..\..\Oem\FDO\lib64"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
 				SubSystem="1"