[mapguide-commits] r5027 - in sandbox/rfc102/MgDev: . Server/src/Core Server/src/Services/Resource

[svn_mapguide at osgeo.org]

Author: rohitr
Date: 2010-07-12 13:31:01 +0000 (Mon, 12 Jul 2010)
New Revision: 5027

Modified:
   sandbox/rfc102/MgDev/Server/src/Core/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Resource/Makefile.am
   sandbox/rfc102/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h
   sandbox/rfc102/MgDev/Server/src/Services/Resource/ServerResourceServiceBuild.cpp
   sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.cpp
   sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.h
   sandbox/rfc102/MgDev/build_oem.sh
Log:
Update that allows compilation of the dbxml upgrade.


Modified: sandbox/rfc102/MgDev/Server/src/Core/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Core/Makefile.am	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/Server/src/Core/Makefile.am	2010-07-12 13:31:01 UTC (rev 5027)
@@ -96,8 +96,10 @@
   -ldwftk \
   -ldwfemap \
   -lexpat \
-  -lFDO-3.5.0 \
+  -lFDO-3.6.0 \
   -lExpressionEngine \
+  -lxalanMsg \
+  -lxalan-c \
   -lxerces-c \
   -lxqilla \
   -lMgFoundation \
@@ -129,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$/usr/local/lib \
+  -R/usr/local/lib \
   -R$(map_srcdir)/Common/CoordinateSystem/.libs \
   -R$(map_srcdir)/Common/MdfModel/.libs \
   -R$(map_srcdir)/Common/MdfParser/.libs \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Resource/Makefile.am
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Resource/Makefile.am	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/Server/src/Services/Resource/Makefile.am	2010-07-12 13:31:01 UTC (rev 5027)
@@ -191,7 +191,7 @@
   SystemResourceContentManager.h \
   TagInfo.h \
   TagManager.h \
-  xercesDomTranslator.cpp \
+  xercesDomTranslator.h \
   XmlSchemaResolver.h \
   ZipFileHandler.h \
   ZipFileReader.h \

Modified: sandbox/rfc102/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/Server/src/Services/Resource/ResourceServiceDefs.h	2010-07-12 13:31:01 UTC (rev 5027)
@@ -21,7 +21,7 @@
 #include "MapGuideCommon.h"
 #include "System/XmlDefs.h"
 #include "System/XmlUtil.h"
-#include "xercesDomTranslator.hpp"
+#include "xercesDomTranslator.h"
 
 #include <assert.h>
 #include <map>

Modified: sandbox/rfc102/MgDev/Server/src/Services/Resource/ServerResourceServiceBuild.cpp
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Resource/ServerResourceServiceBuild.cpp	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/Server/src/Services/Resource/ServerResourceServiceBuild.cpp	2010-07-12 13:31:01 UTC (rev 5027)
@@ -99,3 +99,4 @@
 #include "ZipFileHandler.cpp"
 #include "ZipFileReader.cpp"
 #include "ZipFileWriter.cpp"
+#include "xercesDomTranslator.cpp"

Modified: sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.cpp
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.cpp	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.cpp	2010-07-12 13:31:01 UTC (rev 5027)
@@ -12,7 +12,7 @@
 // from Xerces-C DOM documents.
 
 
-#include "xercesDomTranslator.hpp"
+#include "xercesDomTranslator.h"
 #include <xercesc/dom/DOMImplementation.hpp>
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>

Modified: sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.h
===================================================================
--- sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.h	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/Server/src/Services/Resource/xercesDomTranslator.h	2010-07-12 13:31:01 UTC (rev 5027)
@@ -11,8 +11,9 @@
 // and XmlEventWriter interfaces to translate documents to and
 // from Xerces-C DOM documents.
 
+#ifndef MGXERCESDOMTRANSLATOR_H_
+#define MGXERCESDOMTRANSLATOR_H_
 
-
 #include <dbxml/DbXml.hpp>
 #include <xercesc/dom/DOMDocument.hpp>
 
@@ -92,3 +93,4 @@
 XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getContentAsDOM(
         const DbXml::XmlValue &value);
 
+#endif

Modified: sandbox/rfc102/MgDev/build_oem.sh
===================================================================
--- sandbox/rfc102/MgDev/build_oem.sh	2010-07-12 06:56:18 UTC (rev 5026)
+++ sandbox/rfc102/MgDev/build_oem.sh	2010-07-12 13:31:01 UTC (rev 5027)
@@ -268,32 +268,6 @@
 }
 
 #**********************************************************
-# Build BDBXML 2.3.10
-# Notes: none
-#**********************************************************
-
-init_bdbxml()
-{
-    LIB_NAME="BDBXML 2.3.10"
-}
-
-build_bdbxml()
-{
-    pushd dbxml-2.3.10
-    sh ./buildall.sh
-    check_build
-    popd
-}
-
-clean_bdbxml()
-{
-    pushd dbxml-2.3.10
-    sh ./buildall.sh --clean
-    check_clean
-    popd
-}
-
-#**********************************************************
 # Build CPPUNIT 1.9.14
 # Notes: none
 #**********************************************************
@@ -573,7 +547,7 @@
 #**********************************************************
 
 pushd Oem
-for lib in ace dwfcore dwftk dwfemap geos php swigex bdbxml cppunit imake zlib libpng jpeg freetype gd agg json csmap;
+for lib in ace dwfcore dwftk dwfemap geos php swigex  cppunit imake zlib libpng jpeg freetype gd agg json csmap;
 do
     echo "$lib: Initialization..........................."
     init_"$lib"