dbertoni 01/01/08 12:26:52
Modified: c/samples/CompileStylesheet CompileStylesheet.cpp
c/samples/ExternalFunction ExternalFunction.cpp
c/samples/SimpleTransform SimpleTransform.cpp
c/samples/StreamTransform StreamTransform.cpp
c/samples/ThreadSafe ThreadSafe.cpp
c/samples/TraceListen TraceListen.cpp
c/samples/UseStylesheetParam UseStylesheetParam.cpp
c/samples/XPathWrapper DLL.dsp TestDriver.dsp
XPathWrapper.cpp
Log:
Changes for latest API changes.
Revision Changes Path
1.16 +11 -9
xml-xalan/c/samples/CompileStylesheet/CompileStylesheet.cpp
Index: CompileStylesheet.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/samples/CompileStylesheet/CompileStylesheet.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CompileStylesheet.cpp 2000/12/01 15:20:37 1.15
+++ CompileStylesheet.cpp 2001/01/08 20:26:22 1.16
@@ -28,7 +28,6 @@
#include <XPath/XObjectFactoryDefault.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
@@ -44,8 +43,8 @@
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -78,10 +77,14 @@
// Initialize the Xalan XSLT subsystem...
XSLTInit
theInit;
- // Create the support objects that are
necessary for running the processor...
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some support objects that are
necessary for running the processor...
+ XalanSourceTreeDOMSupport
theDOMSupport;
+ XalanSourceTreeParserLiaison
theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+
theDOMSupport.setParserLiaison(&theParserLiaison);
+
+ // Create some more support objects.
XSLTProcessorEnvSupportDefault
theXSLTProcessorEnvSupport;
XObjectFactoryDefault
theXObjectFactory;
XPathFactoryDefault
theXPathFactory;
@@ -89,7 +92,6 @@
// Create a processor...
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -116,7 +118,7 @@
StylesheetExecutionContextDefault
theExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// Our input file. The assumption is that the
executable will be run
1.14 +11 -9 xml-xalan/c/samples/ExternalFunction/ExternalFunction.cpp
Index: ExternalFunction.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/samples/ExternalFunction/ExternalFunction.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExternalFunction.cpp 2000/12/01 15:26:40 1.13
+++ ExternalFunction.cpp 2001/01/08 20:26:25 1.14
@@ -32,7 +32,6 @@
#include <XPath/XObjectFactoryDefault.hpp>
#include <XPath/XPath.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
@@ -47,8 +46,8 @@
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -265,10 +264,14 @@
// Initialize the Xalan XSLT subsystem...
XSLTInit
theInit;
- // Create the support objects that are
necessary for running the processor...
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some support objects that are
necessary for running the processor...
+ XalanSourceTreeDOMSupport
theDOMSupport;
+ XalanSourceTreeParserLiaison
theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+
theDOMSupport.setParserLiaison(&theParserLiaison);
+
+ // Create some more support objects.
XSLTProcessorEnvSupportDefault
theXSLTProcessorEnvSupport;
XObjectFactoryDefault
theXObjectFactory;
XPathFactoryDefault
theXPathFactory;
@@ -276,7 +279,6 @@
// Create a processor...
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -295,7 +297,7 @@
StylesheetExecutionContextDefault
theExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// Our input files...
1.12 +11 -9 xml-xalan/c/samples/SimpleTransform/SimpleTransform.cpp
Index: SimpleTransform.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/SimpleTransform/SimpleTransform.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SimpleTransform.cpp 2000/12/01 15:54:45 1.11
+++ SimpleTransform.cpp 2001/01/08 20:26:28 1.12
@@ -26,7 +26,6 @@
#include <XPath/XObjectFactoryDefault.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
@@ -41,8 +40,8 @@
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -74,10 +73,14 @@
// Initialize the Xalan XSLT subsystem...
XSLTInit
theInit;
- // Create the support objects that are
necessary for running the processor...
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some support objects that are
necessary for running the processor...
+ XalanSourceTreeDOMSupport
theDOMSupport;
+ XalanSourceTreeParserLiaison
theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+
theDOMSupport.setParserLiaison(&theParserLiaison);
+
+ // Create some more support objects...
XSLTProcessorEnvSupportDefault
theXSLTProcessorEnvSupport;
XObjectFactoryDefault
theXObjectFactory;
XPathFactoryDefault
theXPathFactory;
@@ -85,7 +88,6 @@
// Create a processor...
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -104,7 +106,7 @@
StylesheetExecutionContextDefault
theExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// Our input files...The assumption is that the
executable will be run
1.3 +11 -9 xml-xalan/c/samples/StreamTransform/StreamTransform.cpp
Index: StreamTransform.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/StreamTransform/StreamTransform.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StreamTransform.cpp 2000/12/01 15:41:50 1.2
+++ StreamTransform.cpp 2001/01/08 20:26:31 1.3
@@ -18,7 +18,6 @@
#include <XPath/XObjectFactoryDefault.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
@@ -33,8 +32,8 @@
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -69,10 +68,14 @@
// Initialize the Xalan XSLT subsystem...
XSLTInit
theInit;
- // Create the support objects that are
necessary for running the processor...
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some support objects that are
necessary for running the processor...
+ XalanSourceTreeDOMSupport
theDOMSupport;
+ XalanSourceTreeParserLiaison
theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+
theDOMSupport.setParserLiaison(&theParserLiaison);
+
+ // Create some more support objects...
XSLTProcessorEnvSupportDefault
theXSLTProcessorEnvSupport;
XObjectFactoryDefault
theXObjectFactory;
XPathFactoryDefault
theXPathFactory;
@@ -80,7 +83,6 @@
// Create a processor...
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -99,7 +101,7 @@
StylesheetExecutionContextDefault
theExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// A simple input document...
1.11 +19 -18 xml-xalan/c/samples/ThreadSafe/ThreadSafe.cpp
Index: ThreadSafe.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/ThreadSafe/ThreadSafe.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ThreadSafe.cpp 2000/12/07 17:04:04 1.10
+++ ThreadSafe.cpp 2001/01/08 20:26:35 1.11
@@ -9,7 +9,6 @@
#include <DOMSupport/DOMSupportDefault.hpp>
#include <XPath/XObjectFactoryDefault.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
#include <XSLT/StylesheetConstructionContextDefault.hpp>
@@ -23,8 +22,8 @@
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -69,22 +68,21 @@
const int number = reinterpret_cast<int>(param);
const DWORD theThreadID = GetCurrentThreadId();
- // Create the support objects that are necessary for running the
processor...
- XercesDOMSupport theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some support objects that are necessary for running the
processor...
+ XalanSourceTreeDOMSupport theDOMSupport;
+ XalanSourceTreeParserLiaison theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+ theDOMSupport.setParserLiaison(&theParserLiaison);
+
+ // Create some more support objects.
XSLTProcessorEnvSupportDefault theXSLTProcessorEnvSupport;
XObjectFactoryDefault theXObjectFactory;
XPathFactoryDefault theXPathFactory;
- // The default is that documents are not thread-safe. Set this to
- // true so they are.
- theParserLiaison.setThreadSafe(true);
-
// Create a processor...and output the start message.
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -100,7 +98,7 @@
StylesheetExecutionContextDefault ssExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// Set the XSLTInputSource...
@@ -196,11 +194,15 @@
{
// Initialize the Xalan XSLT subsystem...
XSLTInit
theInit;
+
+ // Create some support objects that are
necessary for running the processor...
+ XalanSourceTreeDOMSupport
ssDOMSupport;
+ XalanSourceTreeParserLiaison
ssParserLiaison(ssDOMSupport);
+
+ // Hook the two together...
+ ssDOMSupport.setParserLiaison(&ssParserLiaison);
- // Create the support objects required to run
the processor...
- XercesDOMSupport
ssDOMSupport;
- XercesParserLiaison
ssParserLiaison(ssDOMSupport);
- XPathSupportDefault
ssXPathSupport(ssDOMSupport);
+ // Create some more support objects.
XSLTProcessorEnvSupportDefault
ssXSLTProcessorEnvSupport;
XObjectFactoryDefault
ssXObjectFactory;
XPathFactoryDefault
ssXPathFactory;
@@ -211,7 +213,6 @@
XSLTEngineImpl ssProcessor(
ssParserLiaison,
- ssXPathSupport,
ssXSLTProcessorEnvSupport,
ssDOMSupport,
ssXObjectFactory,
1.8 +11 -9 xml-xalan/c/samples/TraceListen/TraceListen.cpp
Index: TraceListen.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/TraceListen/TraceListen.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TraceListen.cpp 2000/12/01 15:58:45 1.7
+++ TraceListen.cpp 2001/01/08 20:26:39 1.8
@@ -28,14 +28,13 @@
#include <XPath/XObjectFactoryDefault.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
#include <XPath/XPathProcessorImpl.hpp>
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -108,10 +107,14 @@
// Initialize the Xalan XSLT subsystem...
XSLTInit
theInit;
- // Create the support objects that are necessary for
running the processor...
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some support objects that are necessary for
running the processor...
+ XalanSourceTreeDOMSupport theDOMSupport;
+ XalanSourceTreeParserLiaison
theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+ theDOMSupport.setParserLiaison(&theParserLiaison);
+
+ // Create some more support objects.
XSLTProcessorEnvSupportDefault
theXSLTProcessorEnvSupport;
XObjectFactoryDefault
theXObjectFactory;
XPathFactoryDefault
theXPathFactory;
@@ -119,7 +122,6 @@
// Create a processor...
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -138,7 +140,7 @@
StylesheetExecutionContextDefault
theExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// Our input files...The assumption is that the
executable will be run
1.10 +16 -13
xml-xalan/c/samples/UseStylesheetParam/UseStylesheetParam.cpp
Index: UseStylesheetParam.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/samples/UseStylesheetParam/UseStylesheetParam.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UseStylesheetParam.cpp 2000/12/01 16:01:11 1.9
+++ UseStylesheetParam.cpp 2001/01/08 20:26:43 1.10
@@ -11,9 +11,9 @@
#include <iostream>
#endif
+
+
#include <util/PlatformUtils.hpp>
-#include <parsers/DOMParser.hpp>
-#include <dom/DOM_Node.hpp>
@@ -26,7 +26,6 @@
#include <XPath/XObjectFactoryDefault.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathFactoryDefault.hpp>
@@ -41,8 +40,8 @@
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -83,17 +82,22 @@
// containing the input files.
const XalanDOMString theXMLFileName("foo.xml");
const XalanDOMString theXSLFileName("foo.xsl");
- XSLTInputSource
theInputSource(c_wstr(theXMLFileName));
- XSLTInputSource
theStylesheetSource(c_wstr(theXSLFileName));
+
+ const XSLTInputSource
theInputSource(c_wstr(theXMLFileName));
+ const XSLTInputSource
theStylesheetSource(c_wstr(theXSLFileName));
// The output target...
const XalanDOMString theOutputFile("foo.out");
XSLTResultTarget
theResultTarget(theOutputFile);
+
+ // Create some support objects that are necessary for
running the processor...
+ XalanSourceTreeDOMSupport theDOMSupport;
+ XalanSourceTreeParserLiaison
theParserLiaison(theDOMSupport);
+
+ // Hook the two together...
+ theDOMSupport.setParserLiaison(&theParserLiaison);
- // Create the support objects that are necessary for
running the processor...
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theParserLiaison(theDOMSupport);
- XPathSupportDefault
theXPathSupport(theDOMSupport);
+ // Create some more support objects.
XSLTProcessorEnvSupportDefault
theXSLTProcessorEnvSupport;
XObjectFactoryDefault
theXObjectFactory;
XPathFactoryDefault
theXPathFactory;
@@ -101,7 +105,6 @@
// Create a processor...
XSLTEngineImpl theProcessor(
theParserLiaison,
- theXPathSupport,
theXSLTProcessorEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -121,7 +124,7 @@
StylesheetExecutionContextDefault
theExecutionContext(
theProcessor,
theXSLTProcessorEnvSupport,
- theXPathSupport,
+ theDOMSupport,
theXObjectFactory);
// Set the stylesheet parameter.
1.6 +2 -2 xml-xalan/c/samples/XPathWrapper/DLL.dsp
Index: DLL.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/DLL.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DLL.dsp 2000/11/27 20:05:03 1.5
+++ DLL.dsp 2001/01/08 20:26:46 1.6
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib
..\..\Build\Win32\VC6\Release\XPath.lib
..\..\Build\Win32\VC6\Release\DOMSupport.lib
..\..\Build\Win32\VC6\Release\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Release\XalanDOM.lib
..\..\Build\Win32\VC6\Release\PlatformSupport.lib /nologo /dll /machine:I386
/out:"..\..\Build\Win32\VC6\Release/XPathWrapper.dll"
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib
..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Release\XalanDOM.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib
..\..\Build\Win32\VC6\Release\XalanSourceTree.lib /nologo /dll /machine:I386
/out:"..\..\Build\Win32\VC6\Release/XPathWrapper.dll"
!ELSEIF "$(CFG)" == "DLL - Win32 Debug"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib
..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Debug\XalanDOM.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib /nologo /dll /map /debug
/machine:I386 /out:"..\..\Build\Win32\VC6\Debug/XPathWrapper.dll" /pdbtype:sept
+# ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib
..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib
..\..\Build\Win32\VC6\Debug\XalanDOM.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib
..\..\Build\Win32\VC6\Debug\XalanSourceTree.lib /nologo /dll /map /debug
/machine:I386 /out:"..\..\Build\Win32\VC6\Debug/XPathWrapper.dll" /pdbtype:sept
!ENDIF
1.6 +2 -2 xml-xalan/c/samples/XPathWrapper/TestDriver.dsp
Index: TestDriver.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/TestDriver.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestDriver.dsp 2000/11/27 20:05:06 1.5
+++ TestDriver.dsp 2001/01/08 20:26:47 1.6
@@ -50,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib ..\..\Build\Win32\VC6\Release\XalanDOM.lib
..\..\Build\Win32\VC6\Release\PlatformSupport.lib /nologo /subsystem:console
/machine:I386
+# ADD LINK32 ..\..\Build\Win32\VC6\Release\*.lib /nologo /subsystem:console
/machine:I386
!ELSEIF "$(CFG)" == "TestDriver - Win32 Debug"
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 ..\..\Build\Win32\VC6\Debug\XalanDOM.lib
..\..\Build\Win32\VC6\Debug\PlatformSupport.lib /nologo /subsystem:console /map
/debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ..\..\Build\Win32\VC6\Debug\*.lib /nologo /subsystem:console
/map /debug /machine:I386 /pdbtype:sept
!ENDIF
1.11 +15 -14 xml-xalan/c/samples/XPathWrapper/XPathWrapper.cpp
Index: XPathWrapper.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/XPathWrapper.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathWrapper.cpp 2000/12/01 16:15:41 1.10
+++ XPathWrapper.cpp 2001/01/08 20:26:48 1.11
@@ -32,7 +32,7 @@
-#include <DOMSupport/DOMSupportDefault.hpp>
+#include <DOMSupport/DOMServices.hpp>
@@ -41,15 +41,14 @@
#include <XPath/XPathEnvSupportDefault.hpp>
#include <XPath/XPathExecutionContextDefault.hpp>
#include <XPath/XPathInit.hpp>
-#include <XPath/XPathSupportDefault.hpp>
#include <XPath/XPathProcessorImpl.hpp>
#include <XPath/XPathFactoryDefault.hpp>
#include <XPath/ElementPrefixResolverProxy.hpp>
-#include <XercesParserLiaison/XercesParserLiaison.hpp>
-#include <XercesParserLiaison/XercesDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeDOMSupport.hpp>
+#include <XalanSourceTree/XalanSourceTreeParserLiaison.hpp>
@@ -92,10 +91,13 @@
// Initialize the XPath subsystem...
XPathInit
theInit;
- // parse the XML file
- XercesDOMSupport
theDOMSupport;
- XercesParserLiaison
theLiaison(theDOMSupport);
+ // We'll use these to parse the XML file.
+ XalanSourceTreeDOMSupport theDOMSupport;
+ XalanSourceTreeParserLiaison
theLiaison(theDOMSupport);
+ // Hook the two together...
+ theDOMSupport.setParserLiaison(&theLiaison);
+
XalanElement* rootElem = 0;
try
@@ -118,9 +120,8 @@
// configure the objects needed for XPath to work with
the Xerces DOM
XPathEnvSupportDefault theEnvSupport;
- XPathSupportDefault
theSupport(theDOMSupport);
XObjectFactoryDefault
theXObjectFactory;
- XPathExecutionContextDefault
theExecutionContext(theEnvSupport, theSupport, theXObjectFactory);
+ XPathExecutionContextDefault
theExecutionContext(theEnvSupport, theDOMSupport, theXObjectFactory);
XPathFactoryDefault
theXPathFactory;
XPathProcessorImpl
theXPathProcessor;
@@ -131,12 +132,12 @@
theXPathProcessor.initXPath(*contextXPath,
TranscodeFromLocalCodePage(context),
-
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
+
ElementPrefixResolverProxy(rootElem, theEnvSupport, theDOMSupport),
theEnvSupport);
XObjectPtr xObj =
contextXPath->execute(rootElem,
-
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
+
ElementPrefixResolverProxy(rootElem, theEnvSupport, theDOMSupport),
theExecutionContext);
const NodeRefListBase& contextNodeList =
xObj->nodeset();
@@ -171,11 +172,11 @@
XPath* const xpath =
theXPathFactory.create();
theXPathProcessor.initXPath(*xpath,
TranscodeFromLocalCodePage(expr),
-
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
+
ElementPrefixResolverProxy(rootElem, theEnvSupport,
theDOMSupport),
theEnvSupport);
xObj =
xpath->execute(contextNodeList.item(0),
-
ElementPrefixResolverProxy(rootElem, theEnvSupport, theSupport),
+
ElementPrefixResolverProxy(rootElem, theEnvSupport, theDOMSupport),
theExecutionContext);
// now encode the results. For all
types but nodelist, we'll just convert it to a string
@@ -200,7 +201,7 @@
else if
(theType == XalanNode::ELEMENT_NODE)
str =
node->getNodeName();
else
-
theSupport.getNodeData(*node, str);
+
DOMServices::getNodeData(*node, str);
theResultList.push_back(TranscodeToLocalCodePage(str));
}
