[mapguide-commits] r5338 - in trunk/MgDev: . Common/Foundation
Common/Foundation/System Common/Geometry
Common/MapGuideCommon Common/MdfModel Common/MdfParser
Common/PlatformBase Oem Server/src/Common/Manager
Server/src/Core Server/src/PostBuild
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/Site Server/src/UnitTesting
UnitTest/Common/FoundationTest
UnitTest/Common/FoundationTest/DotNetUnmanagedApi
Web/src/ApacheAgent Web/src/CgiAgent
Web/src/DotNetUnmanagedApi/Foundation
Web/src/DotNetUnmanagedApi/Geometry
Web/src/DotNetUnmanagedApi/MapGuideCommon
Web/src/DotNetUnmanagedApi/PlatformBase
Web/src/DotNetUnmanagedApi/Web Web/src/HttpHandler
Web/src/JavaApi Web/src/MapGuideApi Web/src/PhpApi Web/src/WebApp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Oct 26 19:50:18 EDT 2010
Author: brucedechant
Date: 2010-10-26 16:50:18 -0700 (Tue, 26 Oct 2010)
New Revision: 5338
Modified:
trunk/MgDev/Common/Foundation/Foundation.vcproj
trunk/MgDev/Common/Foundation/Makefile.am
trunk/MgDev/Common/Foundation/System/XmlDefs.h
trunk/MgDev/Common/Foundation/System/XmlUtil.cpp
trunk/MgDev/Common/Geometry/Makefile.am
trunk/MgDev/Common/MapGuideCommon/Makefile.am
trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcproj
trunk/MgDev/Common/MdfModel/MdfModel.vcproj
trunk/MgDev/Common/MdfParser/FSDSAX2Parser.cpp
trunk/MgDev/Common/MdfParser/FSDSAX2Parser.h
trunk/MgDev/Common/MdfParser/Makefile.am
trunk/MgDev/Common/MdfParser/MdfParser.vcproj
trunk/MgDev/Common/MdfParser/SAX2Parser.cpp
trunk/MgDev/Common/MdfParser/SAX2Parser.h
trunk/MgDev/Common/PlatformBase/Makefile.am
trunk/MgDev/Common/PlatformBase/PlatformBase.vcproj
trunk/MgDev/Oem/Makefile.am
trunk/MgDev/Oem/oem.sln
trunk/MgDev/Server/src/Common/Manager/Makefile.am
trunk/MgDev/Server/src/Common/Manager/ServerManager.vcproj
trunk/MgDev/Server/src/Core/Makefile.am
trunk/MgDev/Server/src/Core/ServerCore.vcproj
trunk/MgDev/Server/src/PostBuild/PostBuild.mak
trunk/MgDev/Server/src/Services/Drawing/Makefile.am
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcproj
trunk/MgDev/Server/src/Services/Feature/FilterUtil.h
trunk/MgDev/Server/src/Services/Feature/Makefile.am
trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcproj
trunk/MgDev/Server/src/Services/Kml/Makefile.am
trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcproj
trunk/MgDev/Server/src/Services/Mapping/Makefile.am
trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcproj
trunk/MgDev/Server/src/Services/Rendering/Makefile.am
trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcproj
trunk/MgDev/Server/src/Services/Resource/DbEnvironment.cpp
trunk/MgDev/Server/src/Services/Resource/Makefile.am
trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp
trunk/MgDev/Server/src/Services/Resource/ResourceContainer.cpp
trunk/MgDev/Server/src/Services/Resource/ResourceDefinitionManager.cpp
trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp
trunk/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h
trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp
trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcproj
trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp
trunk/MgDev/Server/src/Services/Site/Makefile.am
trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcproj
trunk/MgDev/Server/src/UnitTesting/Makefile.am
trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcproj
trunk/MgDev/UnitTest/Common/FoundationTest/DotNetUnmanagedApi/DotNetUnmanagedApi.vcproj
trunk/MgDev/UnitTest/Common/FoundationTest/FoundationTest.vcproj
trunk/MgDev/Web/src/ApacheAgent/Makefile.am
trunk/MgDev/Web/src/CgiAgent/Makefile.am
trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcproj
trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj
trunk/MgDev/Web/src/HttpHandler/Makefile.am
trunk/MgDev/Web/src/JavaApi/JavaApi.vcproj
trunk/MgDev/Web/src/JavaApi/Makefile.am
trunk/MgDev/Web/src/MapGuideApi/copydlls.bat
trunk/MgDev/Web/src/PhpApi/Makefile.am
trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj
trunk/MgDev/Web/src/WebApp/Makefile.am
trunk/MgDev/Web/src/WebApp/WebApp.vcproj
trunk/MgDev/build_oem.sh
Log:
Fix for trac ticket 1398 - Upgrade to DbXml 2.5.16
Fix for trac ticket 1398 - Upgrade to Xerces 3.1.0
http://trac.osgeo.org/mapguide/ticket/1398
http://trac.osgeo.org/mapguide/ticket/1399
Implement RFC 101 - Xerces Upgrade
http://trac.osgeo.org/mapguide/wiki/MapGuideRfc101
Implement RFC 102 - DBXML and Xqilla Upgrade
http://trac.osgeo.org/mapguide/wiki/MapGuideRfc102
Notes:
- Update Server and Web to use NEW DBXML
* This is submission part 3.
Modified: trunk/MgDev/Common/Foundation/Foundation.vcproj
===================================================================
--- trunk/MgDev/Common/Foundation/Foundation.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/Foundation/Foundation.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgFoundationd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgFoundationd.pdb"
SubSystem="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS;__LITTLE_ENDIAN__"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -143,10 +143,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgFoundationd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgFoundationd.pdb"
SubSystem="2"
@@ -200,7 +200,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -218,10 +218,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgFoundation.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgFoundation.pdb"
SubSystem="2"
@@ -279,7 +279,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS;__LITTLE_ENDIAN__"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -297,10 +297,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgFoundation.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgFoundation.pdb"
SubSystem="2"
Modified: trunk/MgDev/Common/Foundation/Makefile.am
===================================================================
--- trunk/MgDev/Common/Foundation/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/Foundation/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -231,7 +231,7 @@
-I../Security \
-I../MdfModel \
-I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/dbxml-2.3.10/xerces-c-src/src
+ -I../../Oem/dbxml/xerces-c-src/src
libMgFoundation_la_LIBADD = \
-lACE \
@@ -241,6 +241,6 @@
libMgFoundation_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../Oem/ACE/ACE_wrappers/ace \
- -L../../Oem/dbxml-2.3.10/install/lib \
+ -L../../Oem/dbxml/install/lib \
-L../MdfParser \
-L../MdfModel
Modified: trunk/MgDev/Common/Foundation/System/XmlDefs.h
===================================================================
--- trunk/MgDev/Common/Foundation/System/XmlDefs.h 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/Foundation/System/XmlDefs.h 2010-10-26 23:50:18 UTC (rev 5338)
@@ -30,13 +30,16 @@
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <xercesc/framework/MemBufFormatTarget.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/dom/DOMLSSerializer.hpp>
+#include <xercesc/dom/DOMConfiguration.hpp>
+#include <xercesc/dom/DOMLSOutput.hpp>
+#include <xercesc/framework/XMLFormatter.hpp>
#pragma warning(pop)
Modified: trunk/MgDev/Common/Foundation/System/XmlUtil.cpp
===================================================================
--- trunk/MgDev/Common/Foundation/System/XmlUtil.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/Foundation/System/XmlUtil.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -723,8 +723,10 @@
MgByte* MgXmlUtil::ToBytes()
{
Ptr<MgByte> bytes;
- DOMWriter* theSerializer = NULL;
- MemBufFormatTarget* memTarget = NULL;
+ DOMLSSerializer* theSerializer = NULL;
+ DOMLSOutput* theOutputDesc = NULL;
+ DOMConfiguration* theDC = NULL;
+ XMLFormatTarget* memTarget = NULL;
MG_XML_TRY()
@@ -737,32 +739,37 @@
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
CHECKNULL(impl, L"MgXmlUtil.ToBytes");
- theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+ theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+ theOutputDesc = ((DOMImplementationLS*)impl)->createLSOutput();
CHECKNULL(theSerializer, L"MgXmlUtil.ToBytes");
+ CHECKNULL(theOutputDesc, L"MgXmlUtil.ToBytes");
+ theDC = theSerializer->getDomConfig();
// set user specified output encoding
XMLCh encodeStr[100];
XMLString::transcode("UTF-8", encodeStr, 99);
- theSerializer->setEncoding(encodeStr);
+ theOutputDesc->setEncoding(encodeStr);
// set feature if the serializer supports the feature/mode
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections))
- theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections);
+ if (theDC->canSetParameter(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections))
+ theDC->setParameter(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent);
+ if (theDC->canSetParameter(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent))
+ theDC->setParameter(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint);
+ if (theDC->canSetParameter(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint))
+ theDC->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, gWriteBOM))
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, gWriteBOM);
+ if (theDC->canSetParameter(XMLUni::fgDOMWRTBOM, gWriteBOM))
+ theDC->setParameter(XMLUni::fgDOMWRTBOM, gWriteBOM);
memTarget = new MemBufFormatTarget();
- theSerializer->writeNode(memTarget, *m_doc);
+ theOutputDesc->setByteStream(memTarget);
- INT32 bytesLen = (INT32)memTarget->getLen();
- BYTE_ARRAY_IN rawBytes = (BYTE_ARRAY_IN)(memTarget->getRawBuffer());
+ theSerializer->write(m_doc, theOutputDesc);
+
+ INT32 bytesLen = (INT32)((MemBufFormatTarget*)memTarget)->getLen();
+ BYTE_ARRAY_IN rawBytes = (BYTE_ARRAY_IN)((MemBufFormatTarget*)memTarget)->getRawBuffer();
bytes->Append(rawBytes, bytesLen);
MG_XML_CATCH(L"MgXmlUtil.ToBytes")
Modified: trunk/MgDev/Common/Geometry/Makefile.am
===================================================================
--- trunk/MgDev/Common/Geometry/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/Geometry/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -439,7 +439,7 @@
-I../Geometry \
-I../../Oem/ACE/ACE_wrappers \
-I../../Oem/geos-2.2.0/source/headers \
- -I../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../Oem/dbxml/xerces-c-src/src \
-I../../Oem/CsMap/Include \
-I../../Common/CoordinateSystem
Modified: trunk/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MapGuideCommon/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -262,7 +262,7 @@
-I../Geometry \
-I../../Oem/ACE/ACE_wrappers \
-I../../Oem/geos-2.2.0/source/headers \
- -I../../Oem/dbxml-2.3.10/xerces-c-src/src
+ -I../../Oem/dbxml/xerces-c-src/src
libMgMapGuideCommon_la_LIBADD = \
-lACE \
Modified: trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcproj
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -198,7 +198,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
@@ -275,7 +275,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
Modified: trunk/MgDev/Common/MdfModel/MdfModel.vcproj
===================================================================
--- trunk/MgDev/Common/MdfModel/MdfModel.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfModel/MdfModel.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="$(USRCFLAGS)"
Optimization="0"
- AdditionalIncludeDirectories=""..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories=""..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="$(USRCFLAGS)"
Optimization="0"
- AdditionalIncludeDirectories=""..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories=""..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -203,7 +203,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories=""..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories=""..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
ExceptionHandling="2"
@@ -285,7 +285,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories=""..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories=""..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
ExceptionHandling="2"
Modified: trunk/MgDev/Common/MdfParser/FSDSAX2Parser.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/FSDSAX2Parser.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfParser/FSDSAX2Parser.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -204,7 +204,7 @@
const XMLCh* const qname,
const Attributes& attributes)
{
- std::wstring str = X2W(localname);
+ std::wstring str = X2W(qname);
m_strbuffer = L""; // discard any text between start tags
m_tagOpen = true;
@@ -237,7 +237,7 @@
void FSDSAX2Parser::characters(const XMLCh* const chars,
- const unsigned int length)
+ const XMLSize_t length)
{
// The character data may be split into multiple calls, so just store it for now.
// Also, do not record text outside of start/end tags
@@ -260,7 +260,7 @@
m_strbuffer = L"";
}
- (m_handlerStack->top())->EndElement(X2W(localname), m_handlerStack);
+ (m_handlerStack->top())->EndElement(X2W(qname), m_handlerStack);
}
}
Modified: trunk/MgDev/Common/MdfParser/FSDSAX2Parser.h
===================================================================
--- trunk/MgDev/Common/MdfParser/FSDSAX2Parser.h 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfParser/FSDSAX2Parser.h 2010-10-26 23:50:18 UTC (rev 5338)
@@ -89,7 +89,7 @@
const XMLCh* const qname);
// Occurs when characters in between XML tags are encountered.
- void characters(const XMLCh* const chars, const unsigned int length);
+ void characters(const XMLCh* const chars, const XMLSize_t length);
// get error info
const MdfString& GetErrorMessage();
Modified: trunk/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- trunk/MgDev/Common/MdfParser/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfParser/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -4,7 +4,7 @@
INCLUDES = \
-I../MdfModel/ \
- -I../../Oem/dbxml-2.3.10/xerces-c-src/src/
+ -I../../Oem/dbxml/xerces-c-src/src/
lib_LTLIBRARIES = libMgMdfParser.la
@@ -216,4 +216,4 @@
libMgMdfParser_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../MdfModel \
- -L../../Oem/dbxml-2.3.10/install/lib
+ -L../../Oem/dbxml/install/lib
Modified: trunk/MgDev/Common/MdfParser/MdfParser.vcproj
===================================================================
--- trunk/MgDev/Common/MdfParser/MdfParser.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfParser/MdfParser.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -65,10 +65,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2D.lib"
+ AdditionalDependencies="xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgMdfParserd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgMdfParserd.pdb"
SubSystem="2"
@@ -124,7 +124,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -146,10 +146,10 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
- AdditionalDependencies="xerces-c_2D.lib"
+ AdditionalDependencies="xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgMdfParserd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgMdfParserd.pdb"
SubSystem="2"
@@ -203,7 +203,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -221,10 +221,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib"
+ AdditionalDependencies="xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgMdfParser.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgMdfParser.pdb"
SubSystem="2"
@@ -282,7 +282,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -300,10 +300,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="xerces-c_2.lib"
+ AdditionalDependencies="xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgMdfParser.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgMdfParser.pdb"
SubSystem="2"
Modified: trunk/MgDev/Common/MdfParser/SAX2Parser.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/SAX2Parser.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfParser/SAX2Parser.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -506,7 +506,7 @@
const XMLCh* const qname,
const Attributes& attributes)
{
- std::wstring str = X2W(localname);
+ std::wstring str = X2W(qname);
m_strbuffer = L""; // discard any text between start tags
m_tagOpen = true;
@@ -625,7 +625,7 @@
void SAX2Parser::characters(const XMLCh* const chars,
- const unsigned int length)
+ const XMLSize_t length)
{
// The character data may be split into multiple calls, so just store it for now.
// Also, do not record text outside of start/end tags
@@ -648,7 +648,7 @@
m_strbuffer = L"";
}
- (m_handlerStack->top())->EndElement(X2W(localname), m_handlerStack);
+ (m_handlerStack->top())->EndElement(X2W(qname), m_handlerStack);
}
}
Modified: trunk/MgDev/Common/MdfParser/SAX2Parser.h
===================================================================
--- trunk/MgDev/Common/MdfParser/SAX2Parser.h 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/MdfParser/SAX2Parser.h 2010-10-26 23:50:18 UTC (rev 5338)
@@ -41,6 +41,8 @@
#include <xercesc/framework/XMLFormatter.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
+
#pragma warning(pop)
#include "IOUtil.h"
@@ -133,7 +135,7 @@
const XMLCh* const qname);
// Occurs when characters in between XML tags are encountered.
- void characters(const XMLCh* const chars, const unsigned int length);
+ void characters(const XMLCh* const chars, const XMLSize_t length);
// Get error info
const MdfString& GetErrorMessage();
Modified: trunk/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- trunk/MgDev/Common/PlatformBase/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/PlatformBase/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -251,7 +251,7 @@
-I../Geometry \
-I../../Oem/ACE/ACE_wrappers \
-I../../Oem/geos-2.2.0/source/headers \
- -I../../Oem/dbxml-2.3.10/xerces-c-src/src
+ -I../../Oem/dbxml/xerces-c-src/src
libMgPlatformBase_la_LIBADD = \
-lACE \
Modified: trunk/MgDev/Common/PlatformBase/PlatformBase.vcproj
===================================================================
--- trunk/MgDev/Common/PlatformBase/PlatformBase.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Common/PlatformBase/PlatformBase.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -196,7 +196,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
@@ -273,7 +273,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;"..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
Modified: trunk/MgDev/Oem/Makefile.am
===================================================================
--- trunk/MgDev/Oem/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Oem/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -3,7 +3,7 @@
SUBDIRS = $(map_opt_oem_subdirs)
DIST_SUBDIRS =
-EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14 dbxml-2.3.10 DWFTK7.1 FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
+EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14 dbxml DWFTK7.1 FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
dist-hook:
@@ -12,11 +12,11 @@
@mkdir -p ${prefix}/lib
@cp -fp ACE/ACE_wrappers/ace/*.so ${prefix}/lib
@cp -fp jsoncpp/lib/*.so ${prefix}/lib
- @cp -fpd dbxml-2.3.10/install/lib/libxerces-c*.so* ${prefix}/lib
- @cp -fpd dbxml-2.3.10/install/lib/libxqilla*.so* ${prefix}/lib
- @cp -fpd dbxml-2.3.10/install/lib/libdb-*.so* ${prefix}/lib
- @cp -fpd dbxml-2.3.10/install/lib/libdb_cxx*.so* ${prefix}/lib
- @cp -fpd dbxml-2.3.10/install/lib/libdbxml*.so* ${prefix}/lib
+ @cp -fpd dbxml/install/lib/libxerces-c*.so* ${prefix}/lib
+ @cp -fpd dbxml/install/lib/libxqilla*.so* ${prefix}/lib
+ @cp -fpd dbxml/install/lib/libdb-*.so* ${prefix}/lib
+ @cp -fpd dbxml/install/lib/libdb_cxx*.so* ${prefix}/lib
+ @cp -fpd dbxml/install/lib/libdbxml*.so* ${prefix}/lib
@cp -fp DWFTK7.1/develop/global/src/dwfcore/.libs/libdwfcore-* ${prefix}/lib
@cp -fpd DWFTK7.1/develop/global/src/dwfcore/.libs/libdwfcore ${prefix}/lib
@cp -fp DWFTK7.1/develop/global/src/dwfemap/.libs/libdwfemap-* ${prefix}/lib
Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Oem/oem.sln 2010-10-26 23:50:18 UTC (rev 5338)
@@ -2,77 +2,87 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE\ACE_wrappers\ace\ACE.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6363336A1C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_dll", "dbxml-2.3.10\db-4.5.20\build_windows\db_dll.vcproj", "{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_dll", "dbxml\db-4.8.26\build_windows\db_dll.vcproj", "{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_archive", "dbxml-2.3.10\db-4.5.20\build_windows\db_archive.vcproj", "{B0FC8830-2351-49D0-9597-8E4F87D4B24D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_archive", "dbxml\db-4.8.26\build_windows\db_archive.vcproj", "{56056344-53A1-4FA6-B20B-862C0BA68953}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_checkpoint", "dbxml-2.3.10\db-4.5.20\build_windows\db_checkpoint.vcproj", "{F86F7B59-89AC-453E-9D6E-E234378A7A1E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_checkpoint", "dbxml\db-4.8.26\build_windows\db_checkpoint.vcproj", "{A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_dump", "dbxml-2.3.10\db-4.5.20\build_windows\db_dump.vcproj", "{BEE15649-99E6-4026-8833-5D31E5C41688}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_dump", "dbxml\db-4.8.26\build_windows\db_dump.vcproj", "{DB067D2C-7163-428B-AAF8-642316AB173B}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_hotbackup", "dbxml-2.3.10\db-4.5.20\build_windows\db_hotbackup.vcproj", "{4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_hotbackup", "dbxml\db-4.8.26\build_windows\db_hotbackup.vcproj", "{67C0DABC-353A-491F-9A77-8E2E601ED52B}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_load", "dbxml-2.3.10\db-4.5.20\build_windows\db_load.vcproj", "{A10AE3D9-E792-48A8-9E12-D24B44ED88C1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_load", "dbxml\db-4.8.26\build_windows\db_load.vcproj", "{7640133F-4AB8-42DA-ADB5-95F21447F7D5}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_recover", "dbxml-2.3.10\db-4.5.20\build_windows\db_recover.vcproj", "{4C72FF98-6FEE-4915-8B4C-D9991B63971D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_recover", "dbxml\db-4.8.26\build_windows\db_recover.vcproj", "{9E03FD51-E387-4EEF-9EEA-E71707A56212}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_upgrade", "dbxml-2.3.10\db-4.5.20\build_windows\db_upgrade.vcproj", "{3DF436E4-69B8-40C2-88B6-C20242E9FD39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_upgrade", "dbxml\db-4.8.26\build_windows\db_upgrade.vcproj", "{5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_verify", "dbxml-2.3.10\db-4.5.20\build_windows\db_verify.vcproj", "{D7C355CB-518B-4B77-BB7B-918331E24DFB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_verify", "dbxml\db-4.8.26\build_windows\db_verify.vcproj", "{12E118CA-CAAE-4F54-AE81-8D9981AA0635}"
ProjectSection(ProjectDependencies) = postProject
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XercesLib", "dbxml-2.3.10\xerces-c-src\Projects\Win32\VC7.1\xerces-all\XercesLib\XercesLib.vcproj", "{152CE948-F659-4206-A50A-1D2B9658EF96}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XercesLib", "dbxml\xerces-c-src\Projects\Win32\VC9\xerces-all\XercesLib\XercesLib.vcproj", "{152CE948-F659-4206-A50A-1D2B9658EF96}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xqilla", "dbxml-2.3.10\xqilla\Win32Projects\VC7.1\xqilla.vcproj", "{5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xqilla", "dbxml\xqilla\Win32Projects\VC8\xqilla.vcproj", "{63E85107-41E0-4FC7-8083-40E85861B426}"
ProjectSection(ProjectDependencies) = postProject
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml", "dbxml-2.3.10\dbxml\build_windows\dbxml.vcproj", "{0047EDFC-C26D-49D0-9559-029FA38B3839}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml", "dbxml\dbxml\build_windows\dbxml.vcproj", "{0047EDFC-C26D-49D0-9559-029FA38B3839}"
ProjectSection(ProjectDependencies) = postProject
+ {63E85107-41E0-4FC7-8083-40E85861B426} = {63E85107-41E0-4FC7-8083-40E85861B426}
+ {DB067D2C-7163-428B-AAF8-642316AB173B} = {DB067D2C-7163-428B-AAF8-642316AB173B}
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5} = {7640133F-4AB8-42DA-ADB5-95F21447F7D5}
+ {56056344-53A1-4FA6-B20B-862C0BA68953} = {56056344-53A1-4FA6-B20B-862C0BA68953}
+ {152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212} = {9E03FD51-E387-4EEF-9EEA-E71707A56212}
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285} = {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}
+ {3CECB989-0B34-449D-9161-8BEE074D7EC0} = {3CECB989-0B34-449D-9161-8BEE074D7EC0}
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B} = {67C0DABC-353A-491F-9A77-8E2E601ED52B}
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635} = {12E118CA-CAAE-4F54-AE81-8D9981AA0635}
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F} = {8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7} = {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}
- {152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F} = {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml_dump", "dbxml-2.3.10\dbxml\build_windows\dbxml_dump.vcproj", "{8C7F9554-3D33-46C1-BAF3-C40422940DF3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml_dump", "dbxml\dbxml\build_windows\dbxml_dump.vcproj", "{3D50C9C1-88B9-4323-B656-97E1F9C1376B}"
ProjectSection(ProjectDependencies) = postProject
{0047EDFC-C26D-49D0-9559-029FA38B3839} = {0047EDFC-C26D-49D0-9559-029FA38B3839}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml_load", "dbxml-2.3.10\dbxml\build_windows\dbxml_load.vcproj", "{F6F043AA-C30D-4A03-8958-5C2035554219}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml_load", "dbxml\dbxml\build_windows\dbxml_load.vcproj", "{63F00D08-A8E1-4506-BFB9-3149AAA90C13}"
ProjectSection(ProjectDependencies) = postProject
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3} = {8C7F9554-3D33-46C1-BAF3-C40422940DF3}
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B} = {3D50C9C1-88B9-4323-B656-97E1F9C1376B}
{0047EDFC-C26D-49D0-9559-029FA38B3839} = {0047EDFC-C26D-49D0-9559-029FA38B3839}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml_shell", "dbxml-2.3.10\dbxml\build_windows\dbxml_shell.vcproj", "{E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbxml_shell", "dbxml\dbxml\build_windows\dbxml_shell.vcproj", "{DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}"
ProjectSection(ProjectDependencies) = postProject
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13} = {63F00D08-A8E1-4506-BFB9-3149AAA90C13}
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B} = {3D50C9C1-88B9-4323-B656-97E1F9C1376B}
{0047EDFC-C26D-49D0-9559-029FA38B3839} = {0047EDFC-C26D-49D0-9559-029FA38B3839}
- {F6F043AA-C30D-4A03-8958-5C2035554219} = {F6F043AA-C30D-4A03-8958-5C2035554219}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWFCore", "DWFTK7.1\develop\global\build\VC 8.0\DWFCore\DWFCore.vcproj", "{8BECE007-1749-4300-87D8-267B613AAE6B}"
@@ -99,9 +109,9 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "gd\build\win32\gd\gd.vcproj", "{F2B9F79A-57CC-4864-B537-EFC98E1C5E95}"
ProjectSection(ProjectDependencies) = postProject
{AB3DAD75-F5C9-4DA6-9773-9B659E97274C} = {AB3DAD75-F5C9-4DA6-9773-9B659E97274C}
+ {3CECB989-0B34-449D-9161-8BEE074D7EC0} = {3CECB989-0B34-449D-9161-8BEE074D7EC0}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
{D8925FEC-07A3-4E8A-90DC-8DC2CB9A342E} = {D8925FEC-07A3-4E8A-90DC-8DC2CB9A342E}
- {3CECB989-0B34-449D-9161-8BEE074D7EC0} = {3CECB989-0B34-449D-9161-8BEE074D7EC0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GEOS", "geos-2.2.0\VisualStudio\GEOS.vcproj", "{1B9196BF-C194-47BC-846A-D9BBB134F2B3}"
@@ -112,8 +122,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SqliteDotNet", "SQLite\src\SqliteDotNet\SqliteDotNet.vcproj", "{82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}"
ProjectSection(ProjectDependencies) = postProject
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005} = {6BE4F878-73F2-42F7-B77F-4974DCF8B005}
{BE0B498C-2C41-46E9-82B7-697FDD3F68E3} = {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005} = {6BE4F878-73F2-42F7-B77F-4974DCF8B005}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteGUI", "SQLite\src\SqliteGUI\SqliteGUI.csproj", "{5CB5F2F4-D9B5-4E3E-B758-240E6E5D156A}"
@@ -123,16 +133,16 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLitePhpApi", "SQLite\src\SQLitePhpApi\SQLitePhpApi.vcproj", "{7E6F7F0D-0045-47B9-868C-E31C04FAE81F}"
ProjectSection(ProjectDependencies) = postProject
+ {6BE4F878-73F2-42F7-B77F-4974DCF8B005} = {6BE4F878-73F2-42F7-B77F-4974DCF8B005}
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3} = {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}
{BD537C9A-FECA-1BAD-6757-8A6363336A1C} = {BD537C9A-FECA-1BAD-6757-8A6363336A1C}
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3} = {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}
- {6BE4F878-73F2-42F7-B77F-4974DCF8B005} = {6BE4F878-73F2-42F7-B77F-4974DCF8B005}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLiteUnitTest", "SQLite\src\SQLiteUnitTest\SQLiteUnitTest.vcproj", "{CC1C1060-E94B-46BC-886B-4997C384F346}"
ProjectSection(ProjectDependencies) = postProject
+ {BE0B498C-2C41-46E9-82B7-697FDD3F68E3} = {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}
+ {BD537C9A-FECA-1BAD-6757-8A6363336A1C} = {BD537C9A-FECA-1BAD-6757-8A6363336A1C}
{AA0817E7-095C-465C-90B3-9221DE17EC70} = {AA0817E7-095C-465C-90B3-9221DE17EC70}
- {BD537C9A-FECA-1BAD-6757-8A6363336A1C} = {BD537C9A-FECA-1BAD-6757-8A6363336A1C}
- {BE0B498C-2C41-46E9-82B7-697FDD3F68E3} = {BE0B498C-2C41-46E9-82B7-697FDD3F68E3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqliteVM", "SQLite\src\SqliteVM\sqliteVM.vcproj", "{BE0B498C-2C41-46E9-82B7-697FDD3F68E3}"
@@ -166,70 +176,70 @@
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}.Release|Win32.Build.0 = Release|Win32
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}.Release|x64.ActiveCfg = Release|x64
{8CD9E7D3-0D04-40E1-8C15-CA211AB76D1F}.Release|x64.Build.0 = Release|x64
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Debug|Win32.ActiveCfg = Debug|Win32
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Debug|Win32.Build.0 = Debug|Win32
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Debug|x64.ActiveCfg = Debug|x64
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Debug|x64.Build.0 = Debug|x64
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Release|Win32.ActiveCfg = Release|Win32
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Release|Win32.Build.0 = Release|Win32
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Release|x64.ActiveCfg = Release|x64
- {B0FC8830-2351-49D0-9597-8E4F87D4B24D}.Release|x64.Build.0 = Release|x64
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Debug|Win32.ActiveCfg = Debug|Win32
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Debug|Win32.Build.0 = Debug|Win32
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Debug|x64.ActiveCfg = Debug|x64
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Debug|x64.Build.0 = Debug|x64
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Release|Win32.ActiveCfg = Release|Win32
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Release|Win32.Build.0 = Release|Win32
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Release|x64.ActiveCfg = Release|x64
- {F86F7B59-89AC-453E-9D6E-E234378A7A1E}.Release|x64.Build.0 = Release|x64
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Debug|Win32.ActiveCfg = Debug|Win32
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Debug|Win32.Build.0 = Debug|Win32
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Debug|x64.ActiveCfg = Debug|x64
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Debug|x64.Build.0 = Debug|x64
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Release|Win32.ActiveCfg = Release|Win32
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Release|Win32.Build.0 = Release|Win32
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Release|x64.ActiveCfg = Release|x64
- {BEE15649-99E6-4026-8833-5D31E5C41688}.Release|x64.Build.0 = Release|x64
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Debug|Win32.ActiveCfg = Debug|Win32
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Debug|Win32.Build.0 = Debug|Win32
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Debug|x64.ActiveCfg = Debug|x64
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Debug|x64.Build.0 = Debug|x64
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Release|Win32.ActiveCfg = Release|Win32
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Release|Win32.Build.0 = Release|Win32
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Release|x64.ActiveCfg = Release|x64
- {4E6DAB30-ED73-4B4B-918A-DACEB1CE3F43}.Release|x64.Build.0 = Release|x64
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Debug|Win32.ActiveCfg = Debug|Win32
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Debug|Win32.Build.0 = Debug|Win32
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Debug|x64.ActiveCfg = Debug|x64
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Debug|x64.Build.0 = Debug|x64
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Release|Win32.ActiveCfg = Release|Win32
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Release|Win32.Build.0 = Release|Win32
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Release|x64.ActiveCfg = Release|x64
- {A10AE3D9-E792-48A8-9E12-D24B44ED88C1}.Release|x64.Build.0 = Release|x64
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Debug|Win32.ActiveCfg = Debug|Win32
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Debug|Win32.Build.0 = Debug|Win32
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Debug|x64.ActiveCfg = Debug|x64
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Debug|x64.Build.0 = Debug|x64
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Release|Win32.ActiveCfg = Release|Win32
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Release|Win32.Build.0 = Release|Win32
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Release|x64.ActiveCfg = Release|x64
- {4C72FF98-6FEE-4915-8B4C-D9991B63971D}.Release|x64.Build.0 = Release|x64
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Debug|Win32.ActiveCfg = Debug|Win32
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Debug|Win32.Build.0 = Debug|Win32
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Debug|x64.ActiveCfg = Debug|x64
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Debug|x64.Build.0 = Debug|x64
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Release|Win32.ActiveCfg = Release|Win32
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Release|Win32.Build.0 = Release|Win32
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Release|x64.ActiveCfg = Release|x64
- {3DF436E4-69B8-40C2-88B6-C20242E9FD39}.Release|x64.Build.0 = Release|x64
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Debug|Win32.ActiveCfg = Debug|Win32
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Debug|Win32.Build.0 = Debug|Win32
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Debug|x64.ActiveCfg = Debug|x64
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Debug|x64.Build.0 = Debug|x64
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Release|Win32.ActiveCfg = Release|Win32
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Release|Win32.Build.0 = Release|Win32
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Release|x64.ActiveCfg = Release|x64
- {D7C355CB-518B-4B77-BB7B-918331E24DFB}.Release|x64.Build.0 = Release|x64
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Debug|Win32.ActiveCfg = Debug|Win32
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Debug|Win32.Build.0 = Debug|Win32
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Debug|x64.ActiveCfg = Debug|x64
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Debug|x64.Build.0 = Debug|x64
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Release|Win32.ActiveCfg = Release|Win32
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Release|Win32.Build.0 = Release|Win32
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Release|x64.ActiveCfg = Release|x64
+ {56056344-53A1-4FA6-B20B-862C0BA68953}.Release|x64.Build.0 = Release|x64
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Debug|Win32.Build.0 = Debug|Win32
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Debug|x64.ActiveCfg = Debug|x64
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Debug|x64.Build.0 = Debug|x64
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Release|Win32.ActiveCfg = Release|Win32
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Release|Win32.Build.0 = Release|Win32
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Release|x64.ActiveCfg = Release|x64
+ {A3BE0163-1E6C-4235-9B6B-3A36ABB5E285}.Release|x64.Build.0 = Release|x64
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Debug|Win32.Build.0 = Debug|Win32
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Debug|x64.ActiveCfg = Debug|x64
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Debug|x64.Build.0 = Debug|x64
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Release|Win32.ActiveCfg = Release|Win32
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Release|Win32.Build.0 = Release|Win32
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Release|x64.ActiveCfg = Release|x64
+ {DB067D2C-7163-428B-AAF8-642316AB173B}.Release|x64.Build.0 = Release|x64
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Debug|Win32.Build.0 = Debug|Win32
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Debug|x64.ActiveCfg = Debug|x64
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Debug|x64.Build.0 = Debug|x64
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Release|Win32.ActiveCfg = Release|Win32
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Release|Win32.Build.0 = Release|Win32
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Release|x64.ActiveCfg = Release|x64
+ {67C0DABC-353A-491F-9A77-8E2E601ED52B}.Release|x64.Build.0 = Release|x64
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Debug|Win32.Build.0 = Debug|Win32
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Debug|x64.ActiveCfg = Debug|x64
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Debug|x64.Build.0 = Debug|x64
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Release|Win32.ActiveCfg = Release|Win32
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Release|Win32.Build.0 = Release|Win32
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Release|x64.ActiveCfg = Release|x64
+ {7640133F-4AB8-42DA-ADB5-95F21447F7D5}.Release|x64.Build.0 = Release|x64
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Debug|Win32.Build.0 = Debug|Win32
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Debug|x64.ActiveCfg = Debug|x64
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Debug|x64.Build.0 = Debug|x64
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Release|Win32.ActiveCfg = Release|Win32
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Release|Win32.Build.0 = Release|Win32
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Release|x64.ActiveCfg = Release|x64
+ {9E03FD51-E387-4EEF-9EEA-E71707A56212}.Release|x64.Build.0 = Release|x64
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Debug|Win32.Build.0 = Debug|Win32
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Debug|x64.ActiveCfg = Debug|x64
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Debug|x64.Build.0 = Debug|x64
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Release|Win32.ActiveCfg = Release|Win32
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Release|Win32.Build.0 = Release|Win32
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Release|x64.ActiveCfg = Release|x64
+ {5F4D66DB-8D75-43D4-A1BB-60A01BC6B32F}.Release|x64.Build.0 = Release|x64
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Debug|Win32.ActiveCfg = Debug|Win32
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Debug|Win32.Build.0 = Debug|Win32
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Debug|x64.ActiveCfg = Debug|x64
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Debug|x64.Build.0 = Debug|x64
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Release|Win32.ActiveCfg = Release|Win32
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Release|Win32.Build.0 = Release|Win32
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Release|x64.ActiveCfg = Release|x64
+ {12E118CA-CAAE-4F54-AE81-8D9981AA0635}.Release|x64.Build.0 = Release|x64
{152CE948-F659-4206-A50A-1D2B9658EF96}.Debug|Win32.ActiveCfg = Debug|Win32
{152CE948-F659-4206-A50A-1D2B9658EF96}.Debug|Win32.Build.0 = Debug|Win32
{152CE948-F659-4206-A50A-1D2B9658EF96}.Debug|x64.ActiveCfg = Debug|x64
@@ -238,14 +248,14 @@
{152CE948-F659-4206-A50A-1D2B9658EF96}.Release|Win32.Build.0 = Release|Win32
{152CE948-F659-4206-A50A-1D2B9658EF96}.Release|x64.ActiveCfg = Release|x64
{152CE948-F659-4206-A50A-1D2B9658EF96}.Release|x64.Build.0 = Release|x64
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Debug|Win32.ActiveCfg = Debug|Win32
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Debug|Win32.Build.0 = Debug|Win32
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Debug|x64.ActiveCfg = Debug|x64
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Debug|x64.Build.0 = Debug|x64
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Release|Win32.ActiveCfg = Release|Win32
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Release|Win32.Build.0 = Release|Win32
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Release|x64.ActiveCfg = Release|x64
- {5CB07CC1-BC18-476B-A8E5-12CF95C08EC7}.Release|x64.Build.0 = Release|x64
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Debug|Win32.ActiveCfg = Debug|Win32
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Debug|Win32.Build.0 = Debug|Win32
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Debug|x64.ActiveCfg = Debug|x64
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Debug|x64.Build.0 = Debug|x64
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Release|Win32.ActiveCfg = Release|Win32
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Release|Win32.Build.0 = Release|Win32
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Release|x64.ActiveCfg = Release|x64
+ {63E85107-41E0-4FC7-8083-40E85861B426}.Release|x64.Build.0 = Release|x64
{0047EDFC-C26D-49D0-9559-029FA38B3839}.Debug|Win32.ActiveCfg = Debug|Win32
{0047EDFC-C26D-49D0-9559-029FA38B3839}.Debug|Win32.Build.0 = Debug|Win32
{0047EDFC-C26D-49D0-9559-029FA38B3839}.Debug|x64.ActiveCfg = Debug|x64
@@ -254,30 +264,30 @@
{0047EDFC-C26D-49D0-9559-029FA38B3839}.Release|Win32.Build.0 = Release|Win32
{0047EDFC-C26D-49D0-9559-029FA38B3839}.Release|x64.ActiveCfg = Release|x64
{0047EDFC-C26D-49D0-9559-029FA38B3839}.Release|x64.Build.0 = Release|x64
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Debug|Win32.ActiveCfg = Debug|Win32
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Debug|Win32.Build.0 = Debug|Win32
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Debug|x64.ActiveCfg = Debug|x64
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Debug|x64.Build.0 = Debug|x64
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Release|Win32.ActiveCfg = Release|Win32
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Release|Win32.Build.0 = Release|Win32
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Release|x64.ActiveCfg = Release|x64
- {8C7F9554-3D33-46C1-BAF3-C40422940DF3}.Release|x64.Build.0 = Release|x64
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Debug|Win32.ActiveCfg = Debug|Win32
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Debug|Win32.Build.0 = Debug|Win32
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Debug|x64.ActiveCfg = Debug|x64
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Debug|x64.Build.0 = Debug|x64
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Release|Win32.ActiveCfg = Release|Win32
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Release|Win32.Build.0 = Release|Win32
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Release|x64.ActiveCfg = Release|x64
- {F6F043AA-C30D-4A03-8958-5C2035554219}.Release|x64.Build.0 = Release|x64
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Debug|Win32.ActiveCfg = Debug|Win32
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Debug|Win32.Build.0 = Debug|Win32
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Debug|x64.ActiveCfg = Debug|x64
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Debug|x64.Build.0 = Debug|x64
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Release|Win32.ActiveCfg = Release|Win32
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Release|Win32.Build.0 = Release|Win32
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Release|x64.ActiveCfg = Release|x64
- {E7CCC5EA-F0C1-4349-AE5D-F2F2EB16D8CB}.Release|x64.Build.0 = Release|x64
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Debug|Win32.Build.0 = Debug|Win32
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Debug|x64.ActiveCfg = Debug|x64
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Debug|x64.Build.0 = Debug|x64
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Release|Win32.ActiveCfg = Release|Win32
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Release|Win32.Build.0 = Release|Win32
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Release|x64.ActiveCfg = Release|x64
+ {3D50C9C1-88B9-4323-B656-97E1F9C1376B}.Release|x64.Build.0 = Release|x64
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Debug|Win32.ActiveCfg = Debug|Win32
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Debug|Win32.Build.0 = Debug|Win32
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Debug|x64.ActiveCfg = Debug|x64
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Debug|x64.Build.0 = Debug|x64
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Release|Win32.ActiveCfg = Release|Win32
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Release|Win32.Build.0 = Release|Win32
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Release|x64.ActiveCfg = Release|x64
+ {63F00D08-A8E1-4506-BFB9-3149AAA90C13}.Release|x64.Build.0 = Release|x64
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Debug|Win32.Build.0 = Debug|Win32
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Debug|x64.ActiveCfg = Debug|x64
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Debug|x64.Build.0 = Debug|x64
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Release|Win32.ActiveCfg = Release|Win32
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Release|Win32.Build.0 = Release|Win32
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Release|x64.ActiveCfg = Release|x64
+ {DF725DAC-C6F3-4BC1-A1D3-C4745232B05D}.Release|x64.Build.0 = Release|x64
{8BECE007-1749-4300-87D8-267B613AAE6B}.Debug|Win32.ActiveCfg = Debug (Read-Write WChar LIB)|Win32
{8BECE007-1749-4300-87D8-267B613AAE6B}.Debug|Win32.Build.0 = Debug (Read-Write WChar LIB)|Win32
{8BECE007-1749-4300-87D8-267B613AAE6B}.Debug|x64.ActiveCfg = Debug (Read-Write WChar LIB)|x64
Modified: trunk/MgDev/Server/src/Common/Manager/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Common/Manager/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -7,7 +7,7 @@
INCLUDES = \
-I../../../../Oem/ACE/ACE_wrappers \
-I$(map_fdo_include) \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../../../Common \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
Modified: trunk/MgDev/Server/src/Common/Manager/ServerManager.vcproj
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/ServerManager.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Common/Manager/ServerManager.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- 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\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\xerces-c-src\src";..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- 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\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\xerces-c-src\src";..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -206,7 +206,7 @@
<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\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\xerces-c-src\src";..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -286,7 +286,7 @@
<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\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\xerces-c-src\src";..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Server/src/Core/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Core/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Core/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -9,7 +9,7 @@
INCLUDES = \
-I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../Oem/dbxml/xerces-c-src/src \
-I $(map_fdo_include) \
-I $(map_fdo_include)/ExpressionEngine \
-I../Common \
@@ -131,7 +131,7 @@
-R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwfcore \
-R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwf \
-R$(map_srcdir)/Oem/DWFTK7.1/develop/global/src/dwfemap \
- -R$(map_srcdir)/Oem/dbxml-2.3.10/install/lib \
+ -R$(map_srcdir)/Oem/dbxml/install/lib \
-R$(map_srcdir)/Common/CoordinateSystem/.libs \
-R$(map_srcdir)/Common/MdfModel/.libs \
-R$(map_srcdir)/Common/MdfParser/.libs \
@@ -160,7 +160,7 @@
-L../../../Oem/DWFTK7.1/develop/global/src/dwfcore \
-L../../../Oem/DWFTK7.1/develop/global/src/dwf \
-L../../../Oem/DWFTK7.1/develop/global/src/dwfemap \
- -L../../../Oem/dbxml-2.3.10/install/lib \
+ -L../../../Oem/dbxml/install/lib \
-L$(top_builddir)/Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
@@ -367,17 +367,17 @@
cp -f -r $(mentor_dict_source_dir)/* $(mentor_dict_install_dir);)
@cp -fp ../../../Common/Schema/*.xsd $(schemadir)
@cp -fp ../../../Oem/DWFTK7.1/develop/global/fonts/* ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_archive ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_checkpoint ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_dump ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_hotbackup ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_load ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_recover ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_upgrade ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/db_verify ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/dbxml ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/dbxml_dump ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml-2.3.10/install/bin/dbxml_load ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_archive ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_checkpoint ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_dump ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_hotbackup ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_load ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_recover ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_upgrade ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/db_verify ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/dbxml ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/dbxml_dump ${prefix}/bin/
+ @cp -fp ../../../Oem/dbxml/install/bin/dbxml_load ${prefix}/bin/
@cp -fp ../../RepositoryAdmin/*.sh $(repositoryadmindir)
@cp -fp ../../RepositoryAdmin/*.php $(repositoryadmindir)
@cp -fp ../../RepositoryAdmin/*.inc $(repositoryadmindir)
Modified: trunk/MgDev/Server/src/Core/ServerCore.vcproj
===================================================================
--- trunk/MgDev/Server/src/Core/ServerCore.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Core/ServerCore.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDOCommon.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml\lib;..\..\..\Oem\FDO\lib"
DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
@@ -124,7 +124,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -145,10 +145,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDOCommon.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml\lib64;..\..\..\Oem\FDO\lib64"
DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
@@ -206,7 +206,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
StringPooling="true"
ExceptionHandling="2"
@@ -227,10 +227,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FDOCommon.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml\lib;..\..\..\Oem\FDO\lib"
DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
@@ -289,7 +289,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
StringPooling="true"
ExceptionHandling="2"
@@ -310,10 +310,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FDOCommon.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml\lib64;..\..\..\Oem\FDO\lib64"
DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2010-10-26 23:50:18 UTC (rev 5338)
@@ -64,29 +64,29 @@
..\..\bin\debug\GEOSd.pdb : ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.pdb
xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.pdb ..\..\bin\debug\
-..\..\bin\debug\libdb45d.dll : ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdb45d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdb45d.dll ..\..\bin\debug\
+..\..\bin\debug\libdb48d.dll : ..\..\..\Oem\dbxml\bin\debug\libdb48d.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdb48d.dll ..\..\bin\debug\
-..\..\bin\debug\libdb45d.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdb45d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdb45d.pdb ..\..\bin\debug\
+..\..\bin\debug\libdb48d.pdb : ..\..\..\Oem\dbxml\bin\debug\libdb48d.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdb48d.pdb ..\..\bin\debug\
-..\..\bin\debug\libdbxml23d.dll : ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdbxml23d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdbxml23d.dll ..\..\bin\debug\
+..\..\bin\debug\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.dll ..\..\bin\debug\
-..\..\bin\debug\libdbxml23d.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdbxml23d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\libdbxml23d.pdb ..\..\bin\debug\
+..\..\bin\debug\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.pdb ..\..\bin\debug\
-..\..\bin\debug\xqilla10d.dll : ..\..\..\Oem\dbxml-2.3.10\bin\debug\xqilla10d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\xqilla10d.dll ..\..\bin\debug\
+..\..\bin\debug\xqilla24d.dll : ..\..\..\Oem\dbxml\bin\debug\xqilla24d.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xqilla24d.dll ..\..\bin\debug\
-..\..\bin\debug\xqilla10d.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\debug\xqilla10d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\xqilla10d.pdb ..\..\bin\debug\
+..\..\bin\debug\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin\debug\xqilla24d.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xqilla24d.pdb ..\..\bin\debug\
-..\..\bin\debug\xerces-c_2_7D.dll : ..\..\..\Oem\dbxml-2.3.10\bin\debug\xerces-c_2_7D.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\xerces-c_2_7D.dll ..\..\bin\debug\
+..\..\bin\debug\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll ..\..\bin\debug\
-..\..\bin\debug\xerces-c_2_7D.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\debug\xerces-c_2_7D.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\debug\xerces-c_2_7D.pdb ..\..\bin\debug\
+..\..\bin\debug\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.pdb ..\..\bin\debug\
..\..\bin\debug\serverconfig.ini : ..\..\src\Core\serverconfig.ini
xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug\
@@ -148,14 +148,14 @@
..\..\bin\debug\gd.pdb \
..\..\bin\debug\GEOSd.dll \
..\..\bin\debug\GEOSd.pdb \
- ..\..\bin\debug\libdb45d.dll \
- ..\..\bin\debug\libdb45d.pdb \
- ..\..\bin\debug\libdbxml23d.dll \
- ..\..\bin\debug\libdbxml23d.pdb \
- ..\..\bin\debug\xqilla10d.dll \
- ..\..\bin\debug\xqilla10d.pdb \
- ..\..\bin\debug\xerces-c_2_7D.dll \
- ..\..\bin\debug\xerces-c_2_7D.pdb \
+ ..\..\bin\debug\libdb48d.dll \
+ ..\..\bin\debug\libdb48d.pdb \
+ ..\..\bin\debug\libdbxml25d.dll \
+ ..\..\bin\debug\libdbxml25d.pdb \
+ ..\..\bin\debug\xqilla24d.dll \
+ ..\..\bin\debug\xqilla24d.pdb \
+ ..\..\bin\debug\xerces-c_3_1mgD.dll \
+ ..\..\bin\debug\xerces-c_3_1mgD.pdb \
..\..\bin\debug\serverconfig.ini \
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
@@ -315,29 +315,29 @@
..\..\bin\debug64\GEOSd.pdb : ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.pdb
xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.pdb ..\..\bin\debug64\
-..\..\bin\debug64\libdb45d.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdb45d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdb45d.dll ..\..\bin\debug64\
+..\..\bin\debug64\libdb48d.dll : ..\..\..\Oem\dbxml\bin64\debug\libdb48d.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdb48d.dll ..\..\bin\debug64\
-..\..\bin\debug64\libdb45d.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdb45d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdb45d.pdb ..\..\bin\debug64\
+..\..\bin\debug64\libdb48d.pdb : ..\..\..\Oem\dbxml\bin64\debug\libdb48d.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdb48d.pdb ..\..\bin\debug64\
-..\..\bin\debug64\libdbxml23d.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdbxml23d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdbxml23d.dll ..\..\bin\debug64\
+..\..\bin\debug64\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.dll ..\..\bin\debug64\
-..\..\bin\debug64\libdbxml23d.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdbxml23d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\libdbxml23d.pdb ..\..\bin\debug64\
+..\..\bin\debug64\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.pdb ..\..\bin\debug64\
-..\..\bin\debug64\xqilla10d.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xqilla10d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xqilla10d.dll ..\..\bin\debug64\
+..\..\bin\debug64\xqilla24d.dll : ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.dll ..\..\bin\debug64\
-..\..\bin\debug64\xqilla10d.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xqilla10d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xqilla10d.pdb ..\..\bin\debug64\
+..\..\bin\debug64\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.pdb ..\..\bin\debug64\
-..\..\bin\debug64\xerces-c_2_7D.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xerces-c_2_7D.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xerces-c_2_7D.dll ..\..\bin\debug64\
+..\..\bin\debug64\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.dll ..\..\bin\debug64\
-..\..\bin\debug64\xerces-c_2_7D.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xerces-c_2_7D.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\debug\xerces-c_2_7D.pdb ..\..\bin\debug64\
+..\..\bin\debug64\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.pdb ..\..\bin\debug64\
..\..\bin\debug64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug64\
@@ -399,14 +399,14 @@
..\..\bin\debug64\gd.pdb \
..\..\bin\debug64\GEOSd.dll \
..\..\bin\debug64\GEOSd.pdb \
- ..\..\bin\debug64\libdb45d.dll \
- ..\..\bin\debug64\libdb45d.pdb \
- ..\..\bin\debug64\libdbxml23d.dll \
- ..\..\bin\debug64\libdbxml23d.pdb \
- ..\..\bin\debug64\xqilla10d.dll \
- ..\..\bin\debug64\xqilla10d.pdb \
- ..\..\bin\debug64\xerces-c_2_7D.dll \
- ..\..\bin\debug64\xerces-c_2_7D.pdb \
+ ..\..\bin\debug64\libdb48d.dll \
+ ..\..\bin\debug64\libdb48d.pdb \
+ ..\..\bin\debug64\libdbxml25d.dll \
+ ..\..\bin\debug64\libdbxml25d.pdb \
+ ..\..\bin\debug64\xqilla24d.dll \
+ ..\..\bin\debug64\xqilla24d.pdb \
+ ..\..\bin\debug64\xerces-c_3_1mgD.dll \
+ ..\..\bin\debug64\xerces-c_3_1mgD.pdb \
..\..\bin\debug64\serverconfig.ini \
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
@@ -566,29 +566,29 @@
..\..\bin\release\GEOS.pdb : ..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.pdb
xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.pdb ..\..\bin\release\
-..\..\bin\release\libdb45.dll : ..\..\..\Oem\dbxml-2.3.10\bin\libdb45.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\libdb45.dll ..\..\bin\release\
+..\..\bin\release\libdb48.dll : ..\..\..\Oem\dbxml\bin\libdb48.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\libdb48.dll ..\..\bin\release\
-..\..\bin\release\libdb45.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\libdb45.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\libdb45.pdb ..\..\bin\release\
+..\..\bin\release\libdb48.pdb : ..\..\..\Oem\dbxml\bin\libdb48.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\libdb48.pdb ..\..\bin\release\
-..\..\bin\release\libdbxml23.dll : ..\..\..\Oem\dbxml-2.3.10\bin\libdbxml23.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\libdbxml23.dll ..\..\bin\release\
+..\..\bin\release\libdbxml25.dll : ..\..\..\Oem\dbxml\bin\libdbxml25.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\libdbxml25.dll ..\..\bin\release\
-..\..\bin\release\libdbxml23.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\libdbxml23.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\libdbxml23.pdb ..\..\bin\release\
+..\..\bin\release\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin\libdbxml25.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\libdbxml25.pdb ..\..\bin\release\
-..\..\bin\release\xqilla10.dll : ..\..\..\Oem\dbxml-2.3.10\bin\xqilla10.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\xqilla10.dll ..\..\bin\release\
+..\..\bin\release\xqilla24.dll : ..\..\..\Oem\dbxml\bin\xqilla24.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\xqilla24.dll ..\..\bin\release\
-..\..\bin\release\xqilla10.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\xqilla10.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\xqilla10.pdb ..\..\bin\release\
+..\..\bin\release\xqilla24.pdb : ..\..\..\Oem\dbxml\bin\xqilla24.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\xqilla24.pdb ..\..\bin\release\
-..\..\bin\release\xerces-c_2_7.dll : ..\..\..\Oem\dbxml-2.3.10\bin\xerces-c_2_7.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\xerces-c_2_7.dll ..\..\bin\release\
+..\..\bin\release\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin\xerces-c_3_1mg.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\xerces-c_3_1mg.dll ..\..\bin\release\
-..\..\bin\release\xerces-c_2_7.pdb : ..\..\..\Oem\dbxml-2.3.10\bin\xerces-c_2_7.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin\xerces-c_2_7.pdb ..\..\bin\release\
+..\..\bin\release\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin\xerces-c_3_1mg.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin\xerces-c_3_1mg.pdb ..\..\bin\release\
..\..\bin\release\serverconfig.ini : ..\..\src\Core\serverconfig.ini
xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release\
@@ -650,14 +650,14 @@
..\..\bin\release\gd.pdb \
..\..\bin\release\GEOS.dll \
..\..\bin\release\GEOS.pdb \
- ..\..\bin\release\libdb45.dll \
- ..\..\bin\release\libdb45.pdb \
- ..\..\bin\release\libdbxml23.dll \
- ..\..\bin\release\libdbxml23.pdb \
- ..\..\bin\release\xqilla10.dll \
- ..\..\bin\release\xqilla10.pdb \
- ..\..\bin\release\xerces-c_2_7.dll \
- ..\..\bin\release\xerces-c_2_7.pdb \
+ ..\..\bin\release\libdb48.dll \
+ ..\..\bin\release\libdb48.pdb \
+ ..\..\bin\release\libdbxml25.dll \
+ ..\..\bin\release\libdbxml25.pdb \
+ ..\..\bin\release\xqilla24.dll \
+ ..\..\bin\release\xqilla24.pdb \
+ ..\..\bin\release\xerces-c_3_1mg.dll \
+ ..\..\bin\release\xerces-c_3_1mg.pdb \
..\..\bin\release\serverconfig.ini \
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
@@ -817,29 +817,29 @@
..\..\bin\release64\GEOS.pdb : ..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.pdb
xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.pdb ..\..\bin\release64\
-..\..\bin\release64\libdb45.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\libdb45.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\libdb45.dll ..\..\bin\release64\
+..\..\bin\release64\libdb48.dll : ..\..\..\Oem\dbxml\bin64\libdb48.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\libdb48.dll ..\..\bin\release64\
-..\..\bin\release64\libdb45.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\libdb45.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\libdb45.pdb ..\..\bin\release64\
+..\..\bin\release64\libdb48.pdb : ..\..\..\Oem\dbxml\bin64\libdb48.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\libdb48.pdb ..\..\bin\release64\
-..\..\bin\release64\libdbxml23.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\libdbxml23.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\libdbxml23.dll ..\..\bin\release64\
+..\..\bin\release64\libdbxml25.dll : ..\..\..\Oem\dbxml\bin64\libdbxml25.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\libdbxml25.dll ..\..\bin\release64\
-..\..\bin\release64\libdbxml23.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\libdbxml23.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\libdbxml23.pdb ..\..\bin\release64\
+..\..\bin\release64\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin64\libdbxml25.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\libdbxml25.pdb ..\..\bin\release64\
-..\..\bin\release64\xqilla10.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\xqilla10.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\xqilla10.dll ..\..\bin\release64\
+..\..\bin\release64\xqilla24.dll : ..\..\..\Oem\dbxml\bin64\xqilla24.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\xqilla24.dll ..\..\bin\release64\
-..\..\bin\release64\xqilla10.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\xqilla10.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\xqilla10.pdb ..\..\bin\release64\
+..\..\bin\release64\xqilla24.pdb : ..\..\..\Oem\dbxml\bin64\xqilla24.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\xqilla24.pdb ..\..\bin\release64\
-..\..\bin\release64\xerces-c_2_7.dll : ..\..\..\Oem\dbxml-2.3.10\bin64\xerces-c_2_7.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\xerces-c_2_7.dll ..\..\bin\release64\
+..\..\bin\release64\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin64\xerces-c_3_1mg.dll
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\xerces-c_3_1mg.dll ..\..\bin\release64\
-..\..\bin\release64\xerces-c_2_7.pdb : ..\..\..\Oem\dbxml-2.3.10\bin64\xerces-c_2_7.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml-2.3.10\bin64\xerces-c_2_7.pdb ..\..\bin\release64\
+..\..\bin\release64\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin64\xerces-c_3_1mg.pdb
+ xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\xerces-c_3_1mg.pdb ..\..\bin\release64\
..\..\bin\release64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release64\
@@ -901,14 +901,14 @@
..\..\bin\release64\gd.pdb \
..\..\bin\release64\GEOS.dll \
..\..\bin\release64\GEOS.pdb \
- ..\..\bin\release64\libdb45.dll \
- ..\..\bin\release64\libdb45.pdb \
- ..\..\bin\release64\libdbxml23.dll \
- ..\..\bin\release64\libdbxml23.pdb \
- ..\..\bin\release64\xqilla10.dll \
- ..\..\bin\release64\xqilla10.pdb \
- ..\..\bin\release64\xerces-c_2_7.dll \
- ..\..\bin\release64\xerces-c_2_7.pdb \
+ ..\..\bin\release64\libdb48.dll \
+ ..\..\bin\release64\libdb48.pdb \
+ ..\..\bin\release64\libdbxml25.dll \
+ ..\..\bin\release64\libdbxml25.pdb \
+ ..\..\bin\release64\xqilla24.dll \
+ ..\..\bin\release64\xqilla24.pdb \
+ ..\..\bin\release64\xerces-c_3_1mg.dll \
+ ..\..\bin\release64\xerces-c_3_1mg.pdb \
..\..\bin\release64\serverconfig.ini \
..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
@@ -1025,14 +1025,14 @@
if EXIST ..\..\bin\debug\gd.pdb del /F ..\..\bin\debug\gd.pdb
if EXIST ..\..\bin\debug\GEOSd.dll del /F ..\..\bin\debug\GEOSd.dll
if EXIST ..\..\bin\debug\GEOSd.pdb del /F ..\..\bin\debug\GEOSd.pdb
- if EXIST ..\..\bin\debug\libdb45d.dll del /F ..\..\bin\debug\libdb45d.dll
- if EXIST ..\..\bin\debug\libdb45d.pdb del /F ..\..\bin\debug\libdb45d.pdb
- if EXIST ..\..\bin\debug\libdbxml23d.dll del /F ..\..\bin\debug\libdbxml23d.dll
- if EXIST ..\..\bin\debug\libdbxml23d.pdb del /F ..\..\bin\debug\libdbxml23d.pdb
- if EXIST ..\..\bin\debug\xqilla10d.dll del /F ..\..\bin\debug\xqilla10d.dll
- if EXIST ..\..\bin\debug\xqilla10d.pdb del /F ..\..\bin\debug\xqilla10d.pdb
- if EXIST ..\..\bin\debug\xerces-c_2_7D.dll del /F ..\..\bin\debug\xerces-c_2_7D.dll
- if EXIST ..\..\bin\debug\xerces-c_2_7D.pdb del /F ..\..\bin\debug\xerces-c_2_7D.pdb
+ if EXIST ..\..\bin\debug\libdb48d.dll del /F ..\..\bin\debug\libdb48d.dll
+ if EXIST ..\..\bin\debug\libdb48d.pdb del /F ..\..\bin\debug\libdb48d.pdb
+ if EXIST ..\..\bin\debug\libdbxml25d.dll del /F ..\..\bin\debug\libdbxml25d.dll
+ if EXIST ..\..\bin\debug\libdbxml25d.pdb del /F ..\..\bin\debug\libdbxml25d.pdb
+ if EXIST ..\..\bin\debug\xqilla24d.dll del /F ..\..\bin\debug\xqilla24d.dll
+ if EXIST ..\..\bin\debug\xqilla24d.pdb del /F ..\..\bin\debug\xqilla24d.pdb
+ if EXIST ..\..\bin\debug\xerces-c_3_1mgD.dll del /F ..\..\bin\debug\xerces-c_3_1mgD.dll
+ if EXIST ..\..\bin\debug\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug\xerces-c_3_1mgD.pdb
if EXIST ..\..\bin\debug\serverconfig.ini del /F ..\..\bin\debug\serverconfig.ini
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
@@ -1144,14 +1144,14 @@
if EXIST ..\..\bin\debug64\gd.pdb del /F ..\..\bin\debug64\gd.pdb
if EXIST ..\..\bin\debug64\GEOSd.dll del /F ..\..\bin\debug64\GEOSd.dll
if EXIST ..\..\bin\debug64\GEOSd.pdb del /F ..\..\bin\debug64\GEOSd.pdb
- if EXIST ..\..\bin\debug64\libdb45d.dll del /F ..\..\bin\debug64\libdb45d.dll
- if EXIST ..\..\bin\debug64\libdb45d.pdb del /F ..\..\bin\debug64\libdb45d.pdb
- if EXIST ..\..\bin\debug64\libdbxml23d.dll del /F ..\..\bin\debug64\libdbxml23d.dll
- if EXIST ..\..\bin\debug64\libdbxml23d.pdb del /F ..\..\bin\debug64\libdbxml23d.pdb
- if EXIST ..\..\bin\debug64\xqilla10d.dll del /F ..\..\bin\debug64\xqilla10d.dll
- if EXIST ..\..\bin\debug64\xqilla10d.pdb del /F ..\..\bin\debug64\xqilla10d.pdb
- if EXIST ..\..\bin\debug64\xerces-c_2_7D.dll del /F ..\..\bin\debug64\xerces-c_2_7D.dll
- if EXIST ..\..\bin\debug64\xerces-c_2_7D.pdb del /F ..\..\bin\debug64\xerces-c_2_7D.pdb
+ if EXIST ..\..\bin\debug64\libdb48d.dll del /F ..\..\bin\debug64\libdb48d.dll
+ if EXIST ..\..\bin\debug64\libdb48d.pdb del /F ..\..\bin\debug64\libdb48d.pdb
+ if EXIST ..\..\bin\debug64\libdbxml25d.dll del /F ..\..\bin\debug64\libdbxml25d.dll
+ if EXIST ..\..\bin\debug64\libdbxml25d.pdb del /F ..\..\bin\debug64\libdbxml25d.pdb
+ if EXIST ..\..\bin\debug64\xqilla24d.dll del /F ..\..\bin\debug64\xqilla24d.dll
+ if EXIST ..\..\bin\debug64\xqilla24d.pdb del /F ..\..\bin\debug64\xqilla24d.pdb
+ if EXIST ..\..\bin\debug64\xerces-c_3_1mgD.dll del /F ..\..\bin\debug64\xerces-c_3_1mgD.dll
+ if EXIST ..\..\bin\debug64\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug64\xerces-c_3_1mgD.pdb
if EXIST ..\..\bin\debug64\serverconfig.ini del /F ..\..\bin\debug64\serverconfig.ini
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
@@ -1263,14 +1263,14 @@
if EXIST ..\..\bin\release\gd.pdb del /F ..\..\bin\release\gd.pdb
if EXIST ..\..\bin\release\GEOS.dll del /F ..\..\bin\release\GEOS.dll
if EXIST ..\..\bin\release\GEOS.pdb del /F ..\..\bin\release\GEOS.pdb
- if EXIST ..\..\bin\release\libdb45.dll del /F ..\..\bin\release\libdb45.dll
- if EXIST ..\..\bin\release\libdb45.pdb del /F ..\..\bin\release\libdb45.pdb
- if EXIST ..\..\bin\release\libdbxml23.dll del /F ..\..\bin\release\libdbxml23.dll
- if EXIST ..\..\bin\release\libdbxml23.pdb del /F ..\..\bin\release\libdbxml23.pdb
- if EXIST ..\..\bin\release\xqilla10.dll del /F ..\..\bin\release\xqilla10.dll
- if EXIST ..\..\bin\release\xqilla10.pdb del /F ..\..\bin\release\xqilla10.pdb
- if EXIST ..\..\bin\release\xerces-c_2_7.dll del /F ..\..\bin\release\xerces-c_2_7.dll
- if EXIST ..\..\bin\release\xerces-c_2_7.pdb del /F ..\..\bin\release\xerces-c_2_7.pdb
+ if EXIST ..\..\bin\release\libdb48.dll del /F ..\..\bin\release\libdb48.dll
+ if EXIST ..\..\bin\release\libdb48.pdb del /F ..\..\bin\release\libdb48.pdb
+ if EXIST ..\..\bin\release\libdbxml25.dll del /F ..\..\bin\release\libdbxml25.dll
+ if EXIST ..\..\bin\release\libdbxml25.pdb del /F ..\..\bin\release\libdbxml25.pdb
+ if EXIST ..\..\bin\release\xqilla24.dll del /F ..\..\bin\release\xqilla24.dll
+ if EXIST ..\..\bin\release\xqilla24.pdb del /F ..\..\bin\release\xqilla24.pdb
+ if EXIST ..\..\bin\release\xerces-c_3_1mg.dll del /F ..\..\bin\release\xerces-c_3_1mg.dll
+ if EXIST ..\..\bin\release\xerces-c_3_1mg.pdb del /F ..\..\bin\release\xerces-c_3_1mg.pdb
if EXIST ..\..\bin\release\serverconfig.ini del /F ..\..\bin\release\serverconfig.ini
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
@@ -1381,14 +1381,14 @@
if EXIST ..\..\bin\release64\gd.pdb del /F ..\..\bin\release64\gd.pdb
if EXIST ..\..\bin\release64\GEOS.dll del /F ..\..\bin\release64\GEOS.dll
if EXIST ..\..\bin\release64\GEOS.pdb del /F ..\..\bin\release64\GEOS.pdb
- if EXIST ..\..\bin\release64\libdb45.dll del /F ..\..\bin\release64\libdb45.dll
- if EXIST ..\..\bin\release64\libdb45.pdb del /F ..\..\bin\release64\libdb45.pdb
- if EXIST ..\..\bin\release64\libdbxml23.dll del /F ..\..\bin\release64\libdbxml23.dll
- if EXIST ..\..\bin\release64\libdbxml23.pdb del /F ..\..\bin\release64\libdbxml23.pdb
- if EXIST ..\..\bin\release64\xqilla10.dll del /F ..\..\bin\release64\xqilla10.dll
- if EXIST ..\..\bin\release64\xqilla10.pdb del /F ..\..\bin\release64\xqilla10.pdb
- if EXIST ..\..\bin\release64\xerces-c_2_7.dll del /F ..\..\bin\release64\xerces-c_2_7.dll
- if EXIST ..\..\bin\release64\xerces-c_2_7.pdb del /F ..\..\bin\release64\xerces-c_2_7.pdb
+ if EXIST ..\..\bin\release64\libdb48.dll del /F ..\..\bin\release64\libdb48.dll
+ if EXIST ..\..\bin\release64\libdb48.pdb del /F ..\..\bin\release64\libdb48.pdb
+ if EXIST ..\..\bin\release64\libdbxml25.dll del /F ..\..\bin\release64\libdbxml25.dll
+ if EXIST ..\..\bin\release64\libdbxml25.pdb del /F ..\..\bin\release64\libdbxml25.pdb
+ if EXIST ..\..\bin\release64\xqilla24.dll del /F ..\..\bin\release64\xqilla24.dll
+ if EXIST ..\..\bin\release64\xqilla24.pdb del /F ..\..\bin\release64\xqilla24.pdb
+ if EXIST ..\..\bin\release64\xerces-c_3_1mg.dll del /F ..\..\bin\release64\xerces-c_3_1mg.dll
+ if EXIST ..\..\bin\release64\xerces-c_3_1mg.pdb del /F ..\..\bin\release64\xerces-c_3_1mg.pdb
if EXIST ..\..\bin\release64\serverconfig.ini del /F ..\..\bin\release64\serverconfig.ini
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
Modified: trunk/MgDev/Server/src/Services/Drawing/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Drawing/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -13,7 +13,7 @@
-I../../../../Common/MapGuideCommon \
-I../../../../Oem/DWFTK7.1/develop/global/src \
-I../../../../Oem/DWFTK7.1/develop/global/src/dwf \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
-I../../Common/Manager \
@@ -67,7 +67,7 @@
libMgServerDrawingService_la_LIBADD = -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon -lxerces-c
libMgServerDrawingService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../../Oem/dbxml-2.3.10/install/lib \
+ -L../../../../Oem/dbxml/install/lib \
-L../../../../Common/Foundation \
-L../../../../Common/Geometry \
-L../../../../Common/PlatformBase \
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
OutputFile="$(OutDir)\MgServerDrawingServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerDrawingServiced.pdb"
SubSystem="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -143,10 +143,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
OutputFile="$(OutDir)\MgServerDrawingServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug64\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug64\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerDrawingServiced.pdb"
SubSystem="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -220,10 +220,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
OutputFile="$(OutDir)\MgServerDrawingService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerDrawingService.pdb"
SubSystem="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src\dwf"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -299,10 +299,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib dwfcore_wt.1.1.1.lib dwftk_wt.7.1.1.lib whiptk_wt.7.7.601.lib"
OutputFile="$(OutDir)\MgServerDrawingService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release64\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release64\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerDrawingService.pdb"
SubSystem="2"
Modified: trunk/MgDev/Server/src/Services/Feature/FilterUtil.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FilterUtil.h 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Feature/FilterUtil.h 2010-10-26 23:50:18 UTC (rev 5338)
@@ -21,11 +21,11 @@
#include "ServerFeatureDllExport.h"
//fwd declare
-namespace xercesc_2_7
+namespace XERCES_CPP_NAMESPACE
{
class DOMElement;
}
-using namespace xercesc_2_7;
+using namespace XERCES_CPP_NAMESPACE;
class MgCoordinateSystemTransform;
Modified: trunk/MgDev/Server/src/Services/Feature/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Feature/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -8,7 +8,7 @@
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
-I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../Gws/Include \
-I../../Gws/GwsCommon/inc \
-I../../Gws/GwsQueryEngine/inc \
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDO.lib FDOCommon.lib FDOGeometry.lib ExpressionEngine.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib FDO.lib FDOCommon.lib FDOGeometry.lib ExpressionEngine.lib"
OutputFile="$(OutDir)\MgServerFeatureServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\FDO\lib"
DelayLoadDLLs="FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerFeatureServiced.pdb"
@@ -124,7 +124,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -144,10 +144,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDO.lib FDOCommon.lib FDOGeometry.lib ExpressionEngine.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib FDO.lib FDOCommon.lib FDOGeometry.lib ExpressionEngine.lib"
OutputFile="$(OutDir)\MgServerFeatureServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\FDO\lib64"
DelayLoadDLLs="FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerFeatureServiced.pdb"
@@ -204,7 +204,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -222,10 +222,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FDO.lib FDOCommon.lib ExpressionEngine.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib FDO.lib FDOCommon.lib ExpressionEngine.lib"
OutputFile="$(OutDir)\MgServerFeatureService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\FDO\lib"
DelayLoadDLLs="FDO.dll;FDOCommon.dll;ExpressionEngine.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerFeatureService.pdb"
@@ -285,7 +285,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/bigobj"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -303,10 +303,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FDO.lib FDOCommon.lib ExpressionEngine.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib FDO.lib FDOCommon.lib ExpressionEngine.lib"
OutputFile="$(OutDir)\MgServerFeatureService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\FDO\lib64"
DelayLoadDLLs="FDO.dll;FDOCommon.dll;ExpressionEngine.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerFeatureService.pdb"
Modified: trunk/MgDev/Server/src/Services/Kml/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Kml/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -6,7 +6,7 @@
INCLUDES = \
-I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../../../Oem/DWFTK7.1/develop/global/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Server/src/Services/Mapping/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Mapping/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -15,7 +15,7 @@
-I../../../../Common/MdfParser \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../../../Common/CoordinateSystem \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDO.lib FDOCommon.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib FDO.lib FDOCommon.lib"
OutputFile="$(OutDir)\MgServerMappingServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\FDO\lib"
DelayLoadDLLs="FDO.dll;FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerMappingServiced.pdb"
@@ -124,7 +124,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -144,10 +144,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDO.lib FDOCommon.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib FDO.lib FDOCommon.lib"
OutputFile="$(OutDir)\MgServerMappingServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\FDO\lib64"
DelayLoadDLLs="FDO.dll;FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerMappingServiced.pdb"
@@ -204,7 +204,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -222,10 +222,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FDO.lib FDOCommon.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib FDO.lib FDOCommon.lib"
OutputFile="$(OutDir)\MgServerMappingService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\FDO\lib"
DelayLoadDLLs="FDO.dll;FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerMappingService.pdb"
@@ -284,7 +284,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -302,10 +302,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FDO.lib FDOCommon.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib FDO.lib FDOCommon.lib"
OutputFile="$(OutDir)\MgServerMappingService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\FDO\lib64"
DelayLoadDLLs="FDO.dll;FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerMappingService.pdb"
Modified: trunk/MgDev/Server/src/Services/Rendering/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Rendering/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -8,7 +8,7 @@
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
-I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Server/src/Services/Resource/DbEnvironment.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/DbEnvironment.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/DbEnvironment.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -47,8 +47,9 @@
m_dbEnv.set_timeout(MG_DB_ENV_TIMEOUT, DB_SET_LOCK_TIMEOUT);
m_dbEnv.set_timeout(MG_DB_ENV_TIMEOUT, DB_SET_TXN_TIMEOUT);
m_dbEnv.set_tx_max(MG_MAX_TRANSACTIONS);
+ m_dbEnv.set_tx_max(40); // Set maximum number of allowed transactions. Default is 20
- u_int32_t containerFlags = DB_CREATE|DB_THREAD;
+ u_int32_t containerFlags = DB_CREATE|DB_THREAD|DBXML_NO_INDEX_NODES;
u_int32_t environmentFlags = DB_CREATE|DB_THREAD|DB_INIT_MPOOL;
if (m_transacted)
@@ -69,7 +70,7 @@
if (MgRepositoryType::Session == repositoryType)
{
- m_dbEnv.set_flags(DB_LOG_INMEMORY, 1);
+ m_dbEnv.log_set_config(DB_LOG_IN_MEMORY, 1);
environmentFlags |= DB_PRIVATE;
}
else
@@ -96,7 +97,7 @@
pageSize = MG_SESS_DBXML_PAGE_SIZE;
}
- m_xmlMan = XmlManager(&m_dbEnv, DBXML_ALLOW_EXTERNAL_ACCESS);
+ m_xmlMan = XmlManager(m_dbEnv.get_DB_ENV(), DBXML_ALLOW_EXTERNAL_ACCESS);
m_xmlMan.setDefaultPageSize(pageSize);
m_xmlMan.setDefaultContainerType(XmlContainer::WholedocContainer);
Modified: trunk/MgDev/Server/src/Services/Resource/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -7,10 +7,10 @@
INCLUDES = \
-I../../../../Oem/ACE/ACE_wrappers \
-I$(map_fdo_include) \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
- -I../../../../Oem/dbxml-2.3.10/install/include \
- -I../../../../Oem/dbxml-2.3.10/dbxml/include \
- -I../../../../Oem/dbxml-2.3.10/dbxml/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I../../../../Oem/dbxml/install/include \
+ -I../../../../Oem/dbxml/dbxml/include \
+ -I../../../../Oem/dbxml/dbxml/src \
-I../../../../Oem/DWFTK7.1/develop/global/src \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
@@ -209,4 +209,4 @@
-L../../Common/Base \
-L../../Common/Cache \
-L../../Common/Manager \
- -L../../../../Oem/dbxml-2.3.10/install/lib
+ -L../../../../Oem/dbxml/install/lib
Modified: trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -431,7 +431,7 @@
assert(NULL != m_dbTxn);
m_xmlTxn.reset(new XmlTransaction(
- environment->GetXmlManager().createTransaction(m_dbTxn)));
+ environment->GetXmlManager().createTransaction(m_dbTxn->get_DB_TXN())));
assert(NULL != m_xmlTxn.get());
}
else
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceContainer.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceContainer.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceContainer.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -43,24 +43,97 @@
#endif
XmlManager& xmlMan = m_environment.GetXmlManager();
- assert(XmlContainer::WholedocContainer == xmlMan.getDefaultContainerType());
- u_int32_t flags = xmlMan.getDefaultContainerFlags();
+ XmlContainer::ContainerType defaultContType = xmlMan.getDefaultContainerType();
+ assert(XmlContainer::WholedocContainer == defaultContType);
if (m_environment.IsTransacted())
{
- assert(flags | DBXML_TRANSACTIONAL);
XmlTransaction xmlTxn = xmlMan.createTransaction();
- m_xmlContainer.reset(new XmlContainer(xmlMan.openContainer(
- xmlTxn, fileName, flags)));
+ XmlContainerConfig cconfig;
+ cconfig.setAllowCreate(true); // If the container does not exist, create it.
+ cconfig.setTransactional(true); // Enable transactions.
+ cconfig.setThreaded(true);
+ cconfig.setContainerType(defaultContType);
+ cconfig.setAllowValidation(true);
+ cconfig.setIndexNodes(XmlContainerConfig::Off);
+
+ m_xmlContainer.reset(new XmlContainer(xmlMan.openContainer(xmlTxn, fileName, cconfig)));
xmlTxn.commit(0);
+
+ XmlContainer::ContainerType contType = m_xmlContainer->getContainerType();
+ assert(XmlContainer::WholedocContainer == contType);
}
else
{
- m_xmlContainer.reset(new XmlContainer(xmlMan.openContainer(
- fileName, flags)));
+ XmlContainerConfig cconfig;
+ cconfig.setAllowCreate(true); // If the container does not exist, create it.
+ cconfig.setThreaded(true);
+ cconfig.setContainerType(defaultContType);
+ cconfig.setAllowValidation(true);
+ cconfig.setIndexNodes(XmlContainerConfig::Off);
+
+ m_xmlContainer.reset(new XmlContainer(xmlMan.openContainer(fileName, cconfig)));
+
+ XmlContainer::ContainerType contType = m_xmlContainer->getContainerType();
+ assert(XmlContainer::WholedocContainer == contType);
}
+#ifdef _DEBUG
+ // Dump the flags used to create the container
+ STRING containerFileName = MgUtil::MultiByteToWideChar(fileName);
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("Opened Container : %s\n"), MG_WCHAR_TO_TCHAR(containerFileName)));
+
+ bool bResult;
+ int nResult;
+ unsigned int unResult;
+ std::string strResult;
+ XmlContainer::ContainerType cResult;
+ XmlContainerConfig::ConfigState sResult;
+
+ XmlContainerConfig cconfig = m_xmlContainer->getFlags();
+ bResult = cconfig.getAllowCreate();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getAllowCreate : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getAllowValidation();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getAllowValidation : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getChecksum();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getChecksum : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ strResult = cconfig.getCompressionName();
+ STRING compressionName = MgUtil::MultiByteToWideChar(strResult);
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getCompressionName : %s\n"), MG_WCHAR_TO_TCHAR(compressionName)));
+ cResult = cconfig.getContainerType();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getContainerType : %s\n"), (cResult == XmlContainer::WholedocContainer) ? ACE_TEXT("WholedocContainer") : ACE_TEXT("NodeContainer")));
+ bResult = cconfig.getEncrypted();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getEncrypted : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getExclusiveCreate();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getExclusiveCreate : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ sResult = cconfig.getIndexNodes();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getIndexNodes : %d\n"), sResult));
+ nResult = cconfig.getMode();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getMode : %d\n"), nResult));
+ bResult = cconfig.getMultiversion();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getMultiversion : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getNoMMap();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getNoMMap : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ unResult = cconfig.getPageSize();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getPageSize : %d\n"), unResult));
+ bResult = cconfig.getReadOnly();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getReadOnly : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getReadUncommitted();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getReadUncommitted : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ unResult = cconfig.getSequenceIncrement();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getSequenceIncrement : %d\n"), unResult));
+ sResult = cconfig.getStatistics();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getStatistics : %d\n"), sResult));
+ bResult = cconfig.getThreaded();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getThreaded : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getTransactional();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getTransactional : %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ bResult = cconfig.getTransactionNotDurable();
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("getTransactionNotDurable: %s\n"), bResult ? ACE_TEXT("True") : ACE_TEXT("False")));
+ ACE_DEBUG ((LM_INFO, ACE_TEXT("\n")));
+#endif
+
m_opened = (NULL != m_xmlContainer.get());
Reset();
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceDefinitionManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceDefinitionManager.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceDefinitionManager.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -388,33 +388,33 @@
if (!resource.IsRuntimeResource())
{
- DOMDocument* domDoc = xmlDoc.getContentAsDOM();
- assert(NULL != domDoc);
- MgXmlUtil xmlUtil(domDoc, false);
+ std::string xmlContent;
+ MgXmlUtil xmlUtil(xmlDoc.getContent(xmlContent));
+
DOMElement* rootNode = xmlUtil.GetRootNode();
- assert(NULL != rootNode);
+ if(NULL != rootNode)
+ {
+ assert(NULL != rootNode);
- STRING rootName;
- const XMLCh* tag = rootNode->getTagName();
+ STRING rootName;
+ const XMLCh* tag = rootNode->getTagName();
- if (NULL != tag)
- {
- rootName = X2W(tag);
- assert(!rootName.empty());
- }
+ if (NULL != tag)
+ {
+ rootName = X2W(tag);
+ assert(!rootName.empty());
+ }
- STRING schemaName;
- const XMLCh* attr = rootNode->getAttribute(X("xsi:noNamespaceSchemaLocation"));
+ STRING schemaName;
+ const XMLCh* attr = rootNode->getAttribute(X("xsi:noNamespaceSchemaLocation"));
- if (NULL != attr)
- {
- schemaName = X2W(attr);
+ if (NULL != attr)
+ {
+ schemaName = X2W(attr);
+ }
+
+ ValidateDocument(resource, rootName, schemaName);
}
-
- // Free resources
- domDoc->release();
-
- ValidateDocument(resource, rootName, schemaName);
}
MG_RESOURCE_CONTAINER_CATCH_AND_THROW(L"MgResourceDefinitionManager.ValidateDocument")
@@ -523,7 +523,7 @@
ValidateDocument(xmlDoc);
// Insert the resource.
- m_container.putDocument(GetXmlTxn(), xmlDoc, updateContext, 0);
+ m_container.putDocument(GetXmlTxn(), xmlDoc, updateContext);
}
catch (XmlException& e)
{
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -1475,7 +1475,6 @@
XmlQueryExpression& selectGroupPermissions)
{
XmlManager& xmlMan = m_container.getManager();
- queryContext.setReturnType(XmlQueryContext::DeadValues);
string xpathInheritedFlags = "/*/Security/Inherited/text()";
selectInheritedFlags = IsTransacted() ?
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h 2010-10-26 23:50:18 UTC (rev 5338)
@@ -27,6 +27,7 @@
#include <vector>
#include <dbxml/DbXml.hpp>
#include <dwfcore/ZipFileDescriptor.h>
+#include "db_cxx.h"
using namespace DbXml;
Modified: trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,9 +44,10 @@
/// Server Resource Service retry macros.
/// This pauses briefly before trying the operation again.
///
-#define MG_RESOURCE_SERVICE_BEGIN_OPERATION(transacted) \
+// DBXML always uses a transaction regardless.
+#define MG_RESOURCE_SERVICE_BEGIN_OPERATION() \
MG_RESOURCE_SERVICE_BEGIN_RETRY() \
- repositoryMan->Initialize(transacted); \
+ repositoryMan->Initialize(true); \
#define MG_RESOURCE_SERVICE_END_OPERATION(maxRetries) \
MG_RESOURCE_SERVICE_END_RETRY(maxRetries) \
@@ -236,7 +237,7 @@
auto_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->EnumerateRepositories();
@@ -289,7 +290,7 @@
maxRetries = 0;
}
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
if (NULL != content && content->IsRewindable())
{
@@ -342,7 +343,7 @@
auto_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->DeleteRepository(resource);
@@ -387,7 +388,7 @@
maxRetries = 0;
}
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
if (NULL != content && content->IsRewindable())
{
@@ -435,7 +436,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->GetRepositoryContent(resource);
@@ -483,7 +484,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->GetRepositoryHeader(resource);
@@ -520,7 +521,7 @@
maxRetries = 0;
}
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
if (packageStream->IsRewindable())
{
@@ -561,7 +562,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->LoadResourcePackage(packagePathname, logActivities);
@@ -610,7 +611,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->MakeResourcePackage(resource, packagePathname,
packageDescription, logActivities);
@@ -642,7 +643,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
existed = repositoryMan->ResourceExists(resource);
@@ -691,7 +692,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->EnumerateResources(resource, depth, type,
properties, fromDate, toDate, computeChildren);
@@ -741,7 +742,7 @@
}
set<STRING> changedResources;
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
if (NULL != content && content->IsRewindable())
{
@@ -789,7 +790,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->DeleteResource(resource);
@@ -832,7 +833,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(destResource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->MoveResource(sourceResource, destResource, overwrite, cascade);
@@ -870,7 +871,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(destResource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->CopyResource(sourceResource, destResource, overwrite);
@@ -913,7 +914,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->GetResourceContent(resource, preProcessTags);
@@ -960,7 +961,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resourceId));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->GetResourceContent(resourceId, preProcessTag);
@@ -1012,7 +1013,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->GetResourceHeader(resource);
@@ -1061,7 +1062,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
dateTime = repositoryMan->GetResourceModifiedDate(resource);
@@ -1100,7 +1101,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->EnumerateReferences(resource);
@@ -1190,7 +1191,7 @@
{
MgLibraryRepositoryManager libraryRepositoryMan(*sm_libraryRepository);
- libraryRepositoryMan.Initialize(false);
+ libraryRepositoryMan.Initialize(true);
libraryRepositoryMan.EnumerateParentMapDefinitions(childResources,
parentResources);
libraryRepositoryMan.Terminate();
@@ -1198,7 +1199,7 @@
MgSessionRepositoryManager sessionRepositoryMan(*sm_sessionRepository);
- sessionRepositoryMan.Initialize(false);
+ sessionRepositoryMan.Initialize(true);
sessionRepositoryMan.EnumerateParentMapDefinitions(childResources,
parentResources);
sessionRepositoryMan.Terminate();
@@ -1238,7 +1239,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
resourceList = repositoryMan->EnumerateResourceDocuments(
resources, type, properties);
@@ -1285,7 +1286,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->ChangeResourceOwner(resource, owner, includeDescendants);
@@ -1329,7 +1330,7 @@
auto_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->InheritPermissionsFrom(resource);
@@ -1366,7 +1367,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->EnumerateResourceData(resource);
@@ -1414,7 +1415,7 @@
maxRetries = 0;
}
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
if (data->IsRewindable())
{
@@ -1457,7 +1458,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->DeleteResourceData(resource, dataName);
@@ -1495,7 +1496,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->RenameResourceData(resource, oldDataName, newDataName, overwrite);
@@ -1540,7 +1541,7 @@
auto_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->GetResourceData(resource, dataName,
preProcessTags);
@@ -1616,7 +1617,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->EnumerateUsers(group, role, includePassword,
includeGroups);
@@ -1648,7 +1649,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->AddUser(userId, username, password, description);
@@ -1676,7 +1677,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->DeleteUsers(users);
@@ -1705,7 +1706,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->UpdateUser(userId, newUserId, newUsername, newPassword, newDescription);
@@ -1737,7 +1738,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
byteReader = repositoryMan->EnumerateGroups(user, role);
@@ -1766,7 +1767,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->AddGroup(group, description);
@@ -1793,7 +1794,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->DeleteGroups(groups);
@@ -1822,7 +1823,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->UpdateGroup(group, newGroup, newDescription);
@@ -1860,7 +1861,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->GrantGroupMembershipsToUsers(groups, users);
@@ -1898,7 +1899,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->RevokeGroupMembershipsFromUsers(groups, users);
@@ -1944,7 +1945,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
roles = repositoryMan->EnumerateRoles(user, group);
@@ -2010,7 +2011,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->GrantRoleMembershipsToUsers( roles, users );
@@ -2048,7 +2049,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->RevokeRoleMembershipsFromUsers( roles, users );
@@ -2086,7 +2087,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->GrantRoleMembershipsToGroups( roles, groups );
@@ -2124,7 +2125,7 @@
auto_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(true)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
repositoryMan->RevokeRoleMembershipsFromGroups( roles, groups );
@@ -2145,14 +2146,20 @@
MG_RESOURCE_SERVICE_TRY()
- MgSiteRepositoryManager repositoryMan(*sm_siteRepository);
+ auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ new MgSiteRepositoryManager(*sm_siteRepository));
+
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
+
MgSiteResourceContentManager* resourceContentMan =
dynamic_cast<MgSiteResourceContentManager*>(
- repositoryMan.GetResourceContentManager());
+ repositoryMan->GetResourceContentManager());
ACE_ASSERT(NULL != resourceContentMan);
securityCache = resourceContentMan->CreateSecurityCache();
+ MG_RESOURCE_SERVICE_END_OPERATION(sm_retryAttempts)
+
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgServerResourceService.CreateSecurityCache")
return securityCache.Detach();
@@ -2170,14 +2177,20 @@
MG_RESOURCE_SERVICE_TRY()
- MgLibraryRepositoryManager repositoryMan(*sm_libraryRepository);
+ auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ new MgLibraryRepositoryManager(*sm_libraryRepository));
+
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
+
MgResourceHeaderManager* resourceHeaderManager =
dynamic_cast<MgResourceHeaderManager*>(
- repositoryMan.GetResourceHeaderManager());
+ repositoryMan->GetResourceHeaderManager());
ACE_ASSERT(NULL != resourceHeaderManager);
permissionCache = resourceHeaderManager->CreatePermissionCache();
+ MG_RESOURCE_SERVICE_END_OPERATION(sm_retryAttempts)
+
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgServerResourceService.CreatePermissionCache")
return permissionCache.Detach();
@@ -2208,7 +2221,7 @@
repositoryMan->GetResourceContentManager();
ACE_ASSERT(NULL != resourceContentMan);
- MG_RESOURCE_SERVICE_BEGIN_OPERATION(false)
+ MG_RESOURCE_SERVICE_BEGIN_OPERATION()
resourceContentMan->CheckPermission(*resource, permission);
Modified: trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\dbxml-2.3.10\db-4.5.20\\build_windows;..\..\..\..\Oem\dbxml-2.3.10\dbxml\include;..\..\..\..\Oem\dbxml-2.3.10\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";"..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows";..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib libdb45d.lib libdbxml23d.lib dwfcore_wt.1.1.1.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib libdb48d.lib libdbxml25d.lib dwfcore_wt.1.1.1.lib"
OutputFile="$(OutDir)\MgServerResourceServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerResourceServiced.pdb"
SubSystem="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\dbxml-2.3.10\db-4.5.20\\build_windows;..\..\..\..\Oem\dbxml-2.3.10\dbxml\include;..\..\..\..\Oem\dbxml-2.3.10\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";"..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows";..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -143,10 +143,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib libdb45d.lib libdbxml23d.lib dwfcore_wt.1.1.1.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib libdb48d.lib libdbxml25d.lib dwfcore_wt.1.1.1.lib"
OutputFile="$(OutDir)\MgServerResourceServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug64\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\debug64\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerResourceServiced.pdb"
SubSystem="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\dbxml-2.3.10\db-4.5.20\\build_windows;..\..\..\..\Oem\dbxml-2.3.10\dbxml\include;..\..\..\..\Oem\dbxml-2.3.10\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";"..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows";..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -220,10 +220,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib libdb45.lib libdbxml23.lib dwfcore_wt.1.1.1.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib libdb48.lib libdbxml25.lib dwfcore_wt.1.1.1.lib"
OutputFile="$(OutDir)\MgServerResourceService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerResourceService.pdb"
SubSystem="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Oem\dbxml-2.3.10\db-4.5.20\\build_windows;..\..\..\..\Oem\dbxml-2.3.10\dbxml\include;..\..\..\..\Oem\dbxml-2.3.10\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src";"..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows";..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -299,10 +299,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib libdb45.lib libdbxml23.lib dwfcore_wt.1.1.1.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib libdb48.lib libdbxml25.lib dwfcore_wt.1.1.1.lib"
OutputFile="$(OutDir)\MgServerResourceService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release64\vc8.0"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64;..\..\..\..\Oem\DWFTK7.1\develop\global\lib\static\release64\vc8.0"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerResourceService.pdb"
SubSystem="2"
Modified: trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp 2010-10-26 23:50:18 UTC (rev 5338)
@@ -292,7 +292,6 @@
string docQuery = "/Group/Users/User/Name/text()";
XmlQueryContext docContext = xmlMan.createQueryContext();
- docContext.setReturnType(XmlQueryContext::DeadValues);
// Execute the XQuery.
@@ -395,7 +394,6 @@
string docQuery = "/Role/Users/User/Name/text()";
XmlQueryContext docContext = xmlMan.createQueryContext();
- docContext.setReturnType(XmlQueryContext::DeadValues);
// Execute the XQuery.
@@ -889,7 +887,6 @@
string docQuery = "/Role/Groups/Group/Name/text()";
XmlQueryContext docContext = xmlMan.createQueryContext();
- docContext.setReturnType(XmlQueryContext::DeadValues);
// Execute the XQuery.
@@ -2027,7 +2024,10 @@
// Set up an XQuery.
- string query = "/Group/Users/User[Name=\"";
+ string query = "delete nodes collection('";
+ query += m_container.getName();
+ query += "')";
+ query += "/Group/Users/User[Name=\"";
query += MgUtil::WideCharToMultiByte(userId);
query += "\"]";
@@ -2035,22 +2035,14 @@
XmlManager& xmlMan = m_container.getManager();
XmlQueryContext queryContext = xmlMan.createQueryContext();
- XmlUpdateContext updateContext = xmlMan.createUpdateContext();
- XmlModify xmlMod = xmlMan.createModify();
if (IsTransacted())
{
- XmlQueryExpression xmlSelect = xmlMan.prepare(GetXmlTxn(), query, queryContext);
-
- xmlMod.addRemoveStep(xmlSelect);
- xmlMod.execute(GetXmlTxn(), docValue, queryContext, updateContext);
+ xmlMan.query(GetXmlTxn(), query, queryContext, 0);
}
else
{
- XmlQueryExpression xmlSelect = xmlMan.prepare(query, queryContext);
-
- xmlMod.addRemoveStep(xmlSelect);
- xmlMod.execute(docValue, queryContext, updateContext);
+ xmlMan.query(query, queryContext);
}
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgSiteResourceContentManager.RemoveUserFromGroup")
@@ -2143,7 +2135,10 @@
// Set up an XQuery.
- string query = "/Role/Users/User[Name=\"";
+ string query = "delete nodes collection('";
+ query += m_container.getName();
+ query += "')";
+ query += "/Role/Users/User[Name=\"";
query += MgUtil::WideCharToMultiByte(userId);
query += "\"]";
@@ -2151,22 +2146,14 @@
XmlManager& xmlMan = m_container.getManager();
XmlQueryContext queryContext = xmlMan.createQueryContext();
- XmlUpdateContext updateContext = xmlMan.createUpdateContext();
- XmlModify xmlMod = xmlMan.createModify();
if (IsTransacted())
{
- XmlQueryExpression xmlSelect = xmlMan.prepare(GetXmlTxn(), query, queryContext);
-
- xmlMod.addRemoveStep(xmlSelect);
- xmlMod.execute(GetXmlTxn(), docValue, queryContext, updateContext);
+ xmlMan.query(GetXmlTxn(), query, queryContext, 0);
}
else
{
- XmlQueryExpression xmlSelect = xmlMan.prepare(query, queryContext);
-
- xmlMod.addRemoveStep(xmlSelect);
- xmlMod.execute(docValue, queryContext, updateContext);
+ xmlMan.query(query, queryContext);
}
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgSiteResourceContentManager.RemoveUserFromRole")
@@ -2259,7 +2246,10 @@
// Set up an XQuery.
- string query = "/Role/Groups/Group[Name=\"";
+ string query = "delete nodes collection('";
+ query += m_container.getName();
+ query += "')";
+ query += "/Roles/Groups/Group[Name=\"";
query += MgUtil::WideCharToMultiByte(groupId);
query += "\"]";
@@ -2267,22 +2257,14 @@
XmlManager& xmlMan = m_container.getManager();
XmlQueryContext queryContext = xmlMan.createQueryContext();
- XmlUpdateContext updateContext = xmlMan.createUpdateContext();
- XmlModify xmlMod = xmlMan.createModify();
if (IsTransacted())
{
- XmlQueryExpression xmlSelect = xmlMan.prepare(GetXmlTxn(), query, queryContext);
-
- xmlMod.addRemoveStep(xmlSelect);
- xmlMod.execute(GetXmlTxn(), docValue, queryContext, updateContext);
+ xmlMan.query(GetXmlTxn(), query, queryContext, 0);
}
else
{
- XmlQueryExpression xmlSelect = xmlMan.prepare(query, queryContext);
-
- xmlMod.addRemoveStep(xmlSelect);
- xmlMod.execute(docValue, queryContext, updateContext);
+ xmlMan.query(query, queryContext);
}
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgSiteResourceContentManager.RemoveGroupFromRole")
@@ -2358,7 +2340,6 @@
XmlManager& xmlMan = m_container.getManager();
XmlQueryContext docContext = xmlMan.createQueryContext();
- docContext.setReturnType(XmlQueryContext::DeadValues);
string xpathUserPassword = "/User/Password/text()";
XmlQueryExpression selectUserPassword = IsTransacted() ?
Modified: trunk/MgDev/Server/src/Services/Site/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Services/Site/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Site/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -12,7 +12,7 @@
-I../../../../Common/PlatformBase \
-I../../../../Common/MapGuideCommon \
-I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../../Oem/dbxml/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
-I../../Common/Manager \
Modified: trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcproj
===================================================================
--- trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgServerSiteServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerSiteServiced.pdb"
SubSystem="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -143,10 +143,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgServerSiteServiced.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerSiteServiced.pdb"
SubSystem="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -220,10 +220,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgServerSiteService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerSiteService.pdb"
SubSystem="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -299,10 +299,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgServerSiteService.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgServerSiteService.pdb"
SubSystem="2"
Modified: trunk/MgDev/Server/src/UnitTesting/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/UnitTesting/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -7,7 +7,7 @@
INCLUDES = \
-I../../../Oem/ACE/ACE_wrappers \
-I../../../Oem/CppUnit-1.9.14/include \
- -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../Oem/dbxml/xerces-c-src/src \
-I../../../Common/Foundation \
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
Modified: trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcproj
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\FDO\inc"
+ AdditionalIncludeDirectories="..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\CppUnit-1.9.14\include";"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\FDO\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/UnitTest/Common/FoundationTest/DotNetUnmanagedApi/DotNetUnmanagedApi.vcproj
===================================================================
--- trunk/MgDev/UnitTest/Common/FoundationTest/DotNetUnmanagedApi/DotNetUnmanagedApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/UnitTest/Common/FoundationTest/DotNetUnmanagedApi/DotNetUnmanagedApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry"
+ AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -126,7 +126,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MapGuideCommon\MapLayer"
+ AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MapGuideCommon\MapLayer"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -208,7 +208,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry"
+ AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -292,7 +292,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MapGuideCommon\MapLayer"
+ AdditionalIncludeDirectories="..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\Geometry;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MapGuideCommon\MapLayer"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/UnitTest/Common/FoundationTest/FoundationTest.vcproj
===================================================================
--- trunk/MgDev/UnitTest/Common/FoundationTest/FoundationTest.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/UnitTest/Common/FoundationTest/FoundationTest.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -197,7 +197,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
RuntimeLibrary="2"
WarningLevel="3"
@@ -272,7 +272,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Oem\Ace\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1"
RuntimeLibrary="2"
WarningLevel="3"
@@ -387,8 +387,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy ..\..\..\Oem\FDO\bin\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy ..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
copy ..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win32\VC7.1\Debug\xerces-c_2_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk

"
- AdditionalDependencies="..\..\..\Oem\FDO\bin\Debug\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug\xerces-c_2_5_0D.dll;..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win32\VC7.1\Debug\xerces-c_2_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll"
+ CommandLine="copy ..\..\..\Oem\FDO\bin\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug\xerces-c_3mg_5_0D.dll $(OutDir)
copy ..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
copy ..\..\..\Oem\dbxml\xerces-c-src\Build\Win32\VC7.1\Debug\xerces-c_3mg_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk

"
+ AdditionalDependencies="..\..\..\Oem\FDO\bin\Debug\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug\xerces-c_3mg_5_0D.dll;..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll;..\..\..\Oem\dbxml\xerces-c-src\Build\Win32\VC7.1\Debug\xerces-c_3mg_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -398,8 +398,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy ..\..\..\Oem\FDO\bin\Debug64\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug64\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug64\xerces-c_2_5_0D.dll $(OutDir)
copy ..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
copy ..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win64\VC7.1\Debug\xerces-c_2_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="..\..\..\Oem\FDO\bin\Debug64\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug64\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug64\xerces-c_2_5_0D.dll;..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win64\VC7.1\Debug\xerces-c_2_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.dll"
+ CommandLine="copy ..\..\..\Oem\FDO\bin\Debug64\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug64\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Debug64\xerces-c_3mg_5_0D.dll $(OutDir)
copy ..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll $(OutDir)
copy ..\..\..\Oem\dbxml\xerces-c-src\Build\Win64\VC7.1\Debug\xerces-c_3mg_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="..\..\..\Oem\FDO\bin\Debug64\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug64\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Debug64\xerces-c_3mg_5_0D.dll;..\..\..\Oem\ACE\ACE_wrappers\lib\ACEd.dll;..\..\..\Oem\dbxml\xerces-c-src\Build\Win64\VC7.1\Debug\xerces-c_3mg_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -409,8 +409,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy ..\..\..\Oem\FDO\bin\Release\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release\xerces-c_2_5_0D.dll $(OutDir)
copy ..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win32\VC7.1\Release\xerces-c_2_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="..\..\..\Oem\FDO\bin\Release\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release\xerces-c_2_5_0D.dll;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win32\VC7.1\Release\xerces-c_2_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll"
+ CommandLine="copy ..\..\..\Oem\FDO\bin\Release\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release\xerces-c_3mg_5_0D.dll $(OutDir)
copy ..\..\..\Oem\dbxml\xerces-c-src\Build\Win32\VC7.1\Release\xerces-c_3mg_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="..\..\..\Oem\FDO\bin\Release\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release\xerces-c_3mg_5_0D.dll;..\..\..\Oem\dbxml\xerces-c-src\Build\Win32\VC7.1\Release\xerces-c_3mg_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -420,8 +420,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy ..\..\..\Oem\FDO\bin\Release64\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release64\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release64\xerces-c_2_5_0D.dll $(OutDir)
copy ..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win64\VC7.1\Release\xerces-c_2_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="..\..\..\Oem\FDO\bin\Release64\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release64\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release64\xerces-c_2_5_0D.dll;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\Build\Win64\VC7.1\Release\xerces-c_2_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll"
+ CommandLine="copy ..\..\..\Oem\FDO\bin\Release64\Xalan-C_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release64\XalanMessages_1_7_0D.dll $(OutDir)
copy ..\..\..\Oem\FDO\bin\Release64\xerces-c_3mg_5_0D.dll $(OutDir)
copy ..\..\..\Oem\dbxml\xerces-c-src\Build\Win64\VC7.1\Release\xerces-c_3mg_7D.dll $(OutDir)
copy ..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="..\..\..\Oem\FDO\bin\Release64\Xalan-C_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release64\XalanMessages_1_7_0D.dll;..\..\..\Oem\FDO\bin\Release64\xerces-c_3mg_5_0D.dll;..\..\..\Oem\dbxml\xerces-c-src\Build\Win64\VC7.1\Release\xerces-c_3mg_7D.dll;..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
Modified: trunk/MgDev/Web/src/ApacheAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/ApacheAgent/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
mod_mgmapagent_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/dbxml-2.3.10/install/lib \
+ -L../../../Oem/dbxml/install/lib \
-L../../../Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
Modified: trunk/MgDev/Web/src/CgiAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/CgiAgent/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -43,7 +43,7 @@
mapagent_LDFLAGS = \
-L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/dbxml-2.3.10/install/lib \
+ -L../../../Oem/dbxml/install/lib \
-L../../../Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src""
+ AdditionalIncludeDirectories="..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\..\Oem\dbxml\xerces-c-src\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -67,7 +67,7 @@
AdditionalDependencies="ACEd.lib lib_jsond.lib"
OutputFile="$(OutDir)\MgHttpHandlerd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\jsoncpp\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml\lib";..\..\..\Oem\jsoncpp\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandlerd.pdb"
SubSystem="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -146,7 +146,7 @@
AdditionalDependencies="ACEd.lib lib_jsond.lib"
OutputFile="$(OutDir)\MgHttpHandlerd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\jsoncpp\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml\lib64";..\..\..\Oem\jsoncpp\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandlerd.pdb"
SubSystem="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -223,7 +223,7 @@
AdditionalDependencies="ACE.lib lib_json.lib"
OutputFile="$(OutDir)\MgHttpHandler.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\jsoncpp\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml\lib";..\..\..\Oem\jsoncpp\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandler.pdb"
SubSystem="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\dbxml\xerces-c-src\src";..\..\..\Oem\jsoncpp\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -302,7 +302,7 @@
AdditionalDependencies="ACE.lib lib_json.lib"
OutputFile="$(OutDir)\MgHttpHandler.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\jsoncpp\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml\lib64";..\..\..\Oem\jsoncpp\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandler.pdb"
SubSystem="2"
Modified: trunk/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/HttpHandler/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -10,7 +10,7 @@
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
-I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../Oem/dbxml/xerces-c-src/src \
-I../../../Oem/jsoncpp/include
lib_LTLIBRARIES = libMgHttpHandler.la
Modified: trunk/MgDev/Web/src/JavaApi/JavaApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/JavaApi/JavaApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/JavaApi/JavaApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JAVA"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JAVA"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JAVA"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JAVA"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/JavaApi/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/JavaApi/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -22,7 +22,7 @@
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml-2.3.10/xerces-c-src/src
+ -I../../../Oem/dbxml/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml-2.3.10/install/lib
+ -L../../../Oem/dbxml/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
Modified: trunk/MgDev/Web/src/MapGuideApi/copydlls.bat
===================================================================
--- trunk/MgDev/Web/src/MapGuideApi/copydlls.bat 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/MapGuideApi/copydlls.bat 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib\lib_json.dll" %WEB_BIN_RELEASE%
echo Copying Xerces Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\dbxml-2.3.10\bin\xerces-c_2_7.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "..\..\..\Oem\dbxml\bin\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%
echo Copying MgFoundation Release DLL to %WEB_BIN_RELEASE%
xcopy /r /d /y %COMMON_BIN_RELEASE%\MgFoundation.dll %WEB_BIN_RELEASE%
@@ -84,7 +84,7 @@
xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib64\lib_json.dll" %WEB_BIN_RELEASE%64
echo Copying Xerces Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\dbxml-2.3.10\bin64\xerces-c_2_7.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "..\..\..\Oem\dbxml\bin64\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%64
echo Copying MgFoundation Release DLL to %WEB_BIN_RELEASE%64
xcopy /r /d /y %COMMON_BIN_RELEASE%64\MgFoundation.dll %WEB_BIN_RELEASE%64
@@ -124,7 +124,7 @@
xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib\lib_jsond.dll" %WEB_BIN_DEBUG%
echo Copying Xerces Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\dbxml-2.3.10\bin\debug\xerces-c_2_7D.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%
echo Copying MgFoundation Debug DLL to %WEB_BIN_DEBUG%
xcopy /r /d /y %COMMON_BIN_DEBUG%\MgFoundationd.dll %WEB_BIN_DEBUG%
@@ -164,7 +164,7 @@
xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib64\lib_jsond.dll" %WEB_BIN_DEBUG%64
echo Copying Xerces Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\dbxml-2.3.10\bin64\debug\xerces-c_2_7D.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%64
echo Copying MgFoundation Debug DLL to %WEB_BIN_DEBUG%64
xcopy /r /d /y %COMMON_BIN_DEBUG%64\MgFoundationd.dll %WEB_BIN_DEBUG%64
Modified: trunk/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/PhpApi/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/PhpApi/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -22,7 +22,7 @@
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml-2.3.10/xerces-c-src/src
+ -I../../../Oem/dbxml/xerces-c-src/src
lib_LTLIBRARIES = libphp_MapGuideApi.la
@@ -52,7 +52,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml-2.3.10/install/lib
+ -L../../../Oem/dbxml/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
Modified: trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -65,10 +65,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib php5ts.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib php5ts.lib"
OutputFile="$(OutDir)\php_MapGuideApid.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\php\Release_TS"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml\lib";..\..\..\Oem\php\Release_TS"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\php_MapGuideApid.pdb"
SubSystem="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -145,10 +145,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib php5ts.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib php5ts.lib"
OutputFile="$(OutDir)\php_MapGuideApid.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\php\x64\Release_TS"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml\lib64";..\..\..\Oem\php\x64\Release_TS"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\php_MapGuideApid.pdb"
SubSystem="2"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -223,10 +223,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib php5ts.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib php5ts.lib"
OutputFile="$(OutDir)\php_MapGuideApi.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\php\Release_TS"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml\lib";..\..\..\Oem\php\Release_TS"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\php_MapGuideApi.pdb"
SubSystem="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
+ AdditionalIncludeDirectories="..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -303,10 +303,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib php5ts.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib php5ts.lib"
OutputFile="$(OutDir)\php_MapGuideApi.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\php\x64\Release_TS"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml\lib64";..\..\..\Oem\php\x64\Release_TS"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\php_MapGuideApi.pdb"
SubSystem="2"
Modified: trunk/MgDev/Web/src/WebApp/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/WebApp/Makefile.am 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/WebApp/Makefile.am 2010-10-26 23:50:18 UTC (rev 5338)
@@ -79,13 +79,13 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/dbxml-2.3.10/xerces-c-src/src \
+ -I../../../Oem/dbxml/xerces-c-src/src \
-I../../../Oem/ACE/ACE_wrappers
libMgWebApp_la_LIBADD = -lxerces-c -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon
libMgWebApp_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/dbxml-2.3.10/install/lib \
+ -L../../../Oem/dbxml/install/lib \
-L../../../Common/Foundation \
-L../../../Common/Geometry \
-L../../../Common/PlatformBase \
Modified: trunk/MgDev/Web/src/WebApp/WebApp.vcproj
===================================================================
--- trunk/MgDev/Web/src/WebApp/WebApp.vcproj 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/Web/src/WebApp/WebApp.vcproj 2010-10-26 23:50:18 UTC (rev 5338)
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgWebAppd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgWebAppd.pdb"
SubSystem="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -143,10 +143,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_3mgD.lib"
OutputFile="$(OutDir)\MgWebAppd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgWebAppd.pdb"
SubSystem="2"
@@ -202,7 +202,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -220,10 +220,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgWebApp.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgWebApp.pdb"
SubSystem="2"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml-2.3.10\xerces-c-src\src"
+ AdditionalIncludeDirectories="..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -299,10 +299,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib"
+ AdditionalDependencies="ACE.lib xerces-c_3mg.lib"
OutputFile="$(OutDir)\MgWebApp.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml\lib64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgWebApp.pdb"
SubSystem="2"
Modified: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh 2010-10-26 23:47:24 UTC (rev 5337)
+++ trunk/MgDev/build_oem.sh 2010-10-26 23:50:18 UTC (rev 5338)
@@ -268,18 +268,18 @@
}
#**********************************************************
-# Build BDBXML 2.3.10
+# Build BDBXML
# Notes: none
#**********************************************************
init_bdbxml()
{
- LIB_NAME="BDBXML 2.3.10"
+ LIB_NAME="BDBXML"
}
build_bdbxml()
{
- pushd dbxml-2.3.10
+ pushd dbxml
sh ./buildall.sh
check_build
popd
@@ -287,7 +287,7 @@
clean_bdbxml()
{
- pushd dbxml-2.3.10
+ pushd dbxml
sh ./buildall.sh --clean
check_clean
popd
More information about the mapguide-commits
mailing list