From 9dd6ac00dd4dc3d426c676404036795fc954f031 Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Sat, 23 Jul 2005 21:11:41 +0000
Subject: [PATCH] DOM Level 3 Load and Save: updated interfaces
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@224543 13f79535-47bb-0310-9956-ffa450edef68
---
.../Xerces-all/XercesLib/XercesLib.mak | 11 +-
.../VC6/xerces-all/XercesLib/XercesLib.dsp | 64 +-
.../CreateDOMDocument.vcproj | 1 +
.../VC7.1/xerces-all/DOMCount/DOMCount.vcproj | 1 +
.../xerces-all/DOMMemTest/DOMMemTest.vcproj | 1 +
.../DOMNormalizerTest.vcproj | 1 +
.../VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj | 1 +
.../VC7.1/xerces-all/DOMTest/DOMTest.vcproj | 1 +
.../DOMTraversalTest/DOMTraversalTest.vcproj | 1 +
.../DOMTypeInfoTest/DOMTypeInfoTest.vcproj | 1 +
.../DeprecatedDOMCount.vcproj | 1 +
.../EncodingTest/EncodingTest.vcproj | 1 +
.../VC7.1/xerces-all/EnumVal/EnumVal.vcproj | 1 +
.../InitTermTest/InitTermTest.vcproj | 1 +
.../MemHandlerTest/MemHandlerTest.vcproj | 1 +
.../VC7.1/xerces-all/MemParse/MemParse.vcproj | 1 +
.../VC7.1/xerces-all/PParse/PParse.vcproj | 1 +
.../xerces-all/PSVIWriter/PSVIWriter.vcproj | 1 +
.../xerces-all/RangeTest/RangeTest.vcproj | 1 +
.../VC7.1/xerces-all/Redirect/Redirect.vcproj | 1 +
.../xerces-all/SAX2Count/SAX2Count.vcproj | 1 +
.../xerces-all/SAX2Print/SAX2Print.vcproj | 1 +
.../VC7.1/xerces-all/SAXCount/SAXCount.vcproj | 1 +
.../VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj | 1 +
.../VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj | 1 +
.../VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj | 1 +
.../xerces-all/StdInParse/StdInParse.vcproj | 1 +
.../xerces-all/ThreadTest/ThreadTest.vcproj | 1 +
.../xerces-all/XSValueTest/XSValueTest.vcproj | 1 +
.../XSerializerTest/XSerializerTest.vcproj | 1 +
.../XercesLib/XercesDeprecatedDOMLib.vcproj | 1 +
.../xerces-all/XercesLib/XercesLib.vcproj | 67 +-
.../xerces-all/xerces-com/xerces-com.vcproj | 1 +
samples/src/DOMCount/DOMCount.cpp | 23 +-
samples/src/DOMPrint/DOMPrint.cpp | 43 +-
samples/src/DOMPrint/DOMPrintFilter.cpp | 9 +-
samples/src/DOMPrint/DOMPrintFilter.hpp | 6 +-
scripts/sanityTest_ExpectedResult.log | 6 +-
src/Makefile.am | 24 +-
src/Makefile.in | 62 +-
src/xercesc/dom/DOM.hpp | 9 +-
src/xercesc/dom/DOMBuilder.hpp | 685 ----------------
src/xercesc/dom/DOMConfiguration.hpp | 89 +-
src/xercesc/dom/DOMEntityResolver.hpp | 24 +-
src/xercesc/dom/DOMImplementation.hpp | 47 +-
src/xercesc/dom/DOMImplementationLS.hpp | 102 +--
src/xercesc/dom/DOMLSException.cpp | 80 ++
src/xercesc/dom/DOMLSException.hpp | 168 ++++
src/xercesc/dom/DOMLSInput.hpp | 257 ++++++
.../{DOMInputSource.hpp => DOMLSOutput.hpp} | 22 +-
src/xercesc/dom/DOMLSParser.hpp | 765 ++++++++++++++++++
src/xercesc/dom/DOMLSParserFilter.hpp | 163 ++++
.../{DOMWriter.hpp => DOMLSSerializer.hpp} | 244 +++---
...erFilter.hpp => DOMLSSerializerFilter.hpp} | 45 +-
src/xercesc/dom/impl/DOMConfigurationImpl.cpp | 271 +++----
src/xercesc/dom/impl/DOMConfigurationImpl.hpp | 38 +-
.../dom/impl/DOMImplementationImpl.cpp | 45 +-
.../dom/impl/DOMImplementationImpl.hpp | 14 +-
...WriterImpl.cpp => DOMLSSerializerImpl.cpp} | 128 +--
src/xercesc/dom/impl/DOMLSSerializerImpl.hpp | 230 ++++++
src/xercesc/dom/impl/DOMWriterImpl.hpp | 434 ----------
.../framework/LocalFileFormatTarget.cpp | 2 +-
src/xercesc/framework/MemBufFormatTarget.hpp | 2 +-
...InputSource.cpp => Wrapper4DOMLSInput.cpp} | 36 +-
...InputSource.hpp => Wrapper4DOMLSInput.hpp} | 37 +-
src/xercesc/framework/Wrapper4InputSource.cpp | 2 +-
src/xercesc/framework/Wrapper4InputSource.hpp | 10 +-
src/xercesc/parsers/AbstractDOMParser.hpp | 2 +-
...DOMBuilderImpl.cpp => DOMLSParserImpl.cpp} | 568 +++++++------
...DOMBuilderImpl.hpp => DOMLSParserImpl.hpp} | 560 ++++---------
src/xercesc/util/XMLUni.cpp | 127 ++-
src/xercesc/util/XMLUni.hpp | 23 +-
tests/src/DOM/Normalizer/Normalizer.cpp | 12 +-
tests/src/MemHandlerTest/MemoryMonitor.cpp | 28 +-
tests/src/MemHandlerTest/MemoryMonitor.hpp | 2 +-
tests/src/ThreadTest/ThreadTest.cpp | 4 +-
76 files changed, 3045 insertions(+), 2575 deletions(-)
delete mode 100644 src/xercesc/dom/DOMBuilder.hpp
create mode 100644 src/xercesc/dom/DOMLSException.cpp
create mode 100644 src/xercesc/dom/DOMLSException.hpp
create mode 100644 src/xercesc/dom/DOMLSInput.hpp
rename src/xercesc/dom/{DOMInputSource.hpp => DOMLSOutput.hpp} (94%)
create mode 100644 src/xercesc/dom/DOMLSParser.hpp
create mode 100644 src/xercesc/dom/DOMLSParserFilter.hpp
rename src/xercesc/dom/{DOMWriter.hpp => DOMLSSerializer.hpp} (69%)
rename src/xercesc/dom/{DOMWriterFilter.hpp => DOMLSSerializerFilter.hpp} (71%)
rename src/xercesc/dom/impl/{DOMWriterImpl.cpp => DOMLSSerializerImpl.cpp} (93%)
create mode 100644 src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
delete mode 100644 src/xercesc/dom/impl/DOMWriterImpl.hpp
rename src/xercesc/framework/{Wrapper4DOMInputSource.cpp => Wrapper4DOMLSInput.cpp} (69%)
rename src/xercesc/framework/{Wrapper4DOMInputSource.hpp => Wrapper4DOMLSInput.hpp} (84%)
rename src/xercesc/parsers/{DOMBuilderImpl.cpp => DOMLSParserImpl.cpp} (60%)
rename src/xercesc/parsers/{DOMBuilderImpl.hpp => DOMLSParserImpl.hpp} (52%)
diff --git a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
index 1fe8d9239..c1aa9cc51 100644
--- a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
@@ -287,10 +287,11 @@ OBJFILES = $(TARGETPATH)\obj\XercesLib.obj \
$(TARGETPATH)\obj\DOMRangeException.obj \
$(TARGETPATH)\obj\DOMImplementationImpl.obj \
$(TARGETPATH)\obj\DOMImplementationRegistry.obj \
- $(TARGETPATH)\obj\DOMBuilderImpl.obj \
- $(TARGETPATH)\obj\DOMWriterImpl.obj \
+ $(TARGETPATH)\obj\DOMLSParserImpl.obj \
+ $(TARGETPATH)\obj\DOMLSSerializerImpl.obj \
+ $(TARGETPATH)\obj\DOMLSException.obj \
$(TARGETPATH)\obj\Wrapper4InputSource.obj \
- $(TARGETPATH)\obj\Wrapper4DOMInputSource.obj \
+ $(TARGETPATH)\obj\Wrapper4DOMLSInput.obj \
$(TARGETPATH)\obj\DOMLocatorImpl.obj \
$(TARGETPATH)\obj\DOMErrorImpl.obj \
$(TARGETPATH)\obj\MemBufFormatTarget.obj \
@@ -383,8 +384,8 @@ XERCES_NO_ASM=;XERCES_NO_ASM
!endif
USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;$(DEPRDOM_DEFINE)$(XERCES_NO_ASM)
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
-INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Platforms\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
-LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Platforms\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
+INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
+LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
WARNINGS= -w-par
# ---------------------------------------------------------------------------
CFLAG1 = -tWD -Od -Vx -Ve -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index f83353202..aa9fe1fef 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -1385,11 +1385,11 @@ SOURCE=..\..\..\..\..\src\xercesc\framework\ValidationContext.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\framework\Wrapper4DOMInputSource.cpp
+SOURCE=..\..\..\..\..\src\xercesc\framework\Wrapper4DOMLSInput.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\framework\Wrapper4DOMInputSource.hpp
+SOURCE=..\..\..\..\..\src\xercesc\framework\Wrapper4DOMLSInput.hpp
# End Source File
# Begin Source File
@@ -1841,11 +1841,11 @@ SOURCE=..\..\..\..\..\src\xercesc\parsers\AbstractDOMParser.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\parsers\DOMBuilderImpl.cpp
+SOURCE=..\..\..\..\..\src\xercesc\parsers\DOMLSParserImpl.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\parsers\DOMBuilderImpl.hpp
+SOURCE=..\..\..\..\..\src\xercesc\parsers\DOMLSParserImpl.hpp
# End Source File
# Begin Source File
@@ -2844,6 +2844,14 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLocatorImpl.hpp
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLSSerializerImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMLSSerializerImpl.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMNamedNodeMapImpl.cpp
# End Source File
# Begin Source File
@@ -2964,14 +2972,6 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMWriterImpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMWriterImpl.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\src\xercesc\dom\impl\XSDElementNSImpl.cpp
# End Source File
# Begin Source File
@@ -2985,10 +2985,6 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMAttr.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\dom\DOMBuilder.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\src\xercesc\dom\DOMCDATASection.hpp
# End Source File
# Begin Source File
@@ -3073,11 +3069,35 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMImplementationSource.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\dom\DOMInputSource.hpp
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLocator.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSException.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLocator.hpp
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSException.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSInput.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSParser.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSParserFilter.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSSerializer.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\dom\DOMLSSerializerFilter.hpp
# End Source File
# Begin Source File
@@ -3141,14 +3161,6 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMUserDataHandler.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\dom\DOMWriter.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\xercesc\dom\DOMWriterFilter.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\src\xercesc\dom\DOMXPathEvaluator.hpp
# End Source File
# Begin Source File
diff --git a/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj b/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
index ee7509a16..e837b40ab 100644
--- a/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/CreateDOMDocument.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
index c5e99f420..eeaee36c3 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
@@ -84,6 +84,7 @@
AdditionalIncludeDirectories="..\..\..\..\..\src"
PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMCount.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
index f085c0fdd..c59461f59 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
@@ -85,6 +85,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMMemTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
index 6ce30988d..348443289 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
@@ -85,6 +85,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMNormalizerTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
index e47b050db..d7697b740 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
@@ -85,6 +85,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMPrint.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
index f2d1e96b5..c1dd3e8af 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
@@ -85,6 +85,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
index 3f111ceb9..7e2aab7e0 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
@@ -87,6 +87,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMTraversalTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj b/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
index bc6007e00..935508a97 100644
--- a/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
@@ -87,6 +87,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DOMTypeInfoTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj b/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj
index 3f9ec828d..975d24e08 100644
--- a/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj
@@ -85,6 +85,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/DeprecatedDOMCount.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj b/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
index 51cb774a6..82c7bfe59 100644
--- a/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
@@ -85,6 +85,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/EncodingTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj b/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
index 253b774dc..b06653397 100644
--- a/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/EnumVal.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj b/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
index 2f69bbdd9..fe5381702 100644
--- a/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
@@ -85,6 +85,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/InitTermTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
index 9933963d6..a985140a9 100644
--- a/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
@@ -86,6 +86,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/MemHandlerTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj b/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
index ad692b2bd..8f661e782 100644
--- a/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/MemParse.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj b/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
index 7342e918a..8ff5661a6 100644
--- a/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
@@ -87,6 +87,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/PParse.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj b/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
index cfb7d8789..3c04b9fe7 100644
--- a/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
@@ -85,6 +85,7 @@
PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/PSVIWriter.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj b/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
index c0ac55014..0212e9783 100644
--- a/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/RangeTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj b/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
index 8d76cb7cb..892921721 100644
--- a/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/Redirect.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj b/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
index d305d8157..8a2465d02 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/SAX2Count.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj b/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
index 3b2d9c7ca..55608a6f7 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/SAX2Print.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj b/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
index e2da98e1d..6ecc93dd2 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/SAXCount.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj b/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
index c13097195..9f19f024b 100644
--- a/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
@@ -86,6 +86,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/SAXPrint.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj b/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
index 2c749cc74..f787fcec5 100644
--- a/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
@@ -84,6 +84,7 @@
PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/SCMPrint.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj b/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
index 66fb4a5b8..5d1124146 100644
--- a/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
@@ -87,6 +87,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/SEnumVal.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj b/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
index 9e1a7705a..edbc25018 100644
--- a/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
@@ -87,6 +87,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/StdInParse.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj b/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
index 2ff17dafe..bd66b34ea 100644
--- a/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
@@ -83,6 +83,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/ThreadTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj b/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
index 2c58fe238..a516b7370 100644
--- a/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
@@ -26,6 +26,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/XSValueTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj b/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
index a0100dc28..9dac08d94 100644
--- a/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
@@ -83,6 +83,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/XSerializerTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
index 4a18eeb72..2666862cd 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
@@ -93,6 +93,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC;XERCES_BUILDING_DEPRECATED_LIBRARY"
RuntimeLibrary="3"
DisableLanguageExtensions="TRUE"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/XercesDeprecatedDOMLib.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index e2eb0c249..42d6a6bba 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -95,6 +95,7 @@
AdditionalIncludeDirectories="..\..\..\..\..\src"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;_DEBUG;WIN32;_WINDOWS;XERCES_BUILDING_LIBRARY;XERCES_USE_TRANSCODER_WINDOWS;XERCES_USE_WIN32_MSGLOADER;XERCES_USE_NETACCESSOR_WINSOCK;XERCES_USE_FILEMGR_WINDOWS;XERCES_USE_MUTEXMGR_WINDOWS;XERCES_USE_ATOMICOPMGR_WINDOWS;XERCES_PATH_DELIMITER_BACKSLASH;HAVE_STRICMP;HAVE_STRNICMP;HAVE_LIMITS_H;HAVE_SYS_TIMEB_H;HAVE_FTIME"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/XercesLib.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
@@ -475,7 +476,8 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="echo copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
-copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
+copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
+"
AdditionalDependencies="$(InputDir)\$(InputName).msvc.hpp"
Outputs="$(InputPath)"/>
</FileConfiguration>
@@ -484,7 +486,8 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<Tool
Name="VCCustomBuildTool"
CommandLine="echo copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
-copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
+copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
+"
AdditionalDependencies="$(InputDir)\$(InputName).msvc.hpp"
Outputs="$(InputPath)"/>
</FileConfiguration>
@@ -493,7 +496,8 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<Tool
Name="VCCustomBuildTool"
CommandLine="echo copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
-copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
+copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
+"
AdditionalDependencies="$(InputDir)\$(InputName).msvc.hpp"
Outputs="$(InputPath)"/>
</FileConfiguration>
@@ -502,7 +506,8 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<Tool
Name="VCCustomBuildTool"
CommandLine="echo copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
-copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
+copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)
+"
AdditionalDependencies="$(InputDir)\$(InputName).msvc.hpp"
Outputs="$(InputPath)"/>
</FileConfiguration>
@@ -1193,10 +1198,10 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
RelativePath="..\..\..\..\..\src\xercesc\framework\ValidationContext.hpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\framework\Wrapper4DOMInputSource.cpp">
+ RelativePath="..\..\..\..\..\src\xercesc\framework\Wrapper4DOMLSInput.cpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\framework\Wrapper4DOMInputSource.hpp">
+ RelativePath="..\..\..\..\..\src\xercesc\framework\Wrapper4DOMLSInput.hpp">
</File>
<File
RelativePath="..\..\..\..\..\src\xercesc\framework\Wrapper4InputSource.cpp">
@@ -1677,10 +1682,10 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
RelativePath="..\..\..\..\..\src\xercesc\parsers\AbstractDOMParser.hpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\parsers\DOMBuilderImpl.cpp">
+ RelativePath="..\..\..\..\..\src\xercesc\parsers\DOMLSParserImpl.cpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\parsers\DOMBuilderImpl.hpp">
+ RelativePath="..\..\..\..\..\src\xercesc\parsers\DOMLSParserImpl.hpp">
</File>
<File
RelativePath="..\..\..\..\..\src\xercesc\parsers\SAX2XMLFilterImpl.cpp">
@@ -2314,9 +2319,6 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMAttr.hpp">
</File>
- <File
- RelativePath="..\..\..\..\..\src\xercesc\dom\DOMBuilder.hpp">
- </File>
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMCDATASection.hpp">
</File>
@@ -2381,10 +2383,31 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMImplementationSource.hpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\dom\DOMInputSource.hpp">
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLocator.hpp">
</File>
<File
- RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLocator.hpp">
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSException.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSException.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSInput.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSOutput.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSParser.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSParserFilter.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSSerializer.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\DOMLSSerializerFilter.hpp">
</File>
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMNamedNodeMap.hpp">
@@ -2428,12 +2451,6 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMUserDataHandler.hpp">
</File>
- <File
- RelativePath="..\..\..\..\..\src\xercesc\dom\DOMWriter.hpp">
- </File>
- <File
- RelativePath="..\..\..\..\..\src\xercesc\dom\DOMWriterFilter.hpp">
- </File>
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMXPathEvaluator.hpp">
</File>
@@ -2581,6 +2598,12 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMLocatorImpl.hpp">
</File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMLSSerializerImpl.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMLSSerializerImpl.hpp">
+ </File>
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMNamedNodeMapImpl.cpp">
</File>
@@ -2671,12 +2694,6 @@ copy $(InputDir)\$(InputName).msvc.hpp $(InputPath)"
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.hpp">
</File>
- <File
- RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMWriterImpl.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\..\src\xercesc\dom\impl\DOMWriterImpl.hpp">
- </File>
<File
RelativePath="..\..\..\..\..\src\xercesc\dom\impl\XSDElementNSImpl.cpp">
</File>
diff --git a/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj b/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
index f7b2980aa..e0a7838b2 100644
--- a/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
@@ -97,6 +97,7 @@ echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
PreprocessorDefinitions="_DEBUG;_ATL_DEBUG_INTERFACES;_ATL_DEBUG_QI;_ATL_DEBUG_REFCOUNT;WIN32;_WINDOWS;_USRDLL"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ TreatWChar_tAsBuiltInType="FALSE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="..\..\..\..\..\Build\Win32\xml4com\Debug\obj/xerces-com.pch"
diff --git a/samples/src/DOMCount/DOMCount.cpp b/samples/src/DOMCount/DOMCount.cpp
index 078be41f8..ca0d82e40 100644
--- a/samples/src/DOMCount/DOMCount.cpp
+++ b/samples/src/DOMCount/DOMCount.cpp
@@ -26,7 +26,7 @@
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
#include <xercesc/dom/DOMImplementationRegistry.hpp>
-#include <xercesc/dom/DOMBuilder.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMNodeList.hpp>
@@ -54,7 +54,7 @@ static void usage()
{
XERCES_STD_QUALIFIER cout << "\nUsage:\n"
" DOMCount [options] <XML file | List file>\n\n"
- "This program invokes the DOMBuilder, builds the DOM tree,\n"
+ "This program invokes the DOMLSParser, builds the DOM tree,\n"
"and then prints the number of elements found in each XML file.\n\n"
"Options:\n"
" -l Indicate the input file is a List File that has a list of xml files.\n"
@@ -262,31 +262,32 @@ int main(int argC, char* argV[])
// Instantiate the DOM parser.
static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
- DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+ DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+ DOMConfiguration *config = parser->getDomConfig();
- parser->setFeature(XMLUni::fgDOMNamespaces, doNamespaces);
- parser->setFeature(XMLUni::fgXercesSchema, doSchema);
- parser->setFeature(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
+ config->setParameter(XMLUni::fgDOMNamespaces, doNamespaces);
+ config->setParameter(XMLUni::fgXercesSchema, doSchema);
+ config->setParameter(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
if (valScheme == AbstractDOMParser::Val_Auto)
{
- parser->setFeature(XMLUni::fgDOMValidateIfSchema, true);
+ config->setParameter(XMLUni::fgDOMValidateIfSchema, true);
}
else if (valScheme == AbstractDOMParser::Val_Never)
{
- parser->setFeature(XMLUni::fgDOMValidation, false);
+ config->setParameter(XMLUni::fgDOMValidate, false);
}
else if (valScheme == AbstractDOMParser::Val_Always)
{
- parser->setFeature(XMLUni::fgDOMValidation, true);
+ config->setParameter(XMLUni::fgDOMValidate, true);
}
// enable datatype normalization - default is off
- parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true);
+ config->setParameter(XMLUni::fgDOMDatatypeNormalization, true);
// And create our error handler and install it
DOMCountErrorHandler errorHandler;
- parser->setErrorHandler(&errorHandler);
+ config->setParameter(XMLUni::fgDOMErrorHandler, &errorHandler);
//
// Get the starting time and kick off the parse of the indicated
diff --git a/samples/src/DOMPrint/DOMPrint.cpp b/samples/src/DOMPrint/DOMPrint.cpp
index 8e2e68736..5230ab701 100644
--- a/samples/src/DOMPrint/DOMPrint.cpp
+++ b/samples/src/DOMPrint/DOMPrint.cpp
@@ -20,7 +20,7 @@
// ---------------------------------------------------------------------------
// This sample program invokes the XercesDOMParser to build a DOM tree for
-// the specified input file. It then invokes DOMWriter::writeNode() to
+// the specified input file. It then invokes DOMLSSerializer::write() to
// serialize the resultant DOM tree back to XML stream.
//
// Note:
@@ -30,7 +30,7 @@
// in the case any error occurs during the serialization.
//
// Application needs to provide its own implementation of
-// DOMWriterFilter (in this sample, the DOMPrintFilter),
+// DOMLSSerializerFilter (in this sample, the DOMPrintFilter),
// if it would like to filter out certain part of the DOM
// representation, but must be aware that thus may render the
// resultant XML stream invalid.
@@ -70,7 +70,7 @@
#include <xercesc/dom/DOM.hpp>
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
+#include <xercesc/dom/DOMLSSerializer.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <xercesc/framework/LocalFileFormatTarget.hpp>
@@ -129,7 +129,7 @@ static bool gSchemaFullChecking = false;
static bool gDoCreate = false;
static char* goutputfile = 0;
-// options for DOMWriter's features
+// options for DOMLSSerializer's features
static XMLCh* gOutputEncoding = 0;
static bool gSplitCdataSections = true;
@@ -155,7 +155,7 @@ void usage()
XERCES_STD_QUALIFIER cout << "\nUsage:\n"
" DOMPrint [options] <XML file>\n\n"
"This program invokes the DOM parser, and builds the DOM tree.\n"
- "It then asks the DOMWriter to serialize the DOM tree.\n"
+ "It then asks the DOMLSSerializer to serialize the DOM tree.\n"
"Options:\n"
" -e create entity reference nodes. Default is no expansion.\n"
" -v=xxx Validation scheme [always | never | auto*].\n"
@@ -430,10 +430,10 @@ int main(int argC, char* argV[])
try
{
- // get a serializer, an instance of DOMWriter
+ // get a serializer, an instance of DOMLSSerializer
XMLCh tempStr[3] = {chLatin_L, chLatin_S, chNull};
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
- DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
// set user specified output encoding
theSerializer->setEncoding(gOutputEncoding);
@@ -441,10 +441,10 @@ int main(int argC, char* argV[])
// plug in user's own filter
if (gUseFilter)
{
- // even we say to show attribute, but the DOMWriter
+ // even we say to show attribute, but the DOMLSSerializer
// will not show attribute nodes to the filter as
- // the specs explicitly says that DOMWriter shall
- // NOT show attributes to DOMWriterFilter.
+ // the specs explicitly says that DOMLSSerializer shall
+ // NOT show attributes to DOMLSSerializerFilter.
//
// so DOMNodeFilter::SHOW_ATTRIBUTE has no effect.
// same DOMNodeFilter::SHOW_DOCUMENT_TYPE, no effect.
@@ -457,20 +457,21 @@ int main(int argC, char* argV[])
// plug in user's own error handler
DOMErrorHandler *myErrorHandler = new DOMPrintErrorHandler();
- theSerializer->setErrorHandler(myErrorHandler);
+ DOMConfiguration* serializerConfig=theSerializer->getDomConfig();
+ serializerConfig->setParameter(XMLUni::fgDOMErrorHandler, myErrorHandler);
// set feature if the serializer supports the feature/mode
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections))
- theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections);
+ if (serializerConfig->canSetParameter(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections))
+ serializerConfig->setParameter(XMLUni::fgDOMWRTSplitCdataSections, gSplitCdataSections);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent);
+ if (serializerConfig->canSetParameter(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent))
+ serializerConfig->setParameter(XMLUni::fgDOMWRTDiscardDefaultContent, gDiscardDefaultContent);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint);
+ if (serializerConfig->canSetParameter(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint))
+ serializerConfig->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, gFormatPrettyPrint);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, gWriteBOM))
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, gWriteBOM);
+ if (serializerConfig->canSetParameter(XMLUni::fgDOMWRTBOM, gWriteBOM))
+ serializerConfig->setParameter(XMLUni::fgDOMWRTBOM, gWriteBOM);
//
// Plug in a format target to receive the resultant
@@ -489,9 +490,9 @@ int main(int argC, char* argV[])
DOMNode *doc = parser->getDocument();
//
- // do the serialization through DOMWriter::writeNode();
+ // do the serialization through DOMLSSerializer::write();
//
- theSerializer->writeNode(myFormTarget, *doc);
+ theSerializer->write(doc, myFormTarget);
delete theSerializer;
diff --git a/samples/src/DOMPrint/DOMPrintFilter.cpp b/samples/src/DOMPrint/DOMPrintFilter.cpp
index 293700691..a5bda8476 100644
--- a/samples/src/DOMPrint/DOMPrintFilter.cpp
+++ b/samples/src/DOMPrint/DOMPrintFilter.cpp
@@ -39,13 +39,12 @@ DOMPrintFilter::DOMPrintFilter(unsigned long whatToShow)
short DOMPrintFilter::acceptNode(const DOMNode* node) const
{
//
- // The DOMWriter shall call getWhatToShow() before calling
+ // The DOMLSSerializer shall call getWhatToShow() before calling
// acceptNode(), to show nodes which are supposed to be
// shown to this filter.
//
- // REVISIT: In case the DOMWriter does not follow the protocol,
+ // REVISIT: In case the DOMLSSerializer does not follow the protocol,
// Shall the filter honour, or NOT, what it claimes
- // (when it is constructed/setWhatToShow())
// it is interested in ?
//
// The DOMLS specs does not specify that acceptNode() shall do
@@ -86,8 +85,8 @@ short DOMPrintFilter::acceptNode(const DOMNode* node) const
{
// even we say we are going to process document type,
// we are not able be to see this node since
- // DOMWriterImpl (a XercesC's default implementation
- // of DOMWriter) will not pass DocumentType node to
+ // DOMLSSerializerImpl (a XercesC's default implementation
+ // of DOMLSSerializer) will not pass DocumentType node to
// this filter.
//
return DOMNodeFilter::FILTER_REJECT; // no effect
diff --git a/samples/src/DOMPrint/DOMPrintFilter.hpp b/samples/src/DOMPrint/DOMPrintFilter.hpp
index f2161dc91..9a92b7c23 100644
--- a/samples/src/DOMPrint/DOMPrintFilter.hpp
+++ b/samples/src/DOMPrint/DOMPrintFilter.hpp
@@ -26,11 +26,11 @@
#ifndef DOMPrintFilter_HEADER_GUARD_
#define DOMPrintFilter_HEADER_GUARD_
-#include <xercesc/dom/DOMWriterFilter.hpp>
+#include <xercesc/dom/DOMLSSerializerFilter.hpp>
XERCES_CPP_NAMESPACE_USE
-class DOMPrintFilter : public DOMWriterFilter {
+class DOMPrintFilter : public DOMLSSerializerFilter {
public:
/** @name Constructors */
@@ -47,8 +47,6 @@ public:
virtual unsigned long getWhatToShow() const {return fWhatToShow;};
- virtual void setWhatToShow(unsigned long toShow) {fWhatToShow = toShow;};
-
private:
// unimplemented copy ctor and assignement operator
DOMPrintFilter(const DOMPrintFilter&);
diff --git a/scripts/sanityTest_ExpectedResult.log b/scripts/sanityTest_ExpectedResult.log
index 3fe46eccc..dfa42aeb9 100644
--- a/scripts/sanityTest_ExpectedResult.log
+++ b/scripts/sanityTest_ExpectedResult.log
@@ -610,7 +610,7 @@ personal.xml:{timing removed}(37 elems, 12 attrs, 0 spaces, 268 chars)
Usage:
DOMCount [options] <XML file | List file>
-This program invokes the DOMBuilder, builds the DOM tree,
+This program invokes the DOMLSParser, builds the DOM tree,
and then prints the number of elements found in each XML file.
Options:
@@ -634,7 +634,7 @@ Usage:
DOMPrint [options] <XML file>
This program invokes the DOM parser, and builds the DOM tree.
-It then asks the DOMWriter to serialize the DOM tree.
+It then asks the DOMLSSerializer to serialize the DOM tree.
Options:
-e create entity reference nodes. Default is no expansion.
-v=xxx Validation scheme [always | never | auto*].
@@ -1198,7 +1198,7 @@ usage: ThreadTest [-v] [-threads nnn] [-time nnn] [-quiet] [-verbose] xmlfile..
Usage:
MemHandlerTest [options] <XML file | List file>
-This program invokes the XercesDOMParser, DOMBuilder, SAXParser ,
+This program invokes the XercesDOMParser, DOMLSParser, SAXParser ,
and the SAX2XMLReader, and ensures that MemoryManagers set on these
domBuilders are called to delete just as many bytes as they allocate.
This is done for each XML file, and each file is processed
diff --git a/src/Makefile.am b/src/Makefile.am
index 84cefe3e1..fe5116b4b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -254,7 +254,6 @@ endif
dom_headers = \
xercesc/dom/DOM.hpp \
xercesc/dom/DOMAttr.hpp \
- xercesc/dom/DOMBuilder.hpp \
xercesc/dom/DOMCDATASection.hpp \
xercesc/dom/DOMCharacterData.hpp \
xercesc/dom/DOMComment.hpp \
@@ -275,8 +274,14 @@ dom_headers = \
xercesc/dom/DOMImplementationLS.hpp \
xercesc/dom/DOMImplementationRegistry.hpp \
xercesc/dom/DOMImplementationSource.hpp \
- xercesc/dom/DOMInputSource.hpp \
xercesc/dom/DOMLocator.hpp \
+ xercesc/dom/DOMLSException.hpp \
+ xercesc/dom/DOMLSInput.hpp \
+ xercesc/dom/DOMLSOutput.hpp \
+ xercesc/dom/DOMLSParser.hpp \
+ xercesc/dom/DOMLSParserFilter.hpp \
+ xercesc/dom/DOMLSSerializer.hpp \
+ xercesc/dom/DOMLSSerializerFilter.hpp \
xercesc/dom/DOMNamedNodeMap.hpp \
xercesc/dom/DOMNode.hpp \
xercesc/dom/DOMNodeFilter.hpp \
@@ -291,8 +296,6 @@ dom_headers = \
xercesc/dom/DOMTreeWalker.hpp \
xercesc/dom/DOMTypeInfo.hpp \
xercesc/dom/DOMUserDataHandler.hpp \
- xercesc/dom/DOMWriter.hpp \
- xercesc/dom/DOMWriterFilter.hpp \
xercesc/dom/DOMXPathEvaluator.hpp \
xercesc/dom/DOMXPathException.hpp \
xercesc/dom/DOMXPathExpression.hpp \
@@ -303,6 +306,7 @@ dom_headers = \
dom_sources = \
xercesc/dom/DOMException.cpp \
+ xercesc/dom/DOMLSException.cpp \
xercesc/dom/DOMRangeException.cpp \
xercesc/dom/DOMXPathException.cpp
@@ -345,7 +349,7 @@ domimpl_headers = \
xercesc/dom/impl/DOMTextImpl.hpp \
xercesc/dom/impl/DOMTreeWalkerImpl.hpp \
xercesc/dom/impl/DOMTypeInfoImpl.hpp \
- xercesc/dom/impl/DOMWriterImpl.hpp \
+ xercesc/dom/impl/DOMLSSerializerImpl.hpp \
xercesc/dom/impl/XSDElementNSImpl.hpp
domimpl_sources = \
@@ -384,7 +388,7 @@ domimpl_sources = \
xercesc/dom/impl/DOMTextImpl.cpp \
xercesc/dom/impl/DOMTreeWalkerImpl.cpp \
xercesc/dom/impl/DOMTypeInfoImpl.cpp \
- xercesc/dom/impl/DOMWriterImpl.cpp \
+ xercesc/dom/impl/DOMLSSerializerImpl.cpp \
xercesc/dom/impl/XSDElementNSImpl.cpp
@@ -427,7 +431,7 @@ framework_headers = \
xercesc/framework/StdOutFormatTarget.hpp \
xercesc/framework/URLInputSource.hpp \
xercesc/framework/ValidationContext.hpp \
- xercesc/framework/Wrapper4DOMInputSource.hpp \
+ xercesc/framework/Wrapper4DOMLSInput.hpp \
xercesc/framework/Wrapper4InputSource.hpp \
xercesc/framework/XMLAttDef.hpp \
xercesc/framework/XMLAttDefList.hpp \
@@ -486,7 +490,7 @@ framework_sources = \
xercesc/framework/StdInInputSource.cpp \
xercesc/framework/StdOutFormatTarget.cpp \
xercesc/framework/URLInputSource.cpp \
- xercesc/framework/Wrapper4DOMInputSource.cpp \
+ xercesc/framework/Wrapper4DOMLSInput.cpp \
xercesc/framework/Wrapper4InputSource.cpp \
xercesc/framework/XMLAttDef.cpp \
xercesc/framework/XMLAttDefList.cpp \
@@ -564,7 +568,7 @@ internal_sources = \
parsers_headers = \
xercesc/parsers/AbstractDOMParser.hpp \
- xercesc/parsers/DOMBuilderImpl.hpp \
+ xercesc/parsers/DOMLSParserImpl.hpp \
xercesc/parsers/SAX2XMLFilterImpl.hpp \
xercesc/parsers/SAX2XMLReaderImpl.hpp \
xercesc/parsers/SAXParser.hpp \
@@ -572,7 +576,7 @@ parsers_headers = \
parsers_sources = \
xercesc/parsers/AbstractDOMParser.cpp \
- xercesc/parsers/DOMBuilderImpl.cpp \
+ xercesc/parsers/DOMLSParserImpl.cpp \
xercesc/parsers/SAX2XMLFilterImpl.cpp \
xercesc/parsers/SAX2XMLReaderImpl.cpp \
xercesc/parsers/SAXParser.cpp \
diff --git a/src/Makefile.in b/src/Makefile.in
index 4fd6989c4..2a8a9f8b6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -180,7 +180,7 @@ libcurlna_la_OBJECTS = $(am_libcurlna_la_OBJECTS)
@XERCES_USE_NETACCESSOR_CURL_TRUE@am_libcurlna_la_rpath =
libdom_la_LIBADD =
am__objects_3 = xercesc/dom/DOMException.lo \
- xercesc/dom/DOMRangeException.lo \
+ xercesc/dom/DOMLSException.lo xercesc/dom/DOMRangeException.lo \
xercesc/dom/DOMXPathException.lo
am_libdom_la_OBJECTS = $(am__objects_3)
libdom_la_OBJECTS = $(am_libdom_la_OBJECTS)
@@ -220,7 +220,7 @@ am__objects_4 = xercesc/dom/impl/DOMAttrImpl.lo \
xercesc/dom/impl/DOMTextImpl.lo \
xercesc/dom/impl/DOMTreeWalkerImpl.lo \
xercesc/dom/impl/DOMTypeInfoImpl.lo \
- xercesc/dom/impl/DOMWriterImpl.lo \
+ xercesc/dom/impl/DOMLSSerializerImpl.lo \
xercesc/dom/impl/XSDElementNSImpl.lo
am_libdomimpl_la_OBJECTS = $(am__objects_4)
libdomimpl_la_OBJECTS = $(am_libdomimpl_la_OBJECTS)
@@ -257,7 +257,7 @@ am__objects_5 = xercesc/framework/BinOutputStream.lo \
xercesc/framework/StdInInputSource.lo \
xercesc/framework/StdOutFormatTarget.lo \
xercesc/framework/URLInputSource.lo \
- xercesc/framework/Wrapper4DOMInputSource.lo \
+ xercesc/framework/Wrapper4DOMLSInput.lo \
xercesc/framework/Wrapper4InputSource.lo \
xercesc/framework/XMLAttDef.lo \
xercesc/framework/XMLAttDefList.lo \
@@ -357,7 +357,7 @@ libnothreadmmgr_la_OBJECTS = $(am_libnothreadmmgr_la_OBJECTS)
@XERCES_USE_MUTEXMGR_NOTHREAD_TRUE@am_libnothreadmmgr_la_rpath =
libparsers_la_LIBADD =
am__objects_14 = xercesc/parsers/AbstractDOMParser.lo \
- xercesc/parsers/DOMBuilderImpl.lo \
+ xercesc/parsers/DOMLSParserImpl.lo \
xercesc/parsers/SAX2XMLFilterImpl.lo \
xercesc/parsers/SAX2XMLReaderImpl.lo \
xercesc/parsers/SAXParser.lo \
@@ -1106,7 +1106,6 @@ libvalidators_la_SOURCES = ${validators_sources}
dom_headers = \
xercesc/dom/DOM.hpp \
xercesc/dom/DOMAttr.hpp \
- xercesc/dom/DOMBuilder.hpp \
xercesc/dom/DOMCDATASection.hpp \
xercesc/dom/DOMCharacterData.hpp \
xercesc/dom/DOMComment.hpp \
@@ -1127,8 +1126,14 @@ dom_headers = \
xercesc/dom/DOMImplementationLS.hpp \
xercesc/dom/DOMImplementationRegistry.hpp \
xercesc/dom/DOMImplementationSource.hpp \
- xercesc/dom/DOMInputSource.hpp \
xercesc/dom/DOMLocator.hpp \
+ xercesc/dom/DOMLSException.hpp \
+ xercesc/dom/DOMLSInput.hpp \
+ xercesc/dom/DOMLSOutput.hpp \
+ xercesc/dom/DOMLSParser.hpp \
+ xercesc/dom/DOMLSParserFilter.hpp \
+ xercesc/dom/DOMLSSerializer.hpp \
+ xercesc/dom/DOMLSSerializerFilter.hpp \
xercesc/dom/DOMNamedNodeMap.hpp \
xercesc/dom/DOMNode.hpp \
xercesc/dom/DOMNodeFilter.hpp \
@@ -1143,8 +1148,6 @@ dom_headers = \
xercesc/dom/DOMTreeWalker.hpp \
xercesc/dom/DOMTypeInfo.hpp \
xercesc/dom/DOMUserDataHandler.hpp \
- xercesc/dom/DOMWriter.hpp \
- xercesc/dom/DOMWriterFilter.hpp \
xercesc/dom/DOMXPathEvaluator.hpp \
xercesc/dom/DOMXPathException.hpp \
xercesc/dom/DOMXPathExpression.hpp \
@@ -1155,6 +1158,7 @@ dom_headers = \
dom_sources = \
xercesc/dom/DOMException.cpp \
+ xercesc/dom/DOMLSException.cpp \
xercesc/dom/DOMRangeException.cpp \
xercesc/dom/DOMXPathException.cpp
@@ -1196,7 +1200,7 @@ domimpl_headers = \
xercesc/dom/impl/DOMTextImpl.hpp \
xercesc/dom/impl/DOMTreeWalkerImpl.hpp \
xercesc/dom/impl/DOMTypeInfoImpl.hpp \
- xercesc/dom/impl/DOMWriterImpl.hpp \
+ xercesc/dom/impl/DOMLSSerializerImpl.hpp \
xercesc/dom/impl/XSDElementNSImpl.hpp
domimpl_sources = \
@@ -1235,7 +1239,7 @@ domimpl_sources = \
xercesc/dom/impl/DOMTextImpl.cpp \
xercesc/dom/impl/DOMTreeWalkerImpl.cpp \
xercesc/dom/impl/DOMTypeInfoImpl.cpp \
- xercesc/dom/impl/DOMWriterImpl.cpp \
+ xercesc/dom/impl/DOMLSSerializerImpl.cpp \
xercesc/dom/impl/XSDElementNSImpl.cpp
framework_headers = \
@@ -1277,7 +1281,7 @@ framework_headers = \
xercesc/framework/StdOutFormatTarget.hpp \
xercesc/framework/URLInputSource.hpp \
xercesc/framework/ValidationContext.hpp \
- xercesc/framework/Wrapper4DOMInputSource.hpp \
+ xercesc/framework/Wrapper4DOMLSInput.hpp \
xercesc/framework/Wrapper4InputSource.hpp \
xercesc/framework/XMLAttDef.hpp \
xercesc/framework/XMLAttDefList.hpp \
@@ -1336,7 +1340,7 @@ framework_sources = \
xercesc/framework/StdInInputSource.cpp \
xercesc/framework/StdOutFormatTarget.cpp \
xercesc/framework/URLInputSource.cpp \
- xercesc/framework/Wrapper4DOMInputSource.cpp \
+ xercesc/framework/Wrapper4DOMLSInput.cpp \
xercesc/framework/Wrapper4InputSource.cpp \
xercesc/framework/XMLAttDef.cpp \
xercesc/framework/XMLAttDefList.cpp \
@@ -1412,7 +1416,7 @@ internal_sources = \
parsers_headers = \
xercesc/parsers/AbstractDOMParser.hpp \
- xercesc/parsers/DOMBuilderImpl.hpp \
+ xercesc/parsers/DOMLSParserImpl.hpp \
xercesc/parsers/SAX2XMLFilterImpl.hpp \
xercesc/parsers/SAX2XMLReaderImpl.hpp \
xercesc/parsers/SAXParser.hpp \
@@ -1420,7 +1424,7 @@ parsers_headers = \
parsers_sources = \
xercesc/parsers/AbstractDOMParser.cpp \
- xercesc/parsers/DOMBuilderImpl.cpp \
+ xercesc/parsers/DOMLSParserImpl.cpp \
xercesc/parsers/SAX2XMLFilterImpl.cpp \
xercesc/parsers/SAX2XMLReaderImpl.cpp \
xercesc/parsers/SAXParser.cpp \
@@ -2103,6 +2107,8 @@ xercesc/dom/$(DEPDIR)/$(am__dirstamp):
@: > xercesc/dom/$(DEPDIR)/$(am__dirstamp)
xercesc/dom/DOMException.lo: xercesc/dom/$(am__dirstamp) \
xercesc/dom/$(DEPDIR)/$(am__dirstamp)
+xercesc/dom/DOMLSException.lo: xercesc/dom/$(am__dirstamp) \
+ xercesc/dom/$(DEPDIR)/$(am__dirstamp)
xercesc/dom/DOMRangeException.lo: xercesc/dom/$(am__dirstamp) \
xercesc/dom/$(DEPDIR)/$(am__dirstamp)
xercesc/dom/DOMXPathException.lo: xercesc/dom/$(am__dirstamp) \
@@ -2199,7 +2205,8 @@ xercesc/dom/impl/DOMTreeWalkerImpl.lo: \
xercesc/dom/impl/$(DEPDIR)/$(am__dirstamp)
xercesc/dom/impl/DOMTypeInfoImpl.lo: xercesc/dom/impl/$(am__dirstamp) \
xercesc/dom/impl/$(DEPDIR)/$(am__dirstamp)
-xercesc/dom/impl/DOMWriterImpl.lo: xercesc/dom/impl/$(am__dirstamp) \
+xercesc/dom/impl/DOMLSSerializerImpl.lo: \
+ xercesc/dom/impl/$(am__dirstamp) \
xercesc/dom/impl/$(DEPDIR)/$(am__dirstamp)
xercesc/dom/impl/XSDElementNSImpl.lo: \
xercesc/dom/impl/$(am__dirstamp) \
@@ -2314,7 +2321,7 @@ xercesc/framework/StdOutFormatTarget.lo: \
xercesc/framework/URLInputSource.lo: \
xercesc/framework/$(am__dirstamp) \
xercesc/framework/$(DEPDIR)/$(am__dirstamp)
-xercesc/framework/Wrapper4DOMInputSource.lo: \
+xercesc/framework/Wrapper4DOMLSInput.lo: \
xercesc/framework/$(am__dirstamp) \
xercesc/framework/$(DEPDIR)/$(am__dirstamp)
xercesc/framework/Wrapper4InputSource.lo: \
@@ -2502,7 +2509,7 @@ xercesc/parsers/$(DEPDIR)/$(am__dirstamp):
@: > xercesc/parsers/$(DEPDIR)/$(am__dirstamp)
xercesc/parsers/AbstractDOMParser.lo: xercesc/parsers/$(am__dirstamp) \
xercesc/parsers/$(DEPDIR)/$(am__dirstamp)
-xercesc/parsers/DOMBuilderImpl.lo: xercesc/parsers/$(am__dirstamp) \
+xercesc/parsers/DOMLSParserImpl.lo: xercesc/parsers/$(am__dirstamp) \
xercesc/parsers/$(DEPDIR)/$(am__dirstamp)
xercesc/parsers/SAX2XMLFilterImpl.lo: xercesc/parsers/$(am__dirstamp) \
xercesc/parsers/$(DEPDIR)/$(am__dirstamp)
@@ -3102,6 +3109,8 @@ mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f xercesc/dom/DOMException.$(OBJEXT)
-rm -f xercesc/dom/DOMException.lo
+ -rm -f xercesc/dom/DOMLSException.$(OBJEXT)
+ -rm -f xercesc/dom/DOMLSException.lo
-rm -f xercesc/dom/DOMRangeException.$(OBJEXT)
-rm -f xercesc/dom/DOMRangeException.lo
-rm -f xercesc/dom/DOMXPathException.$(OBJEXT)
@@ -3144,6 +3153,8 @@ mostlyclean-compile:
-rm -f xercesc/dom/impl/DOMImplementationImpl.lo
-rm -f xercesc/dom/impl/DOMImplementationRegistry.$(OBJEXT)
-rm -f xercesc/dom/impl/DOMImplementationRegistry.lo
+ -rm -f xercesc/dom/impl/DOMLSSerializerImpl.$(OBJEXT)
+ -rm -f xercesc/dom/impl/DOMLSSerializerImpl.lo
-rm -f xercesc/dom/impl/DOMLocatorImpl.$(OBJEXT)
-rm -f xercesc/dom/impl/DOMLocatorImpl.lo
-rm -f xercesc/dom/impl/DOMNamedNodeMapImpl.$(OBJEXT)
@@ -3176,8 +3187,6 @@ mostlyclean-compile:
-rm -f xercesc/dom/impl/DOMTreeWalkerImpl.lo
-rm -f xercesc/dom/impl/DOMTypeInfoImpl.$(OBJEXT)
-rm -f xercesc/dom/impl/DOMTypeInfoImpl.lo
- -rm -f xercesc/dom/impl/DOMWriterImpl.$(OBJEXT)
- -rm -f xercesc/dom/impl/DOMWriterImpl.lo
-rm -f xercesc/dom/impl/XSDElementNSImpl.$(OBJEXT)
-rm -f xercesc/dom/impl/XSDElementNSImpl.lo
-rm -f xercesc/framework/BinOutputStream.$(OBJEXT)
@@ -3196,8 +3205,8 @@ mostlyclean-compile:
-rm -f xercesc/framework/StdOutFormatTarget.lo
-rm -f xercesc/framework/URLInputSource.$(OBJEXT)
-rm -f xercesc/framework/URLInputSource.lo
- -rm -f xercesc/framework/Wrapper4DOMInputSource.$(OBJEXT)
- -rm -f xercesc/framework/Wrapper4DOMInputSource.lo
+ -rm -f xercesc/framework/Wrapper4DOMLSInput.$(OBJEXT)
+ -rm -f xercesc/framework/Wrapper4DOMLSInput.lo
-rm -f xercesc/framework/Wrapper4InputSource.$(OBJEXT)
-rm -f xercesc/framework/Wrapper4InputSource.lo
-rm -f xercesc/framework/XMLAttDef.$(OBJEXT)
@@ -3328,8 +3337,8 @@ mostlyclean-compile:
-rm -f xercesc/internal/XTemplateSerializer.lo
-rm -f xercesc/parsers/AbstractDOMParser.$(OBJEXT)
-rm -f xercesc/parsers/AbstractDOMParser.lo
- -rm -f xercesc/parsers/DOMBuilderImpl.$(OBJEXT)
- -rm -f xercesc/parsers/DOMBuilderImpl.lo
+ -rm -f xercesc/parsers/DOMLSParserImpl.$(OBJEXT)
+ -rm -f xercesc/parsers/DOMLSParserImpl.lo
-rm -f xercesc/parsers/SAX2XMLFilterImpl.$(OBJEXT)
-rm -f xercesc/parsers/SAX2XMLFilterImpl.lo
-rm -f xercesc/parsers/SAX2XMLReaderImpl.$(OBJEXT)
@@ -3725,6 +3734,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/$(DEPDIR)/DOMException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/$(DEPDIR)/DOMLSException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/$(DEPDIR)/DOMRangeException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/$(DEPDIR)/DOMXPathException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMAttrImpl.Plo@am__quote@
@@ -3746,6 +3756,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMErrorImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMImplementationImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMImplementationRegistry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMLSSerializerImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMLocatorImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMNamedNodeMapImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMNodeIDMap.Plo@am__quote@
@@ -3762,7 +3773,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMTextImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMTreeWalkerImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMTypeInfoImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/DOMWriterImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/dom/impl/$(DEPDIR)/XSDElementNSImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/BinOutputStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/LocalFileFormatTarget.Plo@am__quote@
@@ -3772,7 +3782,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/StdInInputSource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/StdOutFormatTarget.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/URLInputSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/Wrapper4DOMInputSource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/Wrapper4DOMLSInput.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/Wrapper4InputSource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/XMLAttDef.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDIR)/XMLAttDefList.Plo@am__quote@
@@ -3838,7 +3848,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/internal/$(DEPDIR)/XSerializeEngine.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/internal/$(DEPDIR)/XTemplateSerializer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/parsers/$(DEPDIR)/AbstractDOMParser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@xercesc/parsers/$(DEPDIR)/DOMBuilderImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xercesc/parsers/$(DEPDIR)/DOMLSParserImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/parsers/$(DEPDIR)/SAX2XMLFilterImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/parsers/$(DEPDIR)/SAX2XMLReaderImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/parsers/$(DEPDIR)/SAXParser.Plo@am__quote@
diff --git a/src/xercesc/dom/DOM.hpp b/src/xercesc/dom/DOM.hpp
index 2f971ef8d..0072ed84a 100644
--- a/src/xercesc/dom/DOM.hpp
+++ b/src/xercesc/dom/DOM.hpp
@@ -55,8 +55,7 @@
#include <xercesc/dom/DOMTreeWalker.hpp>
// Introduced in DOM Level 3
-// Experimental - subject to change
-#include <xercesc/dom/DOMBuilder.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
#include <xercesc/dom/DOMConfiguration.hpp>
#include <xercesc/dom/DOMEntityResolver.hpp>
#include <xercesc/dom/DOMError.hpp>
@@ -64,12 +63,12 @@
#include <xercesc/dom/DOMImplementationLS.hpp>
#include <xercesc/dom/DOMImplementationRegistry.hpp>
#include <xercesc/dom/DOMImplementationSource.hpp>
-#include <xercesc/dom/DOMInputSource.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
#include <xercesc/dom/DOMLocator.hpp>
#include <xercesc/dom/DOMTypeInfo.hpp>
#include <xercesc/dom/DOMUserDataHandler.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
-#include <xercesc/dom/DOMWriterFilter.hpp>
+#include <xercesc/dom/DOMLSSerializer.hpp>
+#include <xercesc/dom/DOMLSSerializerFilter.hpp>
#include <xercesc/dom/DOMXPathEvaluator.hpp>
#include <xercesc/dom/DOMXPathNSResolver.hpp>
diff --git a/src/xercesc/dom/DOMBuilder.hpp b/src/xercesc/dom/DOMBuilder.hpp
deleted file mode 100644
index 7638aae62..000000000
--- a/src/xercesc/dom/DOMBuilder.hpp
+++ /dev/null
@@ -1,685 +0,0 @@
-#ifndef DOMBuilder_HEADER_GUARD_
-#define DOMBuilder_HEADER_GUARD_
-
-/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * $Id$
- *
- */
-
-
-#include <xercesc/util/XercesDefs.hpp>
-
-XERCES_CPP_NAMESPACE_BEGIN
-
-
-class DOMErrorHandler;
-class DOMEntityResolver;
-class DOMInputSource;
-class DOMBuilderFilter;
-class DOMNode;
-class DOMDocument;
-class Grammar;
-
-/**
- * DOMBuilder provides an API for parsing XML documents and building the
- * corresponding DOM document tree. A DOMBuilder instance is obtained from
- * the DOMImplementationLS interface by invoking its createDOMBuilder method.
- * This implementation also allows the applications to install an error and
- * an entity handler (useful extensions to the DOM specification).
- *
- * @since DOM Level 3
- *
- */
-class CDOM_EXPORT DOMBuilder
-{
-protected :
- // -----------------------------------------------------------------------
- // Hidden constructors
- // -----------------------------------------------------------------------
- /** @name Hidden constructors */
- //@{
- DOMBuilder() {};
- //@}
-
-private:
- // -----------------------------------------------------------------------
- // Unimplemented constructors and operators
- // -----------------------------------------------------------------------
- /** @name Unimplemented constructors and operators */
- //@{
- DOMBuilder(const DOMBuilder &);
- DOMBuilder & operator = (const DOMBuilder &);
- //@}
-
-public:
- // -----------------------------------------------------------------------
- // All constructors are hidden, just the destructor is available
- // -----------------------------------------------------------------------
- /** @name Destructor */
- //@{
- /**
- * Destructor
- *
- */
- virtual ~DOMBuilder() {};
- //@}
-
- // -----------------------------------------------------------------------
- // Class types
- // -----------------------------------------------------------------------
- /** @name Public Constants */
- //@{
- /**
- * Action types for use in parseWithContext.
- *
- * <p> <code>ACTION_REPLACE</code>:
- * Replace the context node with the result of parsing the input source.
- * For this action to work the context node must be an
- * <code>DOMElement</code>, <code>DOMText</code>, <code>DOMCDATASection</code>,
- * <code>DOMComment</code>, <code>DOMProcessingInstruction</code>, or
- * <code>DOMEntityReference</code> node.</p>
- *
- * <p> <code>ACTION_APPEND</code>:
- * Append the result of parsing the input source to the context node. For
- * this action to work, the context node must be an <code>DOMElement</code>.</p>
- *
- * <p> <code>ACTION_INSERT_AFTER</code>:
- * Insert the result of parsing the input source after the context node.
- * For this action to work the context nodes parent must be an
- * <code>DOMElement</code>.</p>
- *
- * <p> <code>ACTION_INSERT_BEFORE</code>:
- * Insert the result of parsing the input source before the context node.
- * For this action to work the context nodes parent must be an
- * <code>DOMElement</code>.</p>
- *
- * @see parseWithContext(...)
- * @since DOM Level 3
- */
- enum ActionType
- {
- ACTION_REPLACE = 1,
- ACTION_APPEND_AS_CHILDREN = 2,
- ACTION_INSERT_AFTER = 3,
- ACTION_INSERT_BEFORE = 4
- };
- //@}
-
- // -----------------------------------------------------------------------
- // Virtual DOMBuilder interface
- // -----------------------------------------------------------------------
- /** @name Functions introduced in DOM Level 3 */
- //@{
-
- // -----------------------------------------------------------------------
- // Getter methods
- // -----------------------------------------------------------------------
-
- /**
- * Get a pointer to the error handler
- *
- * This method returns the installed error handler. If no handler
- * has been installed, then it will be a zero pointer.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return The pointer to the installed error handler object.
- * @since DOM Level 3
- */
- virtual DOMErrorHandler* getErrorHandler() = 0;
-
- /**
- * Get a const pointer to the error handler
- *
- * This method returns the installed error handler. If no handler
- * has been installed, then it will be a zero pointer.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return A const pointer to the installed error handler object.
- * @since DOM Level 3
- */
- virtual const DOMErrorHandler* getErrorHandler() const = 0;
-
- /**
- * Get a pointer to the entity resolver
- *
- * This method returns the installed entity resolver. If no resolver
- * has been installed, then it will be a zero pointer.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return The pointer to the installed entity resolver object.
- * @since DOM Level 3
- */
- virtual DOMEntityResolver* getEntityResolver() = 0;
-
- /**
- * Get a const pointer to the entity resolver
- *
- * This method returns the installed entity resolver. If no resolver
- * has been installed, then it will be a zero pointer.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return A const pointer to the installed entity resolver object.
- * @since DOM Level 3
- */
- virtual const DOMEntityResolver* getEntityResolver() const = 0;
-
- /**
- * Get a pointer to the application filter
- *
- * This method returns the installed application filter. If no filter
- * has been installed, then it will be a zero pointer.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return The pointer to the installed application filter.
- * @since DOM Level 3
- */
- virtual DOMBuilderFilter* getFilter() = 0;
-
- /**
- * Get a const pointer to the application filter
- *
- * This method returns the installed application filter. If no filter
- * has been installed, then it will be a zero pointer.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return A const pointer to the installed application filter
- * @since DOM Level 3
- */
- virtual const DOMBuilderFilter* getFilter() const = 0;
-
- // -----------------------------------------------------------------------
- // Setter methods
- // -----------------------------------------------------------------------
- /**
- * Set the error handler
- *
- * This method allows applications to install their own error handler
- * to trap error and warning messages.
- *
- * <i>Any previously set handler is merely dropped, since the parser
- * does not own them.</i>
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param handler A const pointer to the user supplied error
- * handler.
- *
- * @see #getErrorHandler
- * @since DOM Level 3
- */
- virtual void setErrorHandler(DOMErrorHandler* const handler) = 0;
-
- /**
- * Set the entity resolver
- *
- * This method allows applications to install their own entity
- * resolver. By installing an entity resolver, the applications
- * can trap and potentially redirect references to external
- * entities.
- *
- * <i>Any previously set resolver is merely dropped, since the parser
- * does not own them.</i>
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param handler A const pointer to the user supplied entity
- * resolver.
- *
- * @see #getEntityResolver
- * @since DOM Level 3
- */
- virtual void setEntityResolver(DOMEntityResolver* const handler) = 0;
-
- /**
- * Set the application filter
- *
- * When the application provides a filter, the parser will call out to
- * the filter at the completion of the construction of each Element node.
- * The filter implementation can choose to remove the element from the
- * document being constructed (unless the element is the document element)
- * or to terminate the parse early. If the document is being validated
- * when it's loaded the validation happens before the filter is called.
- *
- * <i>Any previously set filter is merely dropped, since the parser
- * does not own them.</i>
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param filter A const pointer to the user supplied application
- * filter.
- *
- * @see #getFilter
- * @since DOM Level 3
- */
- virtual void setFilter(DOMBuilderFilter* const filter) = 0;
-
- // -----------------------------------------------------------------------
- // Feature methods
- // -----------------------------------------------------------------------
- /**
- * Set the state of a feature
- *
- * It is possible for a DOMBuilder to recognize a feature name but to be
- * unable to set its value.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderFeatures for
- * the list of supported features.
- *
- * @param name The feature name.
- * @param state The requested state of the feature (true or false).
- * @exception DOMException
- * NOT_SUPPORTED_ERR: Raised when the DOMBuilder recognizes the
- * feature name but cannot set the requested value.
- * <br>NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the feature name.
- *
- * @see #setFeature
- * @see #canSetFeature
- * @since DOM Level 3
- */
- virtual void setFeature(const XMLCh* const name, const bool state) = 0;
-
- /**
- * Look up the value of a feature.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param name The feature name.
- * @return The current state of the feature (true or false)
- * @exception DOMException
- * NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the feature name.
- *
- * @see #getFeature
- * @see #canSetFeature
- * @since DOM Level 3
- */
- virtual bool getFeature(const XMLCh* const name) const = 0;
-
- /**
- * Query whether setting a feature to a specific value is supported.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param name The feature name.
- * @param state The requested state of the feature (true or false).
- * @return <code>true</code> if the feature could be successfully set
- * to the specified value, or <code>false</code> if the feature
- * is not recognized or the requested value is not supported. The
- * value of the feature itself is not changed.
- *
- * @see #getFeature
- * @see #setFeature
- * @since DOM Level 3
- */
- virtual bool canSetFeature(const XMLCh* const name, const bool state) const = 0;
-
- // -----------------------------------------------------------------------
- // Parsing methods
- // -----------------------------------------------------------------------
- /**
- * Parse via an input source object
- *
- * This method invokes the parsing process on the XML file specified
- * by the DOMInputSource parameter. This API is borrowed from the
- * SAX Parser interface.
- *
- * The parser owns the returned DOMDocument. It will be deleted
- * when the parser is released.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param source A const reference to the DOMInputSource object which
- * points to the XML file to be parsed.
- * @return If the DOMBuilder is a synchronous DOMBuilder the newly created
- * and populated DOMDocument is returned. If the DOMBuilder is
- * asynchronous then <code>null</code> is returned since the
- * document object is not yet parsed when this method returns.
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- *
- * @see DOMInputSource#DOMInputSource
- * @see #setEntityResolver
- * @see #setErrorHandler
- * @see resetDocumentPool
- * @since DOM Level 3
- */
- virtual DOMDocument* parse(const DOMInputSource& source) = 0;
-
- /**
- * Parse via a file path or URL
- *
- * This method invokes the parsing process on the XML file specified by
- * the Unicode string parameter 'systemId'.
- *
- * The parser owns the returned DOMDocument. It will be deleted
- * when the parser is released.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param systemId A const XMLCh pointer to the Unicode string which
- * contains the path to the XML file to be parsed.
- * @return If the DOMBuilder is a synchronous DOMBuilder the newly created
- * and populated DOMDocument is returned. If the DOMBuilder is
- * asynchronous then <code>null</code> is returned since the
- * document object is not yet parsed when this method returns.
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- *
- * @see #parse(DOMInputSource,...)
- * @see resetDocumentPool
- * @since DOM Level 3
- */
- virtual DOMDocument* parseURI(const XMLCh* const systemId) = 0;
-
- /**
- * Parse via a file path or URL (in the local code page)
- *
- * This method invokes the parsing process on the XML file specified by
- * the native char* string parameter 'systemId'.
- *
- * The parser owns the returned DOMDocument. It will be deleted
- * when the parser is released.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param systemId A const char pointer to a native string which
- * contains the path to the XML file to be parsed.
- * @return If the DOMBuilder is a synchronous DOMBuilder the newly created
- * and populated DOMDocument is returned. If the DOMBuilder is
- * asynchronous then <code>null</code> is returned since the
- * document object is not yet parsed when this method returns.
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- *
- * @see #parse(DOMInputSource,...)
- * @see resetDocumentPool
- */
- virtual DOMDocument* parseURI(const char* const systemId) = 0;
-
- /**
- * Parse via an input source object
- *
- * This method invokes the parsing process on the XML file specified
- * by the DOMInputSource parameter, and inserts the content into an
- * existing document at the position specified with the contextNode
- * and action arguments. When parsing the input stream the context node
- * is used for resolving unbound namespace prefixes.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param source A const reference to the DOMInputSource object which
- * points to the XML file to be parsed.
- * @param contextNode The node that is used as the context for the data
- * that is being parsed. This node must be a Document
- * node, a DocumentFragment node, or a node of a type
- * that is allowed as a child of an element, e.g. it
- * can not be an attribute node.
- * @param action This parameter describes which action should be taken
- * between the new set of node being inserted and the
- * existing children of the context node.
- * @exception DOMException
- * NOT_SUPPORTED_ERR: Raised when the DOMBuilder doesn't support
- * this method.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is
- * readonly.
- * @since DOM Level 3
- */
- virtual void parseWithContext
- (
- const DOMInputSource& source
- , DOMNode* const contextNode
- , const short action
- ) = 0;
- //@}
-
- // -----------------------------------------------------------------------
- // Non-standard Extension
- // -----------------------------------------------------------------------
- /** @name Non-standard Extension */
- //@{
-
- /**
- * Query the current value of a property in a DOMBuilder.
- *
- * The builder owns the returned pointer. The memory allocated for
- * the returned pointer will be destroyed when the builder is deleted.
- *
- * To ensure assessiblity of the returned information after the builder
- * is deleted, callers need to copy and store the returned information
- * somewhere else; otherwise you may get unexpected result. Since the returned
- * pointer is a generic void pointer, see
- * http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties to learn
- * exactly what type of property value each property returns for replication.
- *
- * @param name The unique identifier (URI) of the property being set.
- * @return The current value of the property. The pointer spans the same
- * life-time as the parser. A null pointer is returned if nothing
- * was specified externally.
- * @exception DOMException
- * <br>NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the requested property.
- */
- virtual void* getProperty(const XMLCh* const name) const = 0 ;
-
- /**
- * Set the value of any property in a DOMBuilder.
- * See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties for
- * the list of supported properties.
- *
- * It takes a void pointer as the property value. Application is required to initialize this void
- * pointer to a correct type. See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties
- * to learn exactly what type of property value each property expects for processing.
- * Passing a void pointer that was initialized with a wrong type will lead to unexpected result.
- * If the same property is set more than once, the last one takes effect.
- *
- * @param name The unique identifier (URI) of the property being set.
- * @param value The requested value for the property.
- * See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties to learn
- * exactly what type of property value each property expects for processing.
- * Passing a void pointer that was initialized with a wrong type will lead
- * to unexpected result.
- * @exception DOMException
- * <br>NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the requested property.
- */
- virtual void setProperty(const XMLCh* const name, void* value) = 0 ;
-
- /**
- * Called to indicate that this DOMBuilder is no longer in use
- * and that the implementation may relinquish any resources associated with it.
- *
- * Access to a released object will lead to unexpected result.
- */
- virtual void release() = 0;
-
- /** Reset the documents vector pool and release all the associated memory
- * back to the system.
- *
- * When parsing a document using a DOM parser, all memory allocated
- * for a DOM tree is associated to the DOM document.
- *
- * If you do multiple parse using the same DOM parser instance, then
- * multiple DOM documents will be generated and saved in a vector pool.
- * All these documents (and thus all the allocated memory)
- * won't be deleted until the parser instance is destroyed.
- *
- * If you don't need these DOM documents anymore and don't want to
- * destroy the DOM parser instance at this moment, then you can call this method
- * to reset the document vector pool and release all the allocated memory
- * back to the system.
- *
- * It is an error to call this method if you are in the middle of a
- * parse (e.g. in the mid of a progressive parse).
- *
- * @exception IOException An exception from the parser if this function
- * is called when a parse is in progress.
- *
- */
- virtual void resetDocumentPool() = 0;
-
- /**
- * Preparse schema grammar (XML Schema, DTD, etc.) via an input source
- * object.
- *
- * This method invokes the preparsing process on a schema grammar XML
- * file specified by the DOMInputSource parameter. If the 'toCache' flag
- * is enabled, the parser will cache the grammars for re-use. If a grammar
- * key is found in the pool, no caching of any grammar will take place.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param source A const reference to the DOMInputSource object which
- * points to the schema grammar file to be preparsed.
- * @param grammarType The grammar type (Schema or DTD).
- * @param toCache If <code>true</code>, we cache the preparsed grammar,
- * otherwise, no chaching. Default is <code>false</code>.
- * @return The preparsed schema grammar object (SchemaGrammar or
- * DTDGrammar). That grammar object is owned by the parser.
- *
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- *
- * @see DOMInputSource#DOMInputSource
- */
- virtual Grammar* loadGrammar(const DOMInputSource& source,
- const short grammarType,
- const bool toCache = false) = 0;
-
- /**
- * Preparse schema grammar (XML Schema, DTD, etc.) via a file path or URL
- *
- * This method invokes the preparsing process on a schema grammar XML
- * file specified by the file path parameter. If the 'toCache' flag is
- * enabled, the parser will cache the grammars for re-use. If a grammar
- * key is found in the pool, no caching of any grammar will take place.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param systemId A const XMLCh pointer to the Unicode string which
- * contains the path to the XML grammar file to be
- * preparsed.
- * @param grammarType The grammar type (Schema or DTD).
- * @param toCache If <code>true</code>, we cache the preparsed grammar,
- * otherwise, no chaching. Default is <code>false</code>.
- * @return The preparsed schema grammar object (SchemaGrammar or
- * DTDGrammar). That grammar object is owned by the parser.
- *
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- */
- virtual Grammar* loadGrammar(const XMLCh* const systemId,
- const short grammarType,
- const bool toCache = false) = 0;
-
- /**
- * Preparse schema grammar (XML Schema, DTD, etc.) via a file path or URL
- *
- * This method invokes the preparsing process on a schema grammar XML
- * file specified by the file path parameter. If the 'toCache' flag is
- * enabled, the parser will cache the grammars for re-use. If a grammar
- * key is found in the pool, no caching of any grammar will take place.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param systemId A const char pointer to a native string which contains
- * the path to the XML grammar file to be preparsed.
- * @param grammarType The grammar type (Schema or DTD).
- * @param toCache If <code>true</code>, we cache the preparsed grammar,
- * otherwise, no chaching. Default is <code>false</code>.
- * @return The preparsed schema grammar object (SchemaGrammar or
- * DTDGrammar). That grammar object is owned by the parser.
- *
- *
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- */
- virtual Grammar* loadGrammar(const char* const systemId,
- const short grammarType,
- const bool toCache = false) = 0;
-
- /**
- * Retrieve the grammar that is associated with the specified namespace key
- *
- * @param nameSpaceKey Namespace key
- * @return Grammar associated with the Namespace key.
- */
- virtual Grammar* getGrammar(const XMLCh* const nameSpaceKey) const = 0;
-
- /**
- * Retrieve the grammar where the root element is declared.
- *
- * @return Grammar where root element declared
- */
- virtual Grammar* getRootGrammar() const = 0;
-
- /**
- * Returns the string corresponding to a URI id from the URI string pool.
- *
- * @param uriId id of the string in the URI string pool.
- * @return URI string corresponding to the URI id.
- */
- virtual const XMLCh* getURIText(unsigned int uriId) const = 0;
-
- /**
- * Clear the cached grammar pool
- */
- virtual void resetCachedGrammarPool() = 0;
-
- /**
- * Returns the current src offset within the input source.
- *
- * @return offset within the input source
- */
- virtual unsigned int getSrcOffset() const = 0;
-
- //@}
-
-};
-
-
-XERCES_CPP_NAMESPACE_END
-
-#endif
diff --git a/src/xercesc/dom/DOMConfiguration.hpp b/src/xercesc/dom/DOMConfiguration.hpp
index 3cbdd8375..39a4264af 100644
--- a/src/xercesc/dom/DOMConfiguration.hpp
+++ b/src/xercesc/dom/DOMConfiguration.hpp
@@ -22,19 +22,20 @@
//------------------------------------------------------------------------------------
#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/RefVectorOf.hpp>
XERCES_CPP_NAMESPACE_BEGIN
/**
* The DOMConfiguration interface represents the configuration of
* a document and maintains a table of recognized parameters.
- * using the configuration, it is possible to change
+ * Using the configuration, it is possible to change
* Document.normalizeDocument behavior, such as replacing
* CDATASection nodes with Text nodes or
* specifying the type of the schema that must be used when the
* validation of the Document is requested. DOMConfiguration
* objects are also used in [DOM Level 3 Load and Save] in
- * the DOMBuilder and DOMWriter interfaces.
+ * the DOMLSParser and DOMLSSerializer interfaces.
*
* The DOMConfiguration distinguish two types of parameters:
* boolean (boolean parameters) and DOMUserData
@@ -55,14 +56,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* Note: Parameters are similar to features and properties used in
* SAX2 [SAX].
*
- * Issue DOMConfiguration-1:
- * Can we rename boolean parameters to "flags"?
- *
- * Issue DOMConfiguration-2:
- * Are boolean parameters and parameters within the same
- * scope for uniqueness? Which exception should be raised by
- * setBooleanParameter("error-handler", true)?
- *
* The following list of parameters defined in the DOM:
*
* "error-handler"
@@ -79,12 +72,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* within an error handler will result in implementation
* dependent behaviour.
*
- * Issue DOMConfiguration-4:
- * Should we say non "readonly" operations are
- * implementation dependent instead?
- * Resolution: Removed: "or re-invoking a validation
- * operation".
- *
* "schema-type"
* [optional]
* A DOMString object containing an absolute URI and
@@ -145,11 +132,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* In particular, there is no way to specify the order
* of the attributes in the DOM.
*
- * Issue normalizationFeature-14:
- * What happen to other features? are they
- * ignored? if yes, how do you know if a feature
- * is ignored?
- *
* false
* [required] (default)
* Do not canonicalize the document.
@@ -160,14 +142,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* [required] (default)
* Keep CDATASection nodes in the document.
*
- * Issue normalizationFeature-11:
- * Name does not work really well in this case.
- * ALH suggests renaming this to
- * "cdata-sections". It works for both load and
- * save.
- * Resolution: Renamed as suggested. (Telcon 27
- * Jan 2002).
- *
* false
* [required]
* Transform CDATASection nodes in the document
@@ -190,12 +164,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* [required]
* Exposed normalized values in the tree.
*
- * Issue normalizationFeature-8:
- * We should define "datatype normalization".
- * Resolution: DTD normalization always apply
- * because it's part of XML 1.0. Clarify the
- * spec. (Telcon 27 Jan 2002).
- *
* false
* [required] (default)
* Do not perform normalization on the tree.
@@ -216,12 +184,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* won't be removed if an implementation does not have
* any information available.
*
- * Issue normalizationFeature-2:
- * How does exactly work? What's the comment
- * about level 1 implementations?
- * Resolution: Remove "Level 1" (Telcon 16 Jan
- * 2002).
- *
* false
* [required]
* Keep all attributes and all content.
@@ -233,16 +195,6 @@ XERCES_CPP_NAMESPACE_BEGIN
* Keep EntityReference and Entity nodes
* in the document.
*
- * Issue normalizationFeature-9:
- * How does that interact with
- * expand-entity-references? ALH suggests
- * consolidating the two to a single feature
- * called "entity-references" that is used both
- * for load and save.
- * Resolution: Consolidate both features into a
- * single feature called 'entities'. (Telcon 27
- * Jan 2002).
- *
* false
* [required] (default)
* Remove all EntityReference and Entity
@@ -271,23 +223,9 @@ XERCES_CPP_NAMESPACE_BEGIN
* returns true only if the individual features
* specified above are appropriately set.
*
- * Issue normalizationFeature-12:
- * Name doesn't work well here. ALH suggests
- * renaming this to limit-to-infoset or
- * match-infoset, something like that.
- * Resolution: Renamed 'infoset' (Telcon 27 Jan
- * 2002).
- *
* false
* Setting infoset to false has no effect.
*
- * Issue normalizationFeature-13:
- * Shouldn't we change this to setting the
- * relevant options back to their default value?
- * Resolution: No, this is more like a
- * convenience function, it's better to keep it
- * simple. (F2F 28 Feb 2002).
- *
* "namespaces"
*
* true
@@ -384,19 +322,12 @@ XERCES_CPP_NAMESPACE_BEGIN
* has a schema. Note that validation must still
* happen if validate is true.
*
- * "whitespace-in-element-content"
+ * "element-content-whitespace"
*
* true
* [required] (default)
* Keep all white spaces in the document.
*
- * Issue normalizationFeature-15:
- * How does this feature interact with
- * "validate" and
- * Text.isWhitespaceInElementContent.
- * Resolution: issue no longer relevant (f2f
- * october 2002).
- *
* false
* [optional]
* Discard white space in element content while
@@ -455,6 +386,7 @@ public:
* @since DOM level 3
**/
virtual void setParameter(const XMLCh* name, const void* value) = 0;
+ virtual void setParameter(const XMLCh* name, bool value) = 0;
// -----------------------------------------------------------------------
// Getter methods
@@ -486,6 +418,17 @@ public:
* @since DOM level 3
**/
virtual bool canSetParameter(const XMLCh* name, const void* value) const = 0;
+ virtual bool canSetParameter(const XMLCh* name, bool value) const = 0;
+
+ /**
+ * The list of the parameters supported by this DOMConfiguration object and
+ * for which at least one value can be set by the application.
+ * Note that this list can also contain parameter names defined outside this specification.
+ *
+ * @return The list of parameters that can be used with setParameter/getParameter
+ * @since DOM level 3
+ **/
+ virtual const RefVectorOf<const XMLCh*>* getParameterNames() const = 0;
// -----------------------------------------------------------------------
// All constructors are hidden, just the destructor is available
diff --git a/src/xercesc/dom/DOMEntityResolver.hpp b/src/xercesc/dom/DOMEntityResolver.hpp
index 67e8c48cf..726072ed4 100644
--- a/src/xercesc/dom/DOMEntityResolver.hpp
+++ b/src/xercesc/dom/DOMEntityResolver.hpp
@@ -27,7 +27,7 @@
XERCES_CPP_NAMESPACE_BEGIN
-class DOMInputSource;
+class DOMLSInput;
/**
* DOMEntityResolver provides a way for applications to redirect references
@@ -47,7 +47,7 @@ class DOMInputSource;
* URNs.</p>
*
* @see DOMBuilder#setEntityResolver
- * @see DOMInputSource#DOMInputSource
+ * @see DOMLSInput#DOMLSInput
* @since DOM Level 3
*/
class CDOM_EXPORT DOMEntityResolver
@@ -87,12 +87,12 @@ public:
// -----------------------------------------------------------------------
// Virtual DOMEntityResolver interface
// -----------------------------------------------------------------------
- /** @name Functions introduced in DOM Level 2 */
+ /** @name Functions introduced in DOM Level 3 */
//@{
/**
* Allow the application to resolve external entities.
*
- * <p>The DOMBuilder will call this method before opening any external
+ * <p>The DOMLSParser will call this method before opening any external
* entity except the top-level document entity (including the
* external DTD subset, external entities referenced within the
* DTD, and external entities referenced within the document
@@ -109,30 +109,30 @@ public:
* <p>If the system identifier is a URL, the DOMBuilder parser must
* resolve it fully before reporting it to the application.</p>
*
- * <p> The returned DOMInputSource is owned by the DOMBuilder which is
+ * <p> The returned DOMLSInput is owned by the DOMBuilder which is
* responsible to clean up the memory.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @param publicId The public identifier of the external entity
* being referenced, or null if none was supplied.
* @param systemId The system identifier of the external entity
* being referenced.
* @param baseURI The absolute base URI of the resource being parsed, or
* <code>null</code> if there is no base URI.
- * @return A DOMInputSource object describing the new input source,
+ * @return A DOMLSInput object describing the new input source,
* or <code>null</code> to request that the parser open a regular
* URI connection to the system identifier.
- * The returned DOMInputSource is owned by the DOMBuilder which is
+ * The returned DOMLSInput is owned by the DOMBuilder which is
* responsible to clean up the memory.
* @exception DOMSystemException Any DOMSystemException exception, possibly
* wrapping another exception.
- * @see DOMInputSource#DOMInputSource
+ * @see DOMLSInput#DOMLSInput
* @since DOM Level 3
*/
- virtual DOMInputSource* resolveEntity
+ virtual DOMLSInput* resolveEntity
(
- const XMLCh* const publicId
+ const XMLCh* const resourceType
+ , const XMLCh* const namespaceUri
+ , const XMLCh* const publicId
, const XMLCh* const systemId
, const XMLCh* const baseURI
) = 0;
diff --git a/src/xercesc/dom/DOMImplementation.hpp b/src/xercesc/dom/DOMImplementation.hpp
index dc47da93d..bcf3e101b 100644
--- a/src/xercesc/dom/DOMImplementation.hpp
+++ b/src/xercesc/dom/DOMImplementation.hpp
@@ -23,6 +23,7 @@
#include <xercesc/dom/DOMImplementationLS.hpp>
#include <xercesc/dom/DOMException.hpp>
+#include <xercesc/dom/DOMLSException.hpp>
#include <xercesc/dom/DOMRangeException.hpp>
#include <xercesc/util/PlatformUtils.hpp>
@@ -226,13 +227,13 @@ public:
/**
* Non-standard extension
*
- * Load the default error text message for DOMException.
- * @param msgToLoad The DOM ExceptionCode id to be processed
- * @param toFill The buffer that will hold the output on return. The
- * size of this buffer should at least be 'maxChars + 1'.
- * @param maxChars The maximum number of output characters that can be
- * accepted. If the result will not fit, it is an error.
- * @return <code>true</code> if the message is successfully loaded
+ * Load the default error text message for DOMException.
+ * @param msgToLoad The DOM ExceptionCode id to be processed
+ * @param toFill The buffer that will hold the output on return. The
+ * size of this buffer should at least be 'maxChars + 1'.
+ * @param maxChars The maximum number of output characters that can be
+ * accepted. If the result will not fit, it is an error.
+ * @return <code>true</code> if the message is successfully loaded
*/
static bool loadDOMExceptionMsg
(
@@ -244,13 +245,31 @@ public:
/**
* Non-standard extension
*
- * Load the default error text message for DOMRangeException.
- * @param msgToLoad The DOM RangeExceptionCode id to be processed
- * @param toFill The buffer that will hold the output on return. The
- * size of this buffer should at least be 'maxChars + 1'.
- * @param maxChars The maximum number of output characters that can be
- * accepted. If the result will not fit, it is an error.
- * @return <code>true</code> if the message is successfully loaded
+ * Load the default error text message for DOMLSException.
+ * @param msgToLoad The DOM LSExceptionCode id to be processed
+ * @param toFill The buffer that will hold the output on return. The
+ * size of this buffer should at least be 'maxChars + 1'.
+ * @param maxChars The maximum number of output characters that can be
+ * accepted. If the result will not fit, it is an error.
+ * @return <code>true</code> if the message is successfully loaded
+ */
+ static bool loadDOMExceptionMsg
+ (
+ const DOMLSException::LSExceptionCode msgToLoad
+ , XMLCh* const toFill
+ , const unsigned int maxChars
+ );
+
+ /**
+ * Non-standard extension
+ *
+ * Load the default error text message for DOMRangeException.
+ * @param msgToLoad The DOM RangeExceptionCode id to be processed
+ * @param toFill The buffer that will hold the output on return. The
+ * size of this buffer should at least be 'maxChars + 1'.
+ * @param maxChars The maximum number of output characters that can be
+ * accepted. If the result will not fit, it is an error.
+ * @return <code>true</code> if the message is successfully loaded
*/
static bool loadDOMExceptionMsg
(
diff --git a/src/xercesc/dom/DOMImplementationLS.hpp b/src/xercesc/dom/DOMImplementationLS.hpp
index 9af8f6ffe..5da22427d 100644
--- a/src/xercesc/dom/DOMImplementationLS.hpp
+++ b/src/xercesc/dom/DOMImplementationLS.hpp
@@ -27,16 +27,16 @@
XERCES_CPP_NAMESPACE_BEGIN
-class DOMBuilder;
-class DOMWriter;
-class DOMInputSource;
+class DOMLSParser;
+class DOMLSSerializer;
+class DOMLSInput;
+class DOMLSOutput;
class MemoryManager;
class XMLGrammarPool;
/**
* <p><code>DOMImplementationLS</code> contains the factory methods for
- * creating objects that implement the <code>DOMBuilder</code> (parser) and
- * <code>DOMWriter</code> (serializer) interfaces.</p>
+ * creating Load and Save objects.</p>
*
* <p>An object that implements DOMImplementationLS is obtained by doing a
* binding specific cast from DOMImplementation to DOMImplementationLS.
@@ -86,12 +86,12 @@ public:
/** @name Public constants */
//@{
/**
- * Create a synchronous or an asynchronous <code>DOMBuilder</code>.
- * @see createDOMBuilder(const short mode, const XMLCh* const schemaType)
+ * Create a synchronous or an asynchronous <code>DOMLSParser</code>.
+ * @see createLSParser(const unsigned short mode, const XMLCh* const schemaType)
* @since DOM Level 3
*
*/
- enum
+ enum DOMImplementationLSMode
{
MODE_SYNCHRONOUS = 1,
MODE_ASYNCHRONOUS = 2
@@ -99,7 +99,7 @@ public:
//@}
// -----------------------------------------------------------------------
- // Virtual DOMImplementation LS interface
+ // Virtual DOMImplementationLS interface
// -----------------------------------------------------------------------
/** @name Functions introduced in DOM Level 3 */
//@{
@@ -107,69 +107,73 @@ public:
// Factory create methods
// -----------------------------------------------------------------------
/**
- * Create a new DOMBuilder. The newly constructed parser may then be
- * configured by means of its setFeature method, and used to parse
- * documents by means of its parse method.
+ * Create a new DOMLSParser. The newly constructed parser may then be configured
+ * by means of its DOMConfiguration object, and used to parse documents by
+ * means of its parse method.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param mode The mode argument is either <code>MODE_SYNCHRONOUS</code> or
- * <code>MODE_ASYNCHRONOUS</code>, if mode is <code>MODE_SYNCHRONOUS</code>
- * then the <code>DOMBuilder</code> that is created will operate in
- * synchronous mode, if it's <code>MODE_ASYNCHRONOUS</code> then the
- * <code>DOMBuilder</code> that is created will operate in asynchronous
- * mode.
- * @param schemaType An absolute URI representing the type of the schema
- * language used during the load of a DOMDocument using the newly created
- * <code>DOMBuilder</code>. Note that no lexical checking is done on the
- * absolute URI. In order to create a DOMBuilder for any kind of schema
- * types (i.e. the DOMBuilder will be free to use any schema found), use
- * the value <code>null</code>.
- * @param manager Pointer to the memory manager to be used to
- * allocate objects.
+ * @param mode The mode argument is either <code>MODE_SYNCHRONOUS</code>
+ * or <code>MODE_ASYNCHRONOUS</code>, if mode is <code>MODE_SYNCHRONOUS</code>
+ * then the <code>DOMLSParser</code> that is created will operate in synchronous
+ * mode, if it's <code>MODE_ASYNCHRONOUS</code> then the <code>DOMLSParser</code>
+ * that is created will operate in asynchronous mode.
+ * @param schemaType An absolute URI representing the type of the schema
+ * language used during the load of a <code>DOMDocument</code> using the newly
+ * created <code>DOMLSParser</code>. Note that no lexical checking is done on
+ * the absolute URI. In order to create a <code>DOMLSParser</code> for any kind
+ * of schema types (i.e. the <code>DOMLSParser</code> will be free to use any
+ * schema found), use the value <code>NULL</code>.
+ * <b>Note</b>: For W3C XML Schema [XML Schema Part 1], applications must use
+ * the value "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0],
+ * applications must use the value "http://www.w3.org/TR/REC-xml".
+ * Other Schema languages are outside the scope of the W3C and therefore should
+ * recommend an absolute URI in order to use this method.
+ * @param manager Pointer to the memory manager to be used to allocate objects.
* @param gramPool The collection of cached grammers.
- * @return The newly created <code>DOMBuilder</code> object. This
- * <code>DOMBuilder</code> is either synchronous or asynchronous depending
+ * @return The newly created <code>DOMLSParser</code> object. This
+ * <code>DOMLSParser</code> is either synchronous or asynchronous depending
* on the value of the <code>mode</code> argument.
* @exception DOMException NOT_SUPPORTED_ERR: Raised if the requested mode
* or schema type is not supported.
*
- * @see DOMBuilder
+ * @see DOMLSParser
* @since DOM Level 3
*/
- virtual DOMBuilder* createDOMBuilder(const short mode,
- const XMLCh* const schemaType,
- MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager,
- XMLGrammarPool* const gramPool = 0) = 0;
+ virtual DOMLSParser* createLSParser(const unsigned short mode,
+ const XMLCh* const schemaType,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager,
+ XMLGrammarPool* const gramPool = 0) = 0;
/**
- * Create a new DOMWriter. DOMWriters are used to serialize a DOM tree
+ * Create a new DOMLSSerializer. DOMLSSerializer is used to serialize a DOM tree
* back into an XML document.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return The newly created <code>DOMWriter</code> object.
+ * @return The newly created <code>DOMLSSerializer</code> object.
*
- * @see DOMWriter
+ * @see DOMLSSerializer
* @since DOM Level 3
*/
- virtual DOMWriter* createDOMWriter(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager) = 0;
+ virtual DOMLSSerializer* createLSSerializer(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager) = 0;
/**
- * Create a new "empty" DOMInputSource.
+ * Create a new "empty" DOMLSInput.
*
- * <p><b>"Experimental - subject to change"</b></p>
+ * @return The newly created <code>DOMLSInput</code> object.
*
- * @return The newly created <code>DOMInputSource</code> object.
- * @exception DOMException NOT_SUPPORTED_ERR: Raised if this function is not
- * supported by implementation
- *
- * @see DOMInputSource
+ * @see DOMLSInput
* @since DOM Level 3
*/
- virtual DOMInputSource* createDOMInputSource() = 0;
+ virtual DOMLSInput* createLSInput() = 0;
+ /**
+ * Create a new "empty" LSOutput.
+ *
+ * @return The newly created <code>LSOutput</code> object.
+ *
+ * @see LSOutput
+ * @since DOM Level 3
+ */
+ virtual DOMLSOutput* createLSOutput() = 0;
//@}
};
diff --git a/src/xercesc/dom/DOMLSException.cpp b/src/xercesc/dom/DOMLSException.cpp
new file mode 100644
index 000000000..297592e65
--- /dev/null
+++ b/src/xercesc/dom/DOMLSException.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2001-2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+#include <xercesc/dom/DOMImplementation.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/framework/MemoryManager.hpp>
+
+#include "DOMLSException.hpp"
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+// ---------------------------------------------------------------------------
+// Destructor and Constructor
+// ---------------------------------------------------------------------------
+DOMLSException::~DOMLSException()
+{
+ if (msg && fMsgOwned)
+ fMemoryManager->deallocate((void*)msg);
+}
+
+DOMLSException::DOMLSException()
+:code((LSExceptionCode) 0)
+,msg(0)
+,fMemoryManager(0)
+,fMsgOwned(false)
+{
+}
+
+DOMLSException::DOMLSException( short exCode
+ , const XMLCh* message
+ , MemoryManager* const memoryManager)
+:code((LSExceptionCode) exCode)
+,msg(message)
+,fMemoryManager(memoryManager)
+,fMsgOwned(false)
+{
+ if (!message)
+ {
+ const unsigned int msgSize = 2047;
+ XMLCh errText[msgSize + 1];
+ fMsgOwned = true;
+
+ // load the text
+ msg = XMLString::replicate
+ (
+ DOMImplementation::loadDOMExceptionMsg(code, errText, msgSize) ? errText : XMLUni::fgDefErrMsg
+ , fMemoryManager
+ );
+
+ }
+}
+
+DOMLSException::DOMLSException(const DOMLSException &other)
+:code(other.code)
+,msg(0)
+,fMemoryManager(other.fMemoryManager)
+,fMsgOwned(other.fMsgOwned)
+{
+ msg = other.fMsgOwned? XMLString::replicate(other.msg, other.fMemoryManager) : other.msg;
+}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/dom/DOMLSException.hpp b/src/xercesc/dom/DOMLSException.hpp
new file mode 100644
index 000000000..e895a3dcb
--- /dev/null
+++ b/src/xercesc/dom/DOMLSException.hpp
@@ -0,0 +1,168 @@
+#ifndef DOMLSException_HEADER_GUARD_
+#define DOMLSException_HEADER_GUARD_
+
+/*
+ * Copyright 2001-2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
+/**
+ * Parser or write operations may throw an LSException if the processing is stopped.
+ * The processing can be stopped due to a <code>DOMError</code> with a severity of
+ * DOMError::DOM_SEVERITY_FATAL_ERROR or a non recovered DOMError::DOM_SEVERITY_ERROR,
+ * or if <code>DOMErrorHandler::handleError()</code> returned <code>false</code>.
+ * <p><b>Note</b>: As suggested in the definition of the constants in the <code>DOMError</code>
+ * interface, a DOM implementation may choose to continue after a fatal error, but the
+ * resulting DOM tree is then implementation dependent.
+ * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/DOM3-LS.html'>
+ * Document Object Model (DOM) Level 3 Load and Save Specification</a>.
+ * @since DOM Level 3
+ */
+
+class MemoryManager;
+
+class CDOM_EXPORT DOMLSException {
+public:
+ // -----------------------------------------------------------------------
+ // Constructors
+ // -----------------------------------------------------------------------
+ /** @name Constructors */
+ //@{
+ /**
+ * Default constructor for DOMLSException.
+ *
+ */
+ DOMLSException();
+
+ /**
+ * Constructor which takes an error code and a message.
+ *
+ * @param code The error code which indicates the exception
+ * @param message The string containing the error message
+ * @param memoryManager The memory manager used to (de)allocate memory
+ */
+ DOMLSException( short code
+ , const XMLCh* message
+ , MemoryManager* const memoryManager);
+
+ /**
+ * Copy constructor.
+ *
+ * @param other The object to be copied.
+ */
+ DOMLSException(const DOMLSException &other);
+
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Destructors
+ // -----------------------------------------------------------------------
+ /** @name Destructor. */
+ //@{
+ /**
+ * Destructor for DOMLSException.
+ *
+ */
+ virtual ~DOMLSException();
+ //@}
+
+public:
+ // -----------------------------------------------------------------------
+ // Class Types
+ // -----------------------------------------------------------------------
+ /** @name Public Contants */
+ //@{
+ /**
+ * ExceptionCode
+ *
+ * <p><code>PARSE_ERR:</code>
+ * If an attempt was made to load a document, or an XML Fragment, using DOMLSParser
+ * and the processing has been stopped.</p>
+ *
+ * <p><code>SERIALIZE_ERR:</code>
+ * If an attempt was made to serialize a Node using LSSerializer and the processing
+ * has been stopped.</p>
+ *
+ * @since DOM Level 3
+ */
+ enum LSExceptionCode {
+ PARSE_ERR = 81,
+ SERIALIZE_ERR = 82
+ };
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Getter
+ // -----------------------------------------------------------------------
+ inline const XMLCh* getMessage() const;
+
+ // -----------------------------------------------------------------------
+ // Class Types
+ // -----------------------------------------------------------------------
+ /** @name Public variables */
+ //@{
+ /**
+ * A code value, from the set defined by the LSExceptionCode enum,
+ * indicating the type of error that occured.
+ */
+ LSExceptionCode code;
+
+ /**
+ * A string value. Applications may use this field to hold an error
+ * message. The field value is not set by the DOM implementation,
+ * meaning that the string will be empty when an exception is first
+ * thrown.
+ */
+ const XMLCh *msg;
+ //@}
+
+protected:
+
+ MemoryManager* fMemoryManager;
+
+private:
+
+ /**
+ * A boolean value.
+ * If the message is provided by the applications, it is not adopted.
+ * If the message is resolved by the DOM implementation, it is owned.
+ */
+ bool fMsgOwned;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMLSException & operator = (const DOMLSException &);
+};
+
+inline const XMLCh* DOMLSException::getMessage() const
+{
+ return msg;
+}
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
+
diff --git a/src/xercesc/dom/DOMLSInput.hpp b/src/xercesc/dom/DOMLSInput.hpp
new file mode 100644
index 000000000..8ec25014f
--- /dev/null
+++ b/src/xercesc/dom/DOMLSInput.hpp
@@ -0,0 +1,257 @@
+#ifndef DOMLSInput_HEADER_GUARD_
+#define DOMLSInput_HEADER_GUARD_
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+
+#include <xercesc/util/XercesDefs.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
+class BinInputStream;
+
+
+/**
+ * This interface represents a single input source for an XML entity.
+ *
+ * <p>This interface allows an application to encapsulate information about
+ * an input source in a single object, which may include a public identifier,
+ * a system identifier, a byte stream (possibly with a specified encoding),
+ * and/or a character stream.</p>
+ *
+ * <p>There are two places that the application will deliver this input source
+ * to the parser: as the argument to the parse method, or as the return value
+ * of the DOMEntityResolver.resolveEntity method.</p>
+ *
+ * <p>The DOMBuilder will use the DOMLSInput object to determine how to
+ * read XML input. If there is a character stream available, the parser will
+ * read that stream directly; if not, the parser will use a byte stream, if
+ * available; if neither a character stream nor a byte stream is available,
+ * the parser will attempt to open a URI connection to the resource identified
+ * by the system identifier.</p>
+ *
+ * <p>A DOMLSInput object belongs to the application: the parser shall
+ * never modify it in any way (it may modify a copy if necessary).</p>
+ *
+ * @see DOMBuilder#parse
+ * @see DOMEntityResolver#resolveEntity
+ * @since DOM Level 3
+ */
+class CDOM_EXPORT DOMLSInput
+{
+protected:
+ // -----------------------------------------------------------------------
+ // Hidden constructors
+ // -----------------------------------------------------------------------
+ /** @name Hidden constructors */
+ //@{
+ DOMLSInput() {};
+ //@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ /** @name Unimplemented constructors and operators */
+ //@{
+ DOMLSInput(const DOMLSInput &);
+ DOMLSInput & operator = (const DOMLSInput &);
+ //@}
+
+public:
+ // -----------------------------------------------------------------------
+ // All constructors are hidden, just the destructor is available
+ // -----------------------------------------------------------------------
+ /** @name Destructor */
+ //@{
+ /**
+ * Destructor
+ *
+ */
+ virtual ~DOMLSInput() {};
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Virtual DOMLSInput interface
+ // -----------------------------------------------------------------------
+ /** @name Functions introduced in DOM Level 3 */
+ //@{
+ // -----------------------------------------------------------------------
+ // Getter methods
+ // -----------------------------------------------------------------------
+ /**
+ * Makes the byte stream for this input source.
+ *
+ * <p>The derived class must create and return a binary input stream of an
+ * appropriate type for its kind of data source. The returned stream must
+ * be dynamically allocated and becomes the parser's property.
+ * </p>
+ *
+ * @see BinInputStream
+ */
+ virtual BinInputStream* getByteStream() const = 0;
+
+ /**
+ * An input source can be set to force the parser to assume a particular
+ * encoding for the data that input source reprsents, via the setEncoding()
+ * method. This method returns name of the encoding that is to be forced.
+ * If the encoding has never been forced, it returns a null pointer.
+ *
+ * @return The forced encoding, or null if none was supplied.
+ * @see #setEncoding
+ * @since DOM Level 3
+ */
+ virtual const XMLCh* getEncoding() const = 0;
+
+
+ /**
+ * Get the public identifier for this input source.
+ *
+ * @return The public identifier, or null if none was supplied.
+ * @see #setPublicId
+ * @since DOM Level 3
+ */
+ virtual const XMLCh* getPublicId() const = 0;
+
+
+ /**
+ * Get the system identifier for this input source.
+ *
+ * <p>If the system ID is a URL, it will be fully resolved.</p>
+ *
+ * @return The system identifier.
+ * @see #setSystemId
+ * @since DOM Level 3
+ */
+ virtual const XMLCh* getSystemId() const = 0;
+
+
+ /**
+ * Get the base URI to be used for resolving relative URIs to absolute
+ * URIs. If the baseURI is itself a relative URI, the behavior is
+ * implementation dependent.
+ *
+ * @return The base URI.
+ * @see #setBaseURI
+ * @since DOM Level 3
+ */
+ virtual const XMLCh* getBaseURI() const = 0;
+
+ // -----------------------------------------------------------------------
+ // Setter methods
+ // -----------------------------------------------------------------------
+ /**
+ * Set the encoding which will be required for use with the XML text read
+ * via a stream opened by this input source.
+ *
+ * <p>This is usually not set, allowing the encoding to be sensed in the
+ * usual XML way. However, in some cases, the encoding in the file is known
+ * to be incorrect because of intermediate transcoding, for instance
+ * encapsulation within a MIME document.
+ *
+ * @param encodingStr The name of the encoding to force.
+ * @since DOM Level 3
+ */
+ virtual void setEncoding(const XMLCh* const encodingStr) = 0;
+
+
+ /**
+ * Set the public identifier for this input source.
+ *
+ * <p>The public identifier is always optional: if the application writer
+ * includes one, it will be provided as part of the location information.</p>
+ *
+ * @param publicId The public identifier as a string.
+ * @see #getPublicId
+ * @since DOM Level 3
+ */
+ virtual void setPublicId(const XMLCh* const publicId) = 0;
+
+ /**
+ * Set the system identifier for this input source.
+ *
+ * <p>The system id is always required. The public id may be used to map
+ * to another system id, but the system id must always be present as a fall
+ * back.</p>
+ *
+ * <p>If the system ID is a URL, it must be fully resolved.</p>
+ *
+ * @param systemId The system identifier as a string.
+ * @see #getSystemId
+ * @since DOM Level 3
+ */
+ virtual void setSystemId(const XMLCh* const systemId) = 0;
+
+ /**
+ * Set the base URI to be used for resolving relative URIs to absolute
+ * URIs. If the baseURI is itself a relative URI, the behavior is
+ * implementation dependent.
+ *
+ * @param baseURI The base URI.
+ * @see #getBaseURI
+ * @since DOM Level 3
+ */
+ virtual void setBaseURI(const XMLCh* const baseURI) = 0;
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Non-standard Extension
+ // -----------------------------------------------------------------------
+ /** @name Non-standard Extension */
+ //@{
+
+ /**
+ * Indicates if the parser should issue fatal error if this input source
+ * is not found. If set to false, the parser issue warning message instead.
+ *
+ * @param flag True if the parser should issue fatal error if this input source is not found.
+ * If set to false, the parser issue warning message instead. (Default: true)
+ *
+ * @see #getIssueFatalErrorIfNotFound
+ */
+ virtual void setIssueFatalErrorIfNotFound(const bool flag) = 0;
+
+
+ /**
+ * Get the flag that indicates if the parser should issue fatal error if this input source
+ * is not found.
+ *
+ * @return True if the parser should issue fatal error if this input source is not found.
+ * False if the parser issue warning message instead.
+ * @see #setIssueFatalErrorIfNotFound
+ */
+ virtual bool getIssueFatalErrorIfNotFound() const = 0;
+
+ /**
+ * Called to indicate that this DOMLSInput is no longer in use
+ * and that the implementation may relinquish any resources associated with it.
+ *
+ * Access to a released object will lead to unexpected result.
+ */
+ virtual void release() = 0;
+ //@}
+};
+
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
diff --git a/src/xercesc/dom/DOMInputSource.hpp b/src/xercesc/dom/DOMLSOutput.hpp
similarity index 94%
rename from src/xercesc/dom/DOMInputSource.hpp
rename to src/xercesc/dom/DOMLSOutput.hpp
index 7f6fa6ef7..2483dd426 100644
--- a/src/xercesc/dom/DOMInputSource.hpp
+++ b/src/xercesc/dom/DOMLSOutput.hpp
@@ -1,5 +1,5 @@
-#ifndef DOMInputSource_HEADER_GUARD_
-#define DOMInputSource_HEADER_GUARD_
+#ifndef DOMLSInput_HEADER_GUARD_
+#define DOMLSInput_HEADER_GUARD_
/*
* Copyright 2002,2004 The Apache Software Foundation.
@@ -42,21 +42,21 @@ class BinInputStream;
* to the parser: as the argument to the parse method, or as the return value
* of the DOMEntityResolver.resolveEntity method.</p>
*
- * <p>The DOMBuilder will use the DOMInputSource object to determine how to
+ * <p>The DOMBuilder will use the DOMLSOutput object to determine how to
* read XML input. If there is a character stream available, the parser will
* read that stream directly; if not, the parser will use a byte stream, if
* available; if neither a character stream nor a byte stream is available,
* the parser will attempt to open a URI connection to the resource identified
* by the system identifier.</p>
*
- * <p>A DOMInputSource object belongs to the application: the parser shall
+ * <p>A DOMLSOutput object belongs to the application: the parser shall
* never modify it in any way (it may modify a copy if necessary).</p>
*
* @see DOMBuilder#parse
* @see DOMEntityResolver#resolveEntity
* @since DOM Level 3
*/
-class CDOM_EXPORT DOMInputSource
+class CDOM_EXPORT DOMLSOutput
{
protected:
// -----------------------------------------------------------------------
@@ -64,7 +64,7 @@ protected:
// -----------------------------------------------------------------------
/** @name Hidden constructors */
//@{
- DOMInputSource() {};
+ DOMLSOutput() {};
//@}
private:
@@ -73,8 +73,8 @@ private:
// -----------------------------------------------------------------------
/** @name Unimplemented constructors and operators */
//@{
- DOMInputSource(const DOMInputSource &);
- DOMInputSource & operator = (const DOMInputSource &);
+ DOMLSOutput(const DOMLSOutput &);
+ DOMLSOutput & operator = (const DOMLSOutput &);
//@}
public:
@@ -87,11 +87,11 @@ public:
* Destructor
*
*/
- virtual ~DOMInputSource() {};
+ virtual ~DOMLSOutput() {};
//@}
// -----------------------------------------------------------------------
- // Virtual DOMInputSource interface
+ // Virtual DOMLSOutput interface
// -----------------------------------------------------------------------
/** @name Functions introduced in DOM Level 3 */
//@{
@@ -264,7 +264,7 @@ public:
virtual bool getIssueFatalErrorIfNotFound() const = 0;
/**
- * Called to indicate that this DOMInputSource is no longer in use
+ * Called to indicate that this DOMLSOutput is no longer in use
* and that the implementation may relinquish any resources associated with it.
*
* Access to a released object will lead to unexpected result.
diff --git a/src/xercesc/dom/DOMLSParser.hpp b/src/xercesc/dom/DOMLSParser.hpp
new file mode 100644
index 000000000..c3641fd70
--- /dev/null
+++ b/src/xercesc/dom/DOMLSParser.hpp
@@ -0,0 +1,765 @@
+#ifndef DOMLSParser_HEADER_GUARD_
+#define DOMLSParser_HEADER_GUARD_
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ *
+ */
+
+
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMConfiguration.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
+class DOMErrorHandler;
+class DOMEntityResolver;
+class DOMLSInput;
+class DOMLSParserFilter;
+class DOMNode;
+class DOMDocument;
+class Grammar;
+
+/**
+ * DOMLSParser provides an API for parsing XML documents and building the
+ * corresponding DOM document tree. A DOMLSParser instance is obtained from
+ * the DOMImplementationLS interface by invoking its createLSParser method.
+ *
+ * @since DOM Level 3
+ *
+ */
+class CDOM_EXPORT DOMLSParser
+{
+protected :
+ // -----------------------------------------------------------------------
+ // Hidden constructors
+ // -----------------------------------------------------------------------
+ /** @name Hidden constructors */
+ //@{
+ DOMLSParser() {};
+ //@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ /** @name Unimplemented constructors and operators */
+ //@{
+ DOMLSParser(const DOMLSParser &);
+ DOMLSParser & operator = (const DOMLSParser &);
+ //@}
+
+public:
+ // -----------------------------------------------------------------------
+ // All constructors are hidden, just the destructor is available
+ // -----------------------------------------------------------------------
+ /** @name Destructor */
+ //@{
+ /**
+ * Destructor
+ *
+ */
+ virtual ~DOMLSParser() {};
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Class types
+ // -----------------------------------------------------------------------
+ /** @name Public Constants */
+ //@{
+ /**
+ * A set of possible actions for the parseWithContext method.
+ *
+ * <p><code>ACTION_APPEND_AS_CHILDREN</code>:
+ * Append the result of the parse operation as children of the context node.
+ * For this action to work, the context node must be a <code>DOMElement</code>
+ * or a <code>DOMDocumentFragment</code>. </p>
+ *
+ * <p><code>ACTION_INSERT_AFTER</code>:
+ * Insert the result of the parse operation as the immediately following sibling
+ * of the context node. For this action to work the context node's parent must
+ * be a <code>DOMElement</code> or a <code>DOMDocumentFragment</code>. </p>
+ *
+ * <p><code>ACTION_INSERT_BEFORE</code>:
+ * Insert the result of the parse operation as the immediately preceding sibling
+ * of the context node. For this action to work the context node's parent must
+ * be a <code>DOMElement</code> or a <code>DOMDocumentFragment</code>. </p>
+ *
+ * <p><code>ACTION_REPLACE</code>:
+ * Replace the context node with the result of the parse operation. For this
+ * action to work, the context node must have a parent, and the parent must be
+ * a <code>DOMElement</code> or a <code>DOMDocumentFragment</code>. </p>
+ *
+ * <p><code>ACTION_REPLACE_CHILDREN</code>:
+ * Replace all the children of the context node with the result of the parse
+ * operation. For this action to work, the context node must be a <code>DOMElement</code>,
+ * a <code>DOMDocument</code>, or a <code>DOMDocumentFragment</code>. </p>
+ *
+ * @see parseWithContext(...)
+ * @since DOM Level 3
+ */
+ enum ActionType
+ {
+ ACTION_APPEND_AS_CHILDREN = 1,
+ ACTION_REPLACE_CHILDREN = 2,
+ ACTION_INSERT_BEFORE = 3,
+ ACTION_INSERT_AFTER = 4,
+ ACTION_REPLACE = 5
+ };
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Virtual DOMLSParser interface
+ // -----------------------------------------------------------------------
+ /** @name Functions introduced in DOM Level 3 */
+ //@{
+
+ // -----------------------------------------------------------------------
+ // Getter methods
+ // -----------------------------------------------------------------------
+
+ /**
+ * Get a pointer to the <code>DOMConfiguration</code> object used when parsing
+ * an input source.
+ * This <code>DOMConfiguration</code> is specific to the parse operation.
+ * No parameter values from this <code>DOMConfiguration</code> object are passed
+ * automatically to the <code>DOMConfiguration</code> object on the
+ * <code>DOMDocument</code> that is created, or used, by the parse operation.
+ * The DOM application is responsible for passing any needed parameter values
+ * from this <code>DOMConfiguration</code> object to the <code>DOMConfiguration</code>
+ * object referenced by the <code>DOMDocument</code> object.
+ *
+ * In addition to the parameters recognized in on the <code>DOMConfiguration</code>
+ * interface defined in [DOM Level 3 Core], the <code>DOMConfiguration</code> objects
+ * for <code>DOMLSParser</code> add or modify the following parameters:
+ *
+ * "charset-overrides-xml-encoding"
+ * true [optional] (default)
+ * If a higher level protocol such as HTTP [IETF RFC 2616] provides an
+ * indication of the character encoding of the input stream being processed,
+ * that will override any encoding specified in the XML declaration or the
+ * Text declaration (see also section 4.3.3, "Character Encoding in Entities",
+ * in [XML 1.0]). Explicitly setting an encoding in the <code>DOMLSInput</code>
+ * overrides any encoding from the protocol.
+ * false [required]
+ * The parser ignores any character set encoding information from higher-level
+ * protocols.
+ *
+ * "disallow-doctype"
+ * true [optional]
+ * Throw a fatal "doctype-not-allowed" error if a doctype node is found while
+ * parsing the document. This is useful when dealing with things like SOAP
+ * envelopes where doctype nodes are not allowed.
+ * false [required] (default)
+ * Allow doctype nodes in the document.
+ *
+ * "ignore-unknown-character-denormalizations"
+ * true [required] (default)
+ * If, while verifying full normalization when [XML 1.1] is supported, a
+ * processor encounters characters for which it cannot determine the normalization
+ * properties, then the processor will ignore any possible denormalizations
+ * caused by these characters.
+ * This parameter is ignored for [XML 1.0].
+ * false [optional]
+ * Report an fatal "unknown-character-denormalization" error if a character
+ * is encountered for which the processor cannot determine the normalization
+ * properties.
+ *
+ * "infoset"
+ * See the definition of DOMConfiguration for a description of this parameter.
+ * Unlike in [DOM Level 3 Core], this parameter will default to true for DOMLSParser.
+ *
+ * "namespaces"
+ * true [required] (default)
+ * Perform the namespace processing as defined in [XML Namespaces] and
+ * [XML Namespaces 1.1].
+ * false [optional]
+ * Do not perform the namespace processing.
+ *
+ * "resource-resolver" [required]
+ * A pointer to a DOMLSResourceResolver object, or NULL. If the value of this parameter
+ * is not null when an external resource (such as an external XML entity or an XML schema
+ * location) is encountered, the implementation will request that the DOMLSResourceResolver
+ * referenced in this parameter resolves the resource.
+ *
+ * "supported-media-types-only"
+ * true [optional]
+ * Check that the media type of the parsed resource is a supported media type. If
+ * an unsupported media type is encountered, a fatal error of type "unsupported-media-type"
+ * will be raised. The media types defined in [IETF RFC 3023] must always be accepted.
+ * false [required] (default)
+ * Accept any media type.
+ *
+ * "validate"
+ * See the definition of <code>DOMConfiguration</code> for a description of this parameter.
+ * Unlike in [DOM Level 3 Core], the processing of the internal subset is always accomplished, even
+ * if this parameter is set to false.
+ *
+ * "validate-if-schema"
+ * See the definition of <code>DOMConfiguration</code> for a description of this parameter.
+ * Unlike in [DOM Level 3 Core], the processing of the internal subset is always accomplished, even
+ * if this parameter is set to false.
+ *
+ * "well-formed"
+ * See the definition of <code>DOMConfiguration</code> for a description of this parameter.
+ * Unlike in [DOM Level 3 Core], this parameter cannot be set to false.
+ *
+ * In addition to these, Xerces adds these non standard parameters:
+ *
+ * "http://apache.org/xml/properties/entity-resolver"
+ * A pointer to a XMLEntityResolver object, or NULL. If the value of this parameter
+ * is not null when an external resource (such as an external XML entity or an XML schema
+ * location) is encountered, the implementation will request that the XMLEntityResolver
+ * referenced in this parameter resolves the resource.
+ *
+ * "http://apache.org/xml/properties/schema/external-schemaLocation"
+ * A string holding a set of [namespaceUri schemaLocation] entries that will be treated as
+ * the content of the attribute xsi:schemaLocation of the root element
+ *
+ * "http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
+ * A string holding the schemaLocation for the empty namespace URI that will be treated as
+ * the content of the attribute xsi:noNamespaceSchemaLocation of the root element
+ *
+ * "http://apache.org/xml/properties/security-manager"
+ * A pointer to a SecurityManager object that will control how many entity references will be
+ * expanded during parsing
+ *
+ * "http://apache.org/xml/properties/scannerName"
+ * A string holding the type of scanner used while parsing. The valid names are:
+ * <li>IGXMLScanner: the default one, capable of both XMLSchema and DTD validation</li>
+ * <li>SGXMLScanner: a scanner that can only perform XMLSchema validation</li>
+ * <li>DGXMLScanner: a scanner that can only perform DTD validation</li>
+ * <li>WFXMLScanner: a scanner that cannot perform any type validation, only well-formedness</li>
+ *
+ * "http://apache.org/xml/properties/parser-use-DOMDocument-from-Implementation"
+ * A string holding the capabilities of the DOM implementation to be used to create the DOMDocument
+ * resulting from the parse operation. For instance, "LS" or "Core"
+ *
+ * "http://apache.org/xml/features/validation/schema"
+ * true
+ * Enable XMLSchema validation (note that also namespace processing should be enabled)
+ * false (default)
+ * Don't perform XMLSchema validation
+ *
+ * "http://apache.org/xml/features/validation/schema-full-checking"
+ * true
+ * Turn on full XMLSchema checking (e.g. Unique Particle Attribution)
+ * false (default)
+ * Don't perform full XMLSchema checking
+ *
+ * "http://apache.org/xml/features/dom/user-adopts-DOMDocument"
+ * true
+ * The DOMDocument objects returned by <code>parse</code> will be owned by the caller
+ * false (default)
+ * The DOMDocument objects returned by <code>parse</code> will be owned by this <code>DOMLSParser</code>
+ * and deleted when released
+ *
+ * "http://apache.org/xml/features/nonvalidating/load-external-dtd"
+ * true (default)
+ * Allow the parser to load external DTDs
+ * false
+ * References to external DTDs will be ignored
+ *
+ * "http://apache.org/xml/features/continue-after-fatal-error"
+ * true
+ * Parsing should try to continue even if a fatal error has been triggered, trying to generate a DOM tree
+ * from a non well-formed XML
+ * false (default)
+ * Violation of XML rules will abort parsing
+ *
+ * "http://apache.org/xml/features/validation-error-as-fatal"
+ * true
+ * Validation errors are treated as fatal errors, and abort parsing (unless "continue-after-fatal-error"
+ * has been specified)
+ * false (default)
+ * Validation errors are normal errors
+ *
+ * "http://apache.org/xml/features/validation/cache-grammarFromParse"
+ * true
+ * XMLSchemas referenced by an XML file are cached in order to be reused by other parse operations
+ * false (default)
+ * XMLSchemas loaded during a parse operation will be discarded before the next one
+ *
+ * "http://apache.org/xml/features/validation/use-cachedGrammarInParse"
+ * true
+ * During this parse operation, reuse the XMLSchemas found in the cache
+ * false (default)
+ * Don't reuse the XMLSchemas found in the cache
+ *
+ * "http://apache.org/xml/features/calculate-src-ofs"
+ * true
+ * During parsing update the position in the source stream
+ * false (default)
+ * Don't waste time computing the position in the source stream
+ *
+ * "http://apache.org/xml/features/standard-uri-conformant"
+ * true
+ * Require that every URL being resolved is made of valid URL characters only
+ * false (default)
+ * Allow invalid URL characters in URL (e.g. spaces)
+ *
+ * "http://apache.org/xml/features/dom-has-psvi-info"
+ * true
+ * Add schema informations to DOMElement and DOMAttr nodes in the output DOM tree
+ * false (default)
+ * Don't store schema informations in the output DOM tree
+ *
+ * "http://apache.org/xml/features/generate-synthetic-annotations"
+ * true
+ * Create annotation objects in the representation of the loaded XMLSchemas
+ * false (default)
+ * Discard annotations found in the loaded XMLSchemas
+ *
+ * "http://apache.org/xml/features/validate-annotations"
+ * true
+ * Check that annotations are valid according to their XMLSchema definition
+ * false (default)
+ * Don't validate annotations
+ *
+ * "http://apache.org/xml/features/validation/identity-constraint-checking"
+ * true (default)
+ * Enforce identity constraints specified in the XMLSchema
+ * false
+ * Don't enforce identity constraints
+ *
+ * "http://apache.org/xml/features/validation/ignoreCachedDTD"
+ * true
+ * Don't reuse DTDs found in the cache, even if use-cachedGrammarInParse is <code>true</code>
+ * false (default)
+ * Reuse DTDs found in the cache, if use-cachedGrammarInParse is <code>true</code>
+ *
+ * "http://apache.org/xml/features/schema/ignore-annotations"
+ * true
+ * Don't process annotations found in an XMLSchema
+ * false (default)
+ * Process the annotations found in an XMLSchema
+ *
+ * "http://apache.org/xml/features/disable-default-entity-resolution"
+ * true
+ * Entities will be resolved only by a resolver installed by the user
+ * false (default)
+ * If the entity resolver has not been installed, or it refuses to resolve the given entity, the
+ * parser will try to locate it himself
+ *
+ * "http://apache.org/xml/features/validation/schema/skip-dtd-validation"
+ * true
+ * If XMLSchema validation is <code>true</code>, DTD validation will not be performed
+ * false (default)
+ * If a DTD is found, it will be used to validate the XML
+ *
+ * @return The pointer to the configuration object.
+ * @since DOM Level 3
+ */
+ virtual DOMConfiguration* getDomConfig() = 0;
+
+ /**
+ * Get a const pointer to the application filter
+ *
+ * This method returns the installed application filter. If no filter
+ * has been installed, then it will be a zero pointer.
+ *
+ * @return A const pointer to the installed application filter
+ * @since DOM Level 3
+ */
+ virtual const DOMLSParserFilter* getFilter() const = 0;
+
+ /**
+ * Return whether the parser is asynchronous
+ *
+ * @return <code>true</code> if the <code>DOMLSParser</code> is asynchronous,
+ * <code>false</code> if it is synchronous
+ * @since DOM Level 3
+ */
+ virtual bool getAsync() const = 0;
+
+ /**
+ * Return whether the parser is busy parsing
+ *
+ * @return <code>true</code> if the <code>DOMLSParser</code> is currently busy
+ * loading a document, otherwise <code>false</code>.
+ * @since DOM Level 3
+ */
+ virtual bool getBusy() const = 0;
+
+ // -----------------------------------------------------------------------
+ // Setter methods
+ // -----------------------------------------------------------------------
+ /**
+ * Set the application filter
+ *
+ * When the application provides a filter, the parser will call out to
+ * the filter at the completion of the construction of each <code>DOMElement</code>
+ * node. The filter implementation can choose to remove the element from the
+ * document being constructed or to terminate the parse early.
+ * The filter is invoked after the operations requested by the DOMConfiguration
+ * parameters have been applied. For example, if "validate" is set to true,
+ * the validation is done before invoking the filter.
+ *
+ * <i>Any previously set filter is merely dropped, since the parser
+ * does not own them.</i>
+ *
+ * @param filter A const pointer to the user supplied application
+ * filter.
+ *
+ * @see #getFilter
+ * @since DOM Level 3
+ */
+ virtual void setFilter(DOMLSParserFilter* const filter) = 0;
+
+ // -----------------------------------------------------------------------
+ // Parsing methods
+ // -----------------------------------------------------------------------
+ /**
+ * Parse an XML document from a resource identified by a <code>DOMLSInput</code>.
+ *
+ * The parser owns the returned DOMDocument. It will be deleted
+ * when the parser is released.
+ *
+ * @param source The <code>DOMLSInput</code> from which the source of the document
+ * is to be read.
+ * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code>
+ * the newly created and populated <code>DOMDocument</code> is returned.
+ * If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code>
+ * is returned since the document object may not yet be constructed when
+ * this method returns.
+ * @exception DOMException INVALID_STATE_ERR: Raised if the <code>DOMLSParser::busy</code>
+ * attribute is true.
+ * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable
+ * to load the XML document. DOM applications should
+ * attach a <code>DOMErrorHandler</code> using the
+ * parameter "error-handler" if they wish to get details
+ * on the error.
+ *
+ * @see DOMLSInput#DOMLSInput
+ * @see DOMConfiguration
+ * @see resetDocumentPool
+ * @since DOM Level 3
+ */
+ virtual DOMDocument* parse(const DOMLSInput& source) = 0;
+
+ /**
+ * Parse an XML document from a location identified by a URI reference [IETF RFC 2396].
+ * If the URI contains a fragment identifier (see section 4.1 in [IETF RFC 2396]),
+ * the behavior is not defined by this specification, future versions of this
+ * specification may define the behavior.
+ *
+ * The parser owns the returned DOMDocument. It will be deleted
+ * when the parser is released.
+ *
+ * @param uri The location of the XML document to be read (in Unicode)
+ * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code>
+ * the newly created and populated <code>DOMDocument</code> is returned.
+ * If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code>
+ * is returned since the document object is not yet parsed when this method returns.
+ * @exception DOMException INVALID_STATE_ERR: Raised if the <code>DOMLSParser::busy</code>
+ * attribute is true.
+ * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable
+ * to load the XML document. DOM applications should
+ * attach a <code>DOMErrorHandler</code> using the
+ * parameter "error-handler" if they wish to get details
+ * on the error.
+ *
+ * @see #parse(DOMLSInput,...)
+ * @see resetDocumentPool
+ * @since DOM Level 3
+ */
+ virtual DOMDocument* parseURI(const XMLCh* const uri) = 0;
+
+ /**
+ * Parse an XML document from a location identified by a URI reference [IETF RFC 2396].
+ * If the URI contains a fragment identifier (see section 4.1 in [IETF RFC 2396]),
+ * the behavior is not defined by this specification, future versions of this
+ * specification may define the behavior.
+ *
+ * The parser owns the returned DOMDocument. It will be deleted
+ * when the parser is released.
+ *
+ * @param uri The location of the XML document to be read (in the local code page)
+ * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code>
+ * the newly created and populated <code>DOMDocument</code> is returned.
+ * If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code>
+ * is returned since the document object is not yet parsed when this method returns.
+ * @exception DOMException INVALID_STATE_ERR: Raised if the <code>DOMLSParser::busy</code>
+ * attribute is true.
+ * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable
+ * to load the XML document. DOM applications should
+ * attach a <code>DOMErrorHandler</code> using the
+ * parameter "error-handler" if they wish to get details
+ * on the error.
+ *
+ * @see #parse(DOMLSInput,...)
+ * @see resetDocumentPool
+ * @since DOM Level 3
+ */
+ virtual DOMDocument* parseURI(const char* const uri) = 0;
+
+ /**
+ * Parse an XML fragment from a resource identified by a <code>DOMLSInput<code>
+ * and insert the content into an existing document at the position specified
+ * with the context and action arguments. When parsing the input stream, the
+ * context node (or its parent, depending on where the result will be inserted)
+ * is used for resolving unbound namespace prefixes. The context node's
+ * <code>ownerDocument</code> node (or the node itself if the node of type
+ * <code>DOCUMENT_NODE</code>) is used to resolve default attributes and entity
+ * references.
+ * As the new data is inserted into the document, at least one mutation event
+ * is fired per new immediate child or sibling of the context node.
+ * If the context node is a <code>DOMDocument</code> node and the action is
+ * <code>ACTION_REPLACE_CHILDREN</code>, then the document that is passed as
+ * the context node will be changed such that its <code>xmlEncoding</code>,
+ * <code>documentURI</code>, <code>xmlVersion</code>, <code>inputEncoding</code>,
+ * <code>xmlStandalone</code>, and all other such attributes are set to what they
+ * would be set to if the input source was parsed using <code>DOMLSParser::parse()</code>.
+ * This method is always synchronous, even if the <code>DOMLSParser</code> is
+ * asynchronous (<code>DOMLSParser::getAsync()</code> returns true).
+ * If an error occurs while parsing, the caller is notified through the <code>ErrorHandler</code>
+ * instance associated with the "error-handler" parameter of the <code>DOMConfiguration</code>.
+ * When calling <code>parseWithContext</code>, the values of the following configuration
+ * parameters will be ignored and their default values will always be used instead:
+ * "validate",
+ * "validate-if-schema"
+ * "element-content-whitespace".
+ * Other parameters will be treated normally, and the parser is expected to call
+ * the <code>DOMLSParserFilter</code> just as if a whole document was parsed.
+ *
+ * @param source The <code>DOMLSInput</code> from which the source document is
+ * to be read. The source document must be an XML fragment, i.e.
+ * anything except a complete XML document (except in the case where
+ * the context node of type <code>DOCUMENT_NODE</code>, and the action is
+ * <code>ACTION_REPLACE_CHILDREN</code>), a <code>DOCTYPE</code>
+ * (internal subset), entity declaration(s), notation declaration(s),
+ * or XML or text declaration(s).
+ * @param contextNode The node that is used as the context for the data that is being
+ * parsed. This node must be a <code>DOMDocument<code> node, a
+ * <code>DOMDocumentFragment</code> node, or a node of a type that
+ * is allowed as a child of an <code>DOMElement</code> node, e.g.
+ * it cannot be an <code>DOMAttribute</code> node.
+ * @param action This parameter describes which action should be taken between the new
+ * set of nodes being inserted and the existing children of the context node.
+ * The set of possible actions is defined in <code>ACTION_TYPES</code> above.
+ * @return Return the node that is the result of the parse operation. If the result is more
+ * than one top-level node, the first one is returned.
+ *
+ * @exception DOMException
+ * HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be inserted before, after,
+ * or as a child of the context node (see also <code>DOMNode::insertBefore</code>
+ * or <code>DOMNode::replaceChild</code> in [DOM Level 3 Core]).
+ * NOT_SUPPORTED_ERR: Raised if the <code>DOMLSParser</code> doesn't support this method,
+ * or if the context node is of type <code>DOMDocument</code> and the DOM
+ * implementation doesn't support the replacement of the <code>DOMDocumentType</code>
+ * child or <code>DOMElement</code> child.
+ * NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a read only node and the content
+ * is being appended to its child list, or if the parent node of
+ * the context node is read only node and the content is being
+ * inserted in its child list.
+ * INVALID_STATE_ERR: Raised if the <code>DOMLSParser::getBusy()</code> returns true.
+ *
+ * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable to load
+ * the XML fragment. DOM applications should attach a
+ * <code>DOMErrorHandler</code> using the parameter "error-handler"
+ * if they wish to get details on the error.
+ * @since DOM Level 3
+ */
+ virtual void parseWithContext
+ (
+ const DOMLSInput& source
+ , DOMNode* contextNode
+ , const unsigned short action
+ ) = 0;
+
+ /**
+ * Abort the loading of the document that is currently being loaded by the <code>DOMLSParser</code>.
+ * If the <code>DOMLSParser</code> is currently not busy, a call to this method does nothing.
+ *
+ * @since DOM Level 3
+ */
+ virtual void abort() = 0;
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Non-standard Extension
+ // -----------------------------------------------------------------------
+ /** @name Non-standard Extension */
+ //@{
+ /**
+ * Called to indicate that this DOMLSParser is no longer in use
+ * and that the implementation may relinquish any resources associated with it.
+ *
+ * Access to a released object will lead to unexpected result.
+ */
+ virtual void release() = 0;
+
+ /** Reset the documents vector pool and release all the associated memory
+ * back to the system.
+ *
+ * When parsing a document using a DOM parser, all memory allocated
+ * for a DOM tree is associated to the DOM document.
+ *
+ * If you do multiple parse using the same DOM parser instance, then
+ * multiple DOM documents will be generated and saved in a vector pool.
+ * All these documents (and thus all the allocated memory)
+ * won't be deleted until the parser instance is destroyed.
+ *
+ * If you don't need these DOM documents anymore and don't want to
+ * destroy the DOM parser instance at this moment, then you can call this method
+ * to reset the document vector pool and release all the allocated memory
+ * back to the system.
+ *
+ * It is an error to call this method if you are in the middle of a
+ * parse (e.g. in the mid of a progressive parse).
+ *
+ * @exception IOException An exception from the parser if this function
+ * is called when a parse is in progress.
+ *
+ */
+ virtual void resetDocumentPool() = 0;
+
+ /**
+ * Preparse schema grammar (XML Schema, DTD, etc.) via an input source
+ * object.
+ *
+ * This method invokes the preparsing process on a schema grammar XML
+ * file specified by the DOMLSInput parameter. If the 'toCache' flag
+ * is enabled, the parser will cache the grammars for re-use. If a grammar
+ * key is found in the pool, no caching of any grammar will take place.
+ *
+ * <p><b>"Experimental - subject to change"</b></p>
+ *
+ * @param source A const reference to the DOMLSInput object which
+ * points to the schema grammar file to be preparsed.
+ * @param grammarType The grammar type (Schema or DTD).
+ * @param toCache If <code>true</code>, we cache the preparsed grammar,
+ * otherwise, no chaching. Default is <code>false</code>.
+ * @return The preparsed schema grammar object (SchemaGrammar or
+ * DTDGrammar). That grammar object is owned by the parser.
+ *
+ * @exception SAXException Any SAX exception, possibly
+ * wrapping another exception.
+ * @exception XMLException An exception from the parser or client
+ * handler code.
+ * @exception DOMException A DOM exception as per DOM spec.
+ *
+ * @see DOMLSInput#DOMLSInput
+ */
+ virtual Grammar* loadGrammar(const DOMLSInput& source,
+ const short grammarType,
+ const bool toCache = false) = 0;
+
+ /**
+ * Preparse schema grammar (XML Schema, DTD, etc.) via a file path or URL
+ *
+ * This method invokes the preparsing process on a schema grammar XML
+ * file specified by the file path parameter. If the 'toCache' flag is
+ * enabled, the parser will cache the grammars for re-use. If a grammar
+ * key is found in the pool, no caching of any grammar will take place.
+ *
+ * <p><b>"Experimental - subject to change"</b></p>
+ *
+ * @param systemId A const XMLCh pointer to the Unicode string which
+ * contains the path to the XML grammar file to be
+ * preparsed.
+ * @param grammarType The grammar type (Schema or DTD).
+ * @param toCache If <code>true</code>, we cache the preparsed grammar,
+ * otherwise, no chaching. Default is <code>false</code>.
+ * @return The preparsed schema grammar object (SchemaGrammar or
+ * DTDGrammar). That grammar object is owned by the parser.
+ *
+ * @exception SAXException Any SAX exception, possibly
+ * wrapping another exception.
+ * @exception XMLException An exception from the parser or client
+ * handler code.
+ * @exception DOMException A DOM exception as per DOM spec.
+ */
+ virtual Grammar* loadGrammar(const XMLCh* const systemId,
+ const short grammarType,
+ const bool toCache = false) = 0;
+
+ /**
+ * Preparse schema grammar (XML Schema, DTD, etc.) via a file path or URL
+ *
+ * This method invokes the preparsing process on a schema grammar XML
+ * file specified by the file path parameter. If the 'toCache' flag is
+ * enabled, the parser will cache the grammars for re-use. If a grammar
+ * key is found in the pool, no caching of any grammar will take place.
+ *
+ * <p><b>"Experimental - subject to change"</b></p>
+ *
+ * @param systemId A const char pointer to a native string which contains
+ * the path to the XML grammar file to be preparsed.
+ * @param grammarType The grammar type (Schema or DTD).
+ * @param toCache If <code>true</code>, we cache the preparsed grammar,
+ * otherwise, no chaching. Default is <code>false</code>.
+ * @return The preparsed schema grammar object (SchemaGrammar or
+ * DTDGrammar). That grammar object is owned by the parser.
+ *
+ *
+ * @exception SAXException Any SAX exception, possibly
+ * wrapping another exception.
+ * @exception XMLException An exception from the parser or client
+ * handler code.
+ * @exception DOMException A DOM exception as per DOM spec.
+ */
+ virtual Grammar* loadGrammar(const char* const systemId,
+ const short grammarType,
+ const bool toCache = false) = 0;
+
+ /**
+ * Retrieve the grammar that is associated with the specified namespace key
+ *
+ * @param nameSpaceKey Namespace key
+ * @return Grammar associated with the Namespace key.
+ */
+ virtual Grammar* getGrammar(const XMLCh* const nameSpaceKey) const = 0;
+
+ /**
+ * Retrieve the grammar where the root element is declared.
+ *
+ * @return Grammar where root element declared
+ */
+ virtual Grammar* getRootGrammar() const = 0;
+
+ /**
+ * Returns the string corresponding to a URI id from the URI string pool.
+ *
+ * @param uriId id of the string in the URI string pool.
+ * @return URI string corresponding to the URI id.
+ */
+ virtual const XMLCh* getURIText(unsigned int uriId) const = 0;
+
+ /**
+ * Clear the cached grammar pool
+ */
+ virtual void resetCachedGrammarPool() = 0;
+
+ /**
+ * Returns the current src offset within the input source.
+ *
+ * @return offset within the input source
+ */
+ virtual unsigned int getSrcOffset() const = 0;
+
+ //@}
+
+};
+
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
diff --git a/src/xercesc/dom/DOMLSParserFilter.hpp b/src/xercesc/dom/DOMLSParserFilter.hpp
new file mode 100644
index 000000000..542f14161
--- /dev/null
+++ b/src/xercesc/dom/DOMLSParserFilter.hpp
@@ -0,0 +1,163 @@
+#ifndef DOMLSParserFilter_HEADER_GUARD_
+#define DOMLSParserFilter_HEADER_GUARD_
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+/**
+ *
+ * DOMLSParserFilter.hpp: interface for the DOMLSParserFilter class.
+ *
+ * DOMLSParserFilter provide applications the ability to examine nodes
+ * as they are being created during the parse process.
+ *
+ * DOMLSParserFilter lets the application decide what nodes should be
+ * in the output DOM tree or not.
+ *
+ * @since DOM Level 3
+ */
+
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
+class CDOM_EXPORT DOMLSParserFilter {
+protected:
+ // -----------------------------------------------------------------------
+ // Hidden constructors
+ // -----------------------------------------------------------------------
+ /** @name Hidden constructors */
+ //@{
+ DOMLSParserFilter() {};
+ //@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ /** @name Unimplemented constructors and operators */
+ //@{
+ DOMLSParserFilter(const DOMLSParserFilter &);
+ DOMLSParserFilter & operator = (const DOMLSParserFilter &);
+ //@}
+
+
+public:
+ // -----------------------------------------------------------------------
+ // All constructors are hidden, just the destructor is available
+ // -----------------------------------------------------------------------
+ /** @name Destructor */
+ //@{
+ /**
+ * Destructor
+ *
+ */
+ virtual ~DOMLSParserFilter() {};
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Class Types
+ // -----------------------------------------------------------------------
+ /** @name Public Contants */
+ //@{
+ /**
+ * Constants returned by acceptNode.
+ *
+ * <p><code>FILTER_ACCEPT:</code>
+ * Accept the node.</p>
+ *
+ * <p><code>FILTER_REJECT:</code>
+ * Reject the node and its children.</p>
+ *
+ * <p><code>FILTER_SKIP:</code>
+ * Skip this single node. The children of this node will still be considered.</p>
+ *
+ * <p><code>FILTER_INTERRUPT:</code>
+ * Interrupt the normal processing of the document.</p>
+ *
+ * @since DOM Level 3
+ */
+ enum FilterAction {FILTER_ACCEPT = 1,
+ FILTER_REJECT = 2,
+ FILTER_SKIP = 3,
+ FILTER_INTERRUPT = 4};
+
+ // -----------------------------------------------------------------------
+ // Virtual DOMLSParserFilter interface
+ // -----------------------------------------------------------------------
+ /** @name Functions introduced in DOM Level 3 */
+ //@{
+ /**
+ * This method will be called by the parser at the completion of the parsing of each node.
+ * The node and all of its descendants will exist and be complete. The parent node will also exist,
+ * although it may be incomplete, i.e. it may have additional children that have not yet been parsed.
+ * Attribute nodes are never passed to this function.
+ * From within this method, the new node may be freely modified - children may be added or removed,
+ * text nodes modified, etc. The state of the rest of the document outside this node is not defined,
+ * and the affect of any attempt to navigate to, or to modify any other part of the document is undefined.
+ * For validating parsers, the checks are made on the original document, before any modification by the
+ * filter. No validity checks are made on any document modifications made by the filter.
+ * If this new node is rejected, the parser might reuse the new node and any of its descendants.
+ *
+ * @param node The newly constructed element. At the time this method is called, the element is complete -
+ * it has all of its children (and their children, recursively) and attributes, and is attached
+ * as a child to its parent.
+ * @return One of the FilterAction enum
+ */
+ virtual short acceptNode(DOMNode* node) = 0;
+
+ /**
+ * The parser will call this method after each <code>DOMElement</code> start tag has been scanned,
+ * but before the remainder of the <code>DOMElement</code> is processed. The intent is to allow the element,
+ * including any children, to be efficiently skipped. Note that only element nodes are passed to the
+ * startElement function.
+ * The element node passed to startElement for filtering will include all of the attributes, but none
+ * of the children nodes. The <code>DOMElement</code> may not yet be in place in the document being
+ * constructed (it may not have a parent node.)
+ * A startElement filter function may access or change the attributes for the <code>DOMElement</code>.
+ * Changing namespace declarations will have no effect on namespace resolution by the parser.
+ *
+ * @param node The newly encountered element. At the time this method is called, the element is incomplete -
+ * it will have its attributes, but no children.
+ * @return One of the FilterAction enum
+ */
+ virtual short startElement(DOMElement* node) = 0;
+
+ /**
+ * Tells the <code>DOMLSParser</code> what types of nodes to show to the method <code>DOMLSParserFilter::acceptNode</code>.
+ * If a node is not shown to the filter using this attribute, it is automatically included in the DOM document being built.
+ * See <code>DOMNodeFilter</code> for definition of the constants. The constants SHOW_ATTRIBUTE, SHOW_DOCUMENT,
+ * SHOW_DOCUMENT_TYPE, SHOW_NOTATION, SHOW_ENTITY, and SHOW_DOCUMENT_FRAGMENT are meaningless here.
+ * Those nodes will never be passed to DOMLSParserFilter::acceptNode.
+ *
+ * @return The constants of what types of nodes to show.
+ * @since DOM Level 3
+ */
+ virtual unsigned long getWhatToShow() const = 0;
+
+ //@}
+
+private:
+
+};
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
diff --git a/src/xercesc/dom/DOMWriter.hpp b/src/xercesc/dom/DOMLSSerializer.hpp
similarity index 69%
rename from src/xercesc/dom/DOMWriter.hpp
rename to src/xercesc/dom/DOMLSSerializer.hpp
index 09ddf7e33..78df85970 100644
--- a/src/xercesc/dom/DOMWriter.hpp
+++ b/src/xercesc/dom/DOMLSSerializer.hpp
@@ -1,5 +1,5 @@
-#ifndef DOMWriter_HEADER_GUARD_
-#define DOMWriter_HEADER_GUARD_
+#ifndef DOMLSSerializer_HEADER_GUARD_
+#define DOMLSSerializer_HEADER_GUARD_
/*
* Copyright 2002,2004 The Apache Software Foundation.
@@ -23,11 +23,11 @@
/**
*
- * DOMWriter provides an API for serializing (writing) a DOM document out in
+ * DOMLSSerializer provides an API for serializing (writing) a DOM document out in
* an XML document. The XML data is written to an output stream, the type of
* which depends on the specific language bindings in use. During
* serialization of XML data, namespace fixup is done when possible.
- * <p> <code>DOMWriter</code> accepts any node type for serialization. For
+ * <p> <code>DOMLSSerializer</code> accepts any node type for serialization. For
* nodes of type <code>Document</code> or <code>Entity</code>, well formed
* XML will be created if possible. The serialized output for these node
* types is either as a Document or an External Entity, respectively, and is
@@ -40,7 +40,7 @@
* follows Documents are written including an XML declaration and a DTD
* subset, if one exists in the DOM. Writing a document node serializes the
* entire document. Entity nodes, when written directly by
- * <code>writeNode</code> defined in the <code>DOMWriter</code> interface,
+ * <code>write</code> defined in the <code>DOMLSSerializer</code> interface,
* output the entity expansion but no namespace fixup is done. The resulting
* output will be valid as an external entity. Entity References nodes are
* serializes as an entity reference of the form
@@ -77,7 +77,7 @@
* as an error. An example would be serializing the element
* <LaCa�ada/> with the encoding="us-ascii".
* <p> When requested by setting the <code>normalize-characters</code> feature
- * on <code>DOMWriter</code>, all data to be serialized, both markup and
+ * on <code>DOMLSSerializer</code>, all data to be serialized, both markup and
* character data, is W3C Text normalized according to the rules defined in
* . The W3C Text normalization process affects only the data as it is being
* written; it does not alter the DOM's view of the document after
@@ -108,17 +108,17 @@
* description about warning about unbound entity refs. Entity refs are
* always serialized as &foo;, also mention this in the load part of
* this spec.
- * <p> When serializing a document the DOMWriter checks to see if the document
+ * <p> When serializing a document the DOMLSSerializer checks to see if the document
* element in the document is a DOM Level 1 element or a DOM Level 2 (or
* higher) element (this check is done by looking at the localName of the
* root element). If the root element is a DOM Level 1 element then the
- * DOMWriter will issue an error if a DOM Level 2 (or higher) element is
+ * DOMLSSerializer will issue an error if a DOM Level 2 (or higher) element is
* found while serializing. Likewise if the document element is a DOM Level
- * 2 (or higher) element and the DOMWriter sees a DOM Level 1 element an
+ * 2 (or higher) element and the DOMLSSerializer sees a DOM Level 1 element an
* error is issued. Mixing DOM Level 1 elements with DOM Level 2 (or higher)
* is not supported.
- * <p> <code>DOMWriter</code>s have a number of named features that can be
- * queried or set. The name of <code>DOMWriter</code> features must be valid
+ * <p> <code>DOMLSSerializer</code>s have a number of named features that can be
+ * queried or set. The name of <code>DOMLSSerializer</code> features must be valid
* XML names. Implementation specific features (extensions) should choose an
* implementation dependent prefix to avoid name collisions.
* <p>Here is a list of properties that must be recognized by all
@@ -242,20 +242,21 @@
#include <xercesc/dom/DOMNode.hpp>
-#include <xercesc/dom/DOMWriterFilter.hpp>
+#include <xercesc/dom/DOMLSSerializerFilter.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
+#include <xercesc/dom/DOMConfiguration.hpp>
#include <xercesc/framework/XMLFormatter.hpp>
XERCES_CPP_NAMESPACE_BEGIN
-class CDOM_EXPORT DOMWriter {
+class CDOM_EXPORT DOMLSSerializer {
protected :
// -----------------------------------------------------------------------
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
//@{
- DOMWriter() {};
+ DOMLSSerializer() {};
//@}
private:
// -----------------------------------------------------------------------
@@ -263,8 +264,8 @@ private:
// -----------------------------------------------------------------------
/** @name Unimplemented constructors and operators */
//@{
- DOMWriter(const DOMWriter &);
- DOMWriter & operator = (const DOMWriter &);
+ DOMLSSerializer(const DOMLSSerializer &);
+ DOMLSSerializer & operator = (const DOMLSSerializer &);
//@}
@@ -278,11 +279,11 @@ public:
* Destructor
*
*/
- virtual ~DOMWriter() {};
+ virtual ~DOMLSSerializer() {};
//@}
// -----------------------------------------------------------------------
- // Virtual DOMWriter interface
+ // Virtual DOMLSSerializer interface
// -----------------------------------------------------------------------
/** @name Functions introduced in DOM Level 3 */
//@{
@@ -290,61 +291,80 @@ public:
// Feature methods
// -----------------------------------------------------------------------
/**
- * Query whether setting a feature to a specific value is supported.
- * <br>The feature name has the same form as a DOM hasFeature string.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param featName The feature name, which is a DOM has-feature style string.
- * @param state The requested state of the feature (<code>true</code> or
- * <code>false</code>).
- * @return <code>true</code> if the feature could be successfully set to
- * the specified value, or <code>false</code> if the feature is not
- * recognized or the requested value is not supported. The value of
- * the feature itself is not changed.
- * @since DOM Level 3
- */
- virtual bool canSetFeature(const XMLCh* const featName
- , bool state) const = 0;
- /**
- * Set the state of a feature.
- * <br>The feature name has the same form as a DOM hasFeature string.
- * <br>It is possible for a <code>DOMWriter</code> to recognize a feature
- * name but to be unable to set its value.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param featName The feature name.
- * @param state The requested state of the feature (<code>true</code> or
- * <code>false</code>).
- * @exception DOMException
- * Raise a NOT_SUPPORTED_ERR exception when the <code>DOMWriter</code>
- * recognizes the feature name but cannot set the requested value.
- * <br>Raise a NOT_FOUND_ERR When the <code>DOMWriter</code> does not
- * recognize the feature name.
- * @see getFeature
- * @since DOM Level 3
- */
- virtual void setFeature(const XMLCh* const featName
- , bool state) = 0;
-
- /**
- * Look up the value of a feature.
- * <br>The feature name has the same form as a DOM hasFeature string
- * @param featName The feature name, which is a string with DOM has-feature
- * syntax.
- * @return The current state of the feature (<code>true</code> or
- * <code>false</code>).
- * @exception DOMException
- * Raise a NOT_FOUND_ERR When the <code>DOMWriter</code> does not
- * recognize the feature name.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @see setFeature
- * @since DOM Level 3
- */
- virtual bool getFeature(const XMLCh* const featName) const = 0;
+ * The DOMConfiguration object used by the LSSerializer when serializing a DOM node.
+ *
+ * In addition to the parameters recognized in on the <code>DOMConfiguration</code>
+ * interface defined in [DOM Level 3 Core], the <code>DOMConfiguration</code> objects
+ * for <code>DOMLSSerializer</code> add or modify the following parameters:
+ *
+ * "canonical-form"
+ * true [optional]
+ * Writes the document according to the rules specified in [Canonical XML]. In addition to
+ * the behavior described in "canonical-form" [DOM Level 3 Core], setting this parameter to
+ * true will set the parameters "format-pretty-print", "discard-default-content", and
+ * "xml-declaration", to false. Setting one of those parameters to true will set this
+ * parameter to false. Serializing an XML 1.1 document when "canonical-form" is true will
+ * generate a fatal error.
+ * false [required] (default)
+ * Do not canonicalize the output.
+ *
+ * "discard-default-content"
+ * true [required] (default)
+ * Use the DOMAttr::getSpecified attribute to decide what attributes should be discarded.
+ * Note that some implementations might use whatever information available to the implementation
+ * (i.e. XML schema, DTD, the DOMAttr::getSpecified attribute, and so on) to determine what
+ * attributes and content to discard if this parameter is set to true.
+ * false [required]
+ * Keep all attributes and all content.
+ *
+ * "format-pretty-print"
+ * true [optional]
+ * Formatting the output by adding whitespace to produce a pretty-printed, indented,
+ * human-readable form. The exact form of the transformations is not specified by this specification.
+ * Pretty-printing changes the content of the document and may affect the validity of the document,
+ * validating implementations should preserve validity.
+ * false [required] (default)
+ * Don't pretty-print the result.
+ *
+ * "ignore-unknown-character-denormalizations"
+ * true [required] (default)
+ * If, while verifying full normalization when [XML 1.1] is supported, a character is encountered
+ * for which the normalization properties cannot be determined, then raise a "unknown-character-denormalization"
+ * warning (instead of raising an error, if this parameter is not set) and ignore any possible
+ * denormalizations caused by these characters.
+ * false [optional]
+ * Report a fatal error if a character is encountered for which the processor cannot determine the
+ * normalization properties.
+ *
+ * "normalize-characters"
+ * This parameter is equivalent to the one defined by <code>DOMConfiguration</code> in [DOM Level 3 Core].
+ * Unlike in the Core, the default value for this parameter is true. While DOM implementations are not
+ * required to support fully normalizing the characters in the document according to appendix E of [XML 1.1],
+ * this parameter must be activated by default if supported.
+ *
+ * "xml-declaration"
+ * true [required] (default)
+ * If a DOMDocument, DOMElement, or DOMEntity node is serialized, the XML declaration, or text declaration,
+ * should be included. The version (DOMDocument::xmlVersion if the document is a Level 3 document and the
+ * version is non-null, otherwise use the value "1.0"), and the output encoding (see DOMLSSerializer::write
+ * for details on how to find the output encoding) are specified in the serialized XML declaration.
+ * false [required]
+ * Do not serialize the XML and text declarations. Report a "xml-declaration-needed" warning if this will
+ * cause problems (i.e. the serialized data is of an XML version other than [XML 1.0], or an encoding would
+ * be needed to be able to re-parse the serialized data).
+ *
+ * "error-handler"
+ * Contains a DOMErrorHandler object. If an error is encountered in the document, the implementation will call back
+ * the DOMErrorHandler registered using this parameter. The implementation may provide a default DOMErrorHandler
+ * object. When called, DOMError::relatedData will contain the closest node to where the error occurred.
+ * If the implementation is unable to determine the node where the error occurs, DOMError::relatedData will contain
+ * the DOMDocument node. Mutations to the document from within an error handler will result in implementation
+ * dependent behavior.
+ *
+ * @return The pointer to the configuration object.
+ * @since DOM Level 3
+ */
+ virtual DOMConfiguration* getDomConfig() = 0;
// -----------------------------------------------------------------------
// Setter methods
@@ -389,42 +409,23 @@ public:
* </dl>
* <br>The default value for this attribute is <code>null</code>.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @param newLine The end-of-line sequence of characters to be used.
* @see getNewLine
* @since DOM Level 3
*/
virtual void setNewLine(const XMLCh* const newLine) = 0;
- /**
- * The error handler that will receive error notifications during
- * serialization. The node where the error occured is passed to this
- * error handler, any modification to nodes from within an error
- * callback should be avoided since this will result in undefined,
- * implementation dependent behavior.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param errorHandler The error handler to be used.
- * @see getErrorHandler
- * @since DOM Level 3
- */
- virtual void setErrorHandler(DOMErrorHandler *errorHandler) = 0;
-
/**
* When the application provides a filter, the serializer will call out
* to the filter before serializing each Node. Attribute nodes are never
* passed to the filter. The filter implementation can choose to remove
* the node from the stream or to terminate the serialization early.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @param filter The writer filter to be used.
* @see getFilter
* @since DOM Level 3
*/
- virtual void setFilter(DOMWriterFilter *filter) = 0;
+ virtual void setFilter(DOMLSSerializerFilter *filter) = 0;
// -----------------------------------------------------------------------
// Getter methods
@@ -452,46 +453,30 @@ public:
*/
virtual const XMLCh* getNewLine() const = 0;
- /**
- * Return the error handler that will receive error notifications during
- * serialization.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @return The error handler to be used.
- * @see setErrorHandler
- * @since DOM Level 3
- */
- virtual DOMErrorHandler* getErrorHandler() const = 0;
-
/**
* Return the WriterFilter used.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @return The writer filter used.
* @see setFilter
* @since DOM Level 3
*/
- virtual DOMWriterFilter* getFilter() const = 0;
+ virtual DOMLSSerializerFilter* getFilter() const = 0;
// -----------------------------------------------------------------------
// Write methods
// -----------------------------------------------------------------------
/**
* Write out the specified node as described above in the description of
- * <code>DOMWriter</code>. Writing a Document or Entity node produces a
+ * <code>DOMLSSerializer</code>. Writing a Document or Entity node produces a
* serialized form that is well formed XML. Writing other node types
* produces a fragment of text in a form that is not fully defined by
* this document, but that should be useful to a human for debugging or
* diagnostic purposes.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param destination The destination for the data to be written.
* @param nodeToWrite The <code>Document</code> or <code>Entity</code> node to
* be written. For other node types, something sensible should be
* written, but the exact serialized form is not specified.
+ * @param destination The destination for the data to be written.
* @return Returns <code>true</code> if <code>node</code> was
* successfully serialized and <code>false</code> in case a failure
* occured and the failure wasn't canceled by the error handler.
@@ -501,28 +486,49 @@ public:
* underlying system exception.
* @since DOM Level 3
*/
- virtual bool writeNode(XMLFormatTarget* const destination
- , const DOMNode &nodeToWrite) = 0;
+ virtual bool write(const DOMNode* nodeToWrite,
+ XMLFormatTarget* const destination) = 0;
+ /**
+ * Write out the specified node as described above in the description of
+ * <code>DOMLSSerializer</code>. Writing a Document or Entity node produces a
+ * serialized form that is well formed XML. Writing other node types
+ * produces a fragment of text in a form that is not fully defined by
+ * this document, but that should be useful to a human for debugging or
+ * diagnostic purposes.
+ *
+ * @param nodeToWrite The <code>Document</code> or <code>Entity</code> node to
+ * be written. For other node types, something sensible should be
+ * written, but the exact serialized form is not specified.
+ * @param uri The destination for the data to be written.
+ * @return Returns <code>true</code> if <code>node</code> was
+ * successfully serialized and <code>false</code> in case a failure
+ * occured and the failure wasn't canceled by the error handler.
+ * @exception DOMSystemException
+ * This exception will be raised in response to any sort of IO or system
+ * error that occurs while writing to the destination. It may wrap an
+ * underlying system exception.
+ * @since DOM Level 3
+ */
+ virtual bool writeToURI(const DOMNode* nodeToWrite,
+ const XMLCh* uri) = 0;
/**
* Serialize the specified node as described above in the description of
- * <code>DOMWriter</code>. The result of serializing the node is
+ * <code>DOMLSSerializer</code>. The result of serializing the node is
* returned as a string. Writing a Document or Entity node produces a
* serialized form that is well formed XML. Writing other node types
* produces a fragment of text in a form that is not fully defined by
* this document, but that should be useful to a human for debugging or
* diagnostic purposes.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @param nodeToWrite The node to be written.
* @return Returns the serialized data, or <code>null</code> in case a
* failure occured and the failure wasn't canceled by the error
* handler. The returned string is always in UTF-16.
- * The encoding information available in DOMWriter is ignored in writeToString().
+ * The encoding information available in DOMLSSerializer is ignored in writeToString().
* @since DOM Level 3
*/
- virtual XMLCh* writeToString(const DOMNode &nodeToWrite) = 0;
+ virtual XMLCh* writeToString(const DOMNode* nodeToWrite) = 0;
//@}
diff --git a/src/xercesc/dom/DOMWriterFilter.hpp b/src/xercesc/dom/DOMLSSerializerFilter.hpp
similarity index 71%
rename from src/xercesc/dom/DOMWriterFilter.hpp
rename to src/xercesc/dom/DOMLSSerializerFilter.hpp
index 3f2f68e61..871a43138 100644
--- a/src/xercesc/dom/DOMWriterFilter.hpp
+++ b/src/xercesc/dom/DOMLSSerializerFilter.hpp
@@ -1,5 +1,5 @@
-#ifndef DOMWriterFilter_HEADER_GUARD_
-#define DOMWriterFilter_HEADER_GUARD_
+#ifndef DOMLSSerializerFilter_HEADER_GUARD_
+#define DOMLSSerializerFilter_HEADER_GUARD_
/*
* Copyright 2002,2004 The Apache Software Foundation.
@@ -23,12 +23,12 @@
/**
*
- * DOMWriterFilter.hpp: interface for the DOMWriterFilter class.
+ * DOMLSSerializerFilter.hpp: interface for the DOMLSSerializerFilter class.
*
- * DOMWriterFilter provide applications the ability to examine nodes
+ * DOMLSSerializerFilter provide applications the ability to examine nodes
* as they are being serialized.
*
- * DOMWriterFilter lets the application decide what nodes should be
+ * DOMLSSerializerFilter lets the application decide what nodes should be
* serialized or not.
*
* The DOMDocument, DOMDocumentType, DOMNotation, and DOMEntity nodes are not passed
@@ -43,14 +43,14 @@
XERCES_CPP_NAMESPACE_BEGIN
-class CDOM_EXPORT DOMWriterFilter : public DOMNodeFilter {
+class CDOM_EXPORT DOMLSSerializerFilter : public DOMNodeFilter {
protected:
// -----------------------------------------------------------------------
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
//@{
- DOMWriterFilter() {};
+ DOMLSSerializerFilter() {};
//@}
private:
@@ -59,8 +59,8 @@ private:
// -----------------------------------------------------------------------
/** @name Unimplemented constructors and operators */
//@{
- DOMWriterFilter(const DOMWriterFilter &);
- DOMWriterFilter & operator = (const DOMWriterFilter &);
+ DOMLSSerializerFilter(const DOMLSSerializerFilter &);
+ DOMLSSerializerFilter & operator = (const DOMLSSerializerFilter &);
//@}
@@ -74,11 +74,11 @@ public:
* Destructor
*
*/
- virtual ~DOMWriterFilter() {};
+ virtual ~DOMLSSerializerFilter() {};
//@}
// -----------------------------------------------------------------------
- // Virtual DOMWriterFilter interface
+ // Virtual DOMLSSerializerFilter interface
// -----------------------------------------------------------------------
/** @name Functions introduced in DOM Level 3 */
//@{
@@ -89,30 +89,15 @@ public:
virtual short acceptNode(const DOMNode* node) const = 0;
/**
- * Tells the DOMWriter what types of nodes to show to the filter.
+ * Tells the DOMLSSerializer what types of nodes to show to the filter.
* See <code>DOMNodeFilter</code> for definition of the constants.
* The constant SHOW_ATTRIBUTE is meaningless here, attribute nodes will
- * never be passed to a DOMWriterFilter.
- *
- * <p><b>"Experimental - subject to change"</b></p>
+ * never be passed to a DOMLSSerializerFilter.
*
* @return The constants of what types of nodes to show.
- * @see setWhatToShow
* @since DOM Level 3
*/
virtual unsigned long getWhatToShow() const =0;
-
- /**
- * Set what types of nodes are to be presented.
- * See <code>DOMNodeFilter</code> for definition of the constants.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param toShow The constants of what types of nodes to show.
- * @see getWhatToShow
- * @since DOM Level 3
- */
- virtual void setWhatToShow(unsigned long toShow) =0;
//@}
private:
@@ -123,7 +108,7 @@ private:
// fWhatToShow
//
// The whatToShow mask.
- // Tells the DOMWriter what types of nodes to show to the filter.
+ // Tells the DOMLSSerializer what types of nodes to show to the filter.
// See NodeFilter for definition of the constants.
// The constants
// SHOW_ATTRIBUTE,
@@ -133,7 +118,7 @@ private:
// SHOW_DOCUMENT_FRAGMENT are meaningless here,
// Entity nodes are not passed to the filter.
//
- // Those nodes will never be passed to a DOMWriterFilter.
+ // Those nodes will never be passed to a DOMLSSerializerFilter.
//
// Derived class shall add this data member:
//
diff --git a/src/xercesc/dom/impl/DOMConfigurationImpl.cpp b/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
index 8d0066f18..cf2a5bb1f 100644
--- a/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
+++ b/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
@@ -23,60 +23,6 @@
XERCES_CPP_NAMESPACE_BEGIN
-const bool DOMConfigurationImpl::fFalse = false;
-const bool DOMConfigurationImpl::fTrue = true;
-
-/* canonical-form */
-const XMLCh DOMConfigurationImpl::fgCANONICAL_FORM[] = { chLatin_c, chLatin_a, chLatin_n, chLatin_o, chLatin_n, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chDash, chLatin_f, chLatin_o, chLatin_r, chLatin_m, chNull };
-
-/* cdata-sections */
-const XMLCh DOMConfigurationImpl::fgCDATA_SECTIONS[] = { chLatin_c, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chDash, chLatin_s, chLatin_e, chLatin_c, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull };
-
-/* comments */
-const XMLCh DOMConfigurationImpl::fgCOMMENTS[] = { chLatin_c, chLatin_o, chLatin_m, chLatin_m, chLatin_e, chLatin_n, chLatin_t, chLatin_s, chNull };
-
-/* datatype-normalization */
-const XMLCh DOMConfigurationImpl::fgDATATYPE_NORMALIZATION[] = { chLatin_d, chLatin_a, chLatin_t, chLatin_a, chLatin_t, chLatin_y, chLatin_p, chLatin_e, chDash, chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i, chLatin_z, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull };
-
-/* discard-default-content */
-const XMLCh DOMConfigurationImpl::fgDISCARD_DEFAULT_CONTENT[] = { chLatin_d, chLatin_i, chLatin_s, chLatin_c, chLatin_a, chLatin_r, chLatin_d, chDash, chLatin_d, chLatin_e, chLatin_f, chLatin_a, chLatin_u, chLatin_l, chLatin_t, chDash, chLatin_c, chLatin_o, chLatin_n, chLatin_t, chLatin_e, chLatin_n, chLatin_t, chNull };
-
-/* entities */
-const XMLCh DOMConfigurationImpl::fgENTITIES[] = { chLatin_e, chLatin_n, chLatin_t, chLatin_i, chLatin_t, chLatin_i, chLatin_e, chLatin_s, chNull };
-
-/* infoset */
-const XMLCh DOMConfigurationImpl::fgINFOSET[] = { chLatin_i, chLatin_n, chLatin_f, chLatin_o, chLatin_s, chLatin_e, chLatin_t, chNull };
-
-/* namespaces */
-const XMLCh DOMConfigurationImpl::fgNAMESPACES[] = { chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e, chLatin_s, chNull };
-
-/* namespace-declarations */
-const XMLCh DOMConfigurationImpl::fgNAMESPACE_DECLARATIONS[] = { chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e, chDash, chLatin_d, chLatin_e, chLatin_c, chLatin_l, chLatin_a, chLatin_r, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull };
-
-/* normalize-characters */
-const XMLCh DOMConfigurationImpl::fgNORMALIZE_CHARACTERS[] = { chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i, chLatin_z, chLatin_e, chDash, chLatin_c, chLatin_h, chLatin_a, chLatin_r, chLatin_a, chLatin_c, chLatin_t, chLatin_e, chLatin_r, chLatin_s, chNull };
-
-/* split-cdata-sections */
-const XMLCh DOMConfigurationImpl::fgSPLIT_CDATA_SECTIONS[] = { chLatin_s, chLatin_p, chLatin_l, chLatin_i, chLatin_t, chDash, chLatin_c, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chDash, chLatin_s, chLatin_e, chLatin_c, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull };
-
-/* validate */
-const XMLCh DOMConfigurationImpl::fgVALIDATE[] = { chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t, chLatin_e, chNull };
-
-/* validate-if-schema */
-const XMLCh DOMConfigurationImpl::fgVALIDATE_IF_SCHEMA[] = { chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t, chLatin_e, chDash, chLatin_i, chLatin_f, chDash, chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chNull };
-
-/* whitespace-in-element-content */
-const XMLCh DOMConfigurationImpl::fgWHITESPACE_IN_ELEMENT_CONTENT[] = { chLatin_w, chLatin_h, chLatin_i, chLatin_t, chLatin_e, chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e, chDash, chLatin_i, chLatin_n, chDash, chLatin_e, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n, chLatin_t, chDash, chLatin_c, chLatin_o, chLatin_n, chLatin_t, chLatin_e, chLatin_n, chLatin_t, chNull };
-
-/* error-handler */
-const XMLCh DOMConfigurationImpl::fgERROR_HANDLER[] = { chLatin_e, chLatin_r, chLatin_r, chLatin_o, chLatin_r, chDash, chLatin_h, chLatin_a, chLatin_n, chLatin_d, chLatin_l, chLatin_e, chLatin_r, chNull };
-
-/* schema-type */
-const XMLCh DOMConfigurationImpl::fgSCHEMA_TYPE[] = { chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chDash, chLatin_t, chLatin_y, chLatin_p, chLatin_e, chNull };
-
-/* schema-location */
-const XMLCh DOMConfigurationImpl::fgSCHEMA_LOCATION[] = { chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chDash, chLatin_l, chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull };
-
const unsigned short DOMConfigurationImpl::fDEFAULT_VALUES = 0x2596;
DOMConfigurationImpl::DOMConfigurationImpl(MemoryManager* const manager): featureValues(fDEFAULT_VALUES),
@@ -99,25 +45,33 @@ void DOMConfigurationImpl::setParameter(const XMLCh* name, const void* value) {
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, fMemoryManager);
}
- DOMConfigurationFeature whichFlag;
- try {
- whichFlag = getFeatureFlag(lowerCaseName);
- if(*((bool*)value)) {
- featureValues |= whichFlag;
- } else {
- featureValues &= ~whichFlag;
- }
- } catch(DOMException&) {
- // must not be a boolean parameter
- if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
- fErrorHandler = (DOMErrorHandler*)value;
- } else if (XMLString::equals(lowerCaseName, fgSCHEMA_TYPE)) {
- fSchemaType = (XMLCh*)value;
- } else if (XMLString::equals(lowerCaseName, fgSCHEMA_LOCATION)) {
- fSchemaLocation = (XMLCh*)value;
- } else { // canSetParameter above should take care of this case
- throw DOMException(DOMException::NOT_FOUND_ERR, 0, fMemoryManager);
- }
+ if(XMLString::equals(lowerCaseName, XMLUni::fgDOMErrorHandler)) {
+ fErrorHandler = (DOMErrorHandler*)value;
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSchemaType)) {
+ fSchemaType = (XMLCh*)value;
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSchemaLocation)) {
+ fSchemaLocation = (XMLCh*)value;
+ } else { // canSetParameter above should take care of this case
+ throw DOMException(DOMException::NOT_FOUND_ERR, 0, fMemoryManager);
+ }
+
+}
+
+void DOMConfigurationImpl::setParameter(const XMLCh* name, bool value) {
+ XMLCh* lowerCaseName = XMLString::replicate(name, fMemoryManager);
+ ArrayJanitor<XMLCh> janName(lowerCaseName, fMemoryManager);
+
+ XMLString::lowerCaseASCII(lowerCaseName);
+
+ if(!canSetParameter(lowerCaseName, value)) {
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, fMemoryManager);
+ }
+
+ DOMConfigurationFeature whichFlag = getFeatureFlag(lowerCaseName);
+ if(value) {
+ featureValues |= whichFlag;
+ } else {
+ featureValues &= ~whichFlag;
}
}
@@ -137,17 +91,17 @@ const void* DOMConfigurationImpl::getParameter(const XMLCh* name) const {
try {
whichFlag = getFeatureFlag(lowerCaseName);
if(featureValues & whichFlag) {
- return &fTrue;
+ return (void*)true;
} else {
- return &fFalse;
+ return (void*)false;
}
} catch (DOMException&) {
// must not be a boolean parameter
- if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
+ if(XMLString::equals(lowerCaseName, XMLUni::fgDOMErrorHandler)) {
return fErrorHandler;
- } else if (XMLString::equals(lowerCaseName, fgSCHEMA_TYPE)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSchemaType)) {
return fSchemaType;
- } else if (XMLString::equals(lowerCaseName, fgSCHEMA_LOCATION)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSchemaLocation)) {
return fSchemaLocation;
} else {
throw DOMException(DOMException::NOT_FOUND_ERR, 0, fMemoryManager);
@@ -170,75 +124,88 @@ bool DOMConfigurationImpl::canSetParameter(const XMLCh* name, const void* value)
* 2) if an [optional] feature has no supporting code, then return false
**/
- // if value is null, return true
- if(value == 0) return true;
+ XMLCh* lowerCaseName = XMLString::replicate(name, fMemoryManager);
+ ArrayJanitor<XMLCh> janName(lowerCaseName, fMemoryManager);
+
+ XMLString::lowerCaseASCII(lowerCaseName);
+
+ if(XMLString::equals(lowerCaseName, XMLUni::fgDOMErrorHandler)) {
+ return true; // required //
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSchemaType)) {
+ return false; // optional //
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSchemaLocation)) {
+ return false; // optional //
+ }
+ return false;
+}
+bool DOMConfigurationImpl::canSetParameter(const XMLCh* name, bool booleanValue) const {
+ /**
+ * canSetParameter(name, value) returns false in two conditions:
+ * 1) if a [required] feature has no supporting code, then return false in
+ * both the true and false outcomes (This is in order to be either fully
+ * spec compliant, or not at all)
+ * 2) if an [optional] feature has no supporting code, then return false
+ **/
+
XMLCh* lowerCaseName = XMLString::replicate(name, fMemoryManager);
ArrayJanitor<XMLCh> janName(lowerCaseName, fMemoryManager);
XMLString::lowerCaseASCII(lowerCaseName);
- DOMConfigurationFeature whichFlag;
- try {
- whichFlag = getFeatureFlag(lowerCaseName);
- bool booleanValue = *((bool*)value);
- switch (whichFlag) {
- case FEATURE_CANONICAL_FORM:
- if(booleanValue) return false; // optional //
- else return true; // required //
- case FEATURE_CDATA_SECTIONS:
- return true;
- case FEATURE_COMMENTS:
- return true;
- case FEATURE_DATATYPE_NORMALIZATION:
- if(booleanValue) return false; // required //
- else return true; // required //
- case FEATURE_DISCARD_DEFAULT_CONTENT:
- if(booleanValue) return false; // required //
- else return true; // required //
- case FEATURE_ENTITIES:
- if(booleanValue) return true; // required //
- else return true; // required //
- case FEATURE_INFOSET:
- if(booleanValue) return false; // required //
- else return true; // no effect//
- case FEATURE_NAMESPACES:
- return true;
- case FEATURE_NAMESPACE_DECLARATIONS:
- if(booleanValue) return true; // optional //
- else return false; // required //
- case FEATURE_NORMALIZE_CHARACTERS:
- if(booleanValue) return false; // optional //
- else return true; // required //
- case FEATURE_SPLIT_CDATA_SECTIONS:
- //we dont report an error in the false case so we cant claim we do it
- if(booleanValue) return false; // required //
- else return false; // required //
- case FEATURE_VALIDATE:
- if(booleanValue) return false; // optional //
- else return true; // required //
- case FEATURE_VALIDATE_IF_SCHEMA:
- if(booleanValue) return false; // optional //
- else return true; // required //
-
- case FEATURE_WHITESPACE_IN_ELEMENT_CONTENT:
- if(booleanValue) return true; // required //
- else return false; // optional //
- default: return false; // should never be here
- }
- } catch (DOMException&) {
- // must not be a boolean parameter
- if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
- return true; // required //
- } else if (XMLString::equals(lowerCaseName, fgSCHEMA_TYPE)) {
- return false; // optional //
- } else if (XMLString::equals(lowerCaseName, fgSCHEMA_LOCATION)) {
- return false; // optional //
- }
+ DOMConfigurationFeature whichFlag = getFeatureFlag(lowerCaseName);
+ switch (whichFlag) {
+ case FEATURE_CANONICAL_FORM:
+ if(booleanValue) return false; // optional //
+ else return true; // required //
+ case FEATURE_CDATA_SECTIONS:
+ return true;
+ case FEATURE_COMMENTS:
+ return true;
+ case FEATURE_DATATYPE_NORMALIZATION:
+ if(booleanValue) return false; // required //
+ else return true; // required //
+ case FEATURE_DISCARD_DEFAULT_CONTENT:
+ if(booleanValue) return false; // required //
+ else return true; // required //
+ case FEATURE_ENTITIES:
+ if(booleanValue) return true; // required //
+ else return true; // required //
+ case FEATURE_INFOSET:
+ if(booleanValue) return false; // required //
+ else return true; // no effect//
+ case FEATURE_NAMESPACES:
+ return true;
+ case FEATURE_NAMESPACE_DECLARATIONS:
+ if(booleanValue) return true; // optional //
+ else return false; // required //
+ case FEATURE_NORMALIZE_CHARACTERS:
+ if(booleanValue) return false; // optional //
+ else return true; // required //
+ case FEATURE_SPLIT_CDATA_SECTIONS:
+ //we dont report an error in the false case so we cant claim we do it
+ if(booleanValue) return false; // required //
+ else return false; // required //
+ case FEATURE_VALIDATE:
+ if(booleanValue) return false; // optional //
+ else return true; // required //
+ case FEATURE_VALIDATE_IF_SCHEMA:
+ if(booleanValue) return false; // optional //
+ else return true; // required //
+
+ case FEATURE_ELEMENT_CONTENT_WHITESPACE:
+ if(booleanValue) return true; // required //
+ else return false; // optional //
+ default: return false; // should never be here
}
return false;
}
+const RefVectorOf<const XMLCh*>* DOMConfigurationImpl::getParameterNames() const
+{
+ return 0;
+}
+
// -------------------------------------------
// Impl methods
// -------------------------------------------
@@ -249,34 +216,34 @@ DOMConfigurationImpl::DOMConfigurationFeature DOMConfigurationImpl::getFeatureFl
XMLString::lowerCaseASCII(lowerCaseName);
- if(XMLString::equals(lowerCaseName, fgCANONICAL_FORM)) {
+ if(XMLString::equals(lowerCaseName, XMLUni::fgDOMCanonicalForm)) {
return FEATURE_CANONICAL_FORM;
- } else if (XMLString::equals(lowerCaseName, fgCDATA_SECTIONS )) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMCDATASections )) {
return FEATURE_CDATA_SECTIONS;
- } else if (XMLString::equals(lowerCaseName, fgCOMMENTS)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMComments)) {
return FEATURE_COMMENTS;
- } else if (XMLString::equals(lowerCaseName, fgDATATYPE_NORMALIZATION)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMDatatypeNormalization)) {
return FEATURE_DATATYPE_NORMALIZATION;
- } else if (XMLString::equals(lowerCaseName, fgDISCARD_DEFAULT_CONTENT)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMWRTDiscardDefaultContent)) {
return FEATURE_DISCARD_DEFAULT_CONTENT;
- } else if (XMLString::equals(lowerCaseName, fgENTITIES)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMEntities)) {
return FEATURE_ENTITIES;
- } else if (XMLString::equals(lowerCaseName, fgINFOSET)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMInfoset)) {
return FEATURE_INFOSET;
- } else if (XMLString::equals(lowerCaseName, fgNAMESPACES)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMNamespaces)) {
return FEATURE_NAMESPACES;
- } else if (XMLString::equals(lowerCaseName, fgNAMESPACE_DECLARATIONS)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMNamespaceDeclarations)) {
return FEATURE_NAMESPACE_DECLARATIONS;
- } else if (XMLString::equals(lowerCaseName, fgNORMALIZE_CHARACTERS)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMNormalizeCharacters)) {
return FEATURE_NORMALIZE_CHARACTERS;
- } else if (XMLString::equals(lowerCaseName, fgSPLIT_CDATA_SECTIONS)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMSplitCDATASections)) {
return FEATURE_SPLIT_CDATA_SECTIONS;
- } else if (XMLString::equals(lowerCaseName, fgVALIDATE)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMValidate)) {
return FEATURE_VALIDATE;
- } else if (XMLString::equals(lowerCaseName, fgVALIDATE_IF_SCHEMA)) {
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMValidateIfSchema)) {
return FEATURE_VALIDATE_IF_SCHEMA;
- } else if (XMLString::equals(lowerCaseName, fgWHITESPACE_IN_ELEMENT_CONTENT)) {
- return FEATURE_WHITESPACE_IN_ELEMENT_CONTENT;
+ } else if (XMLString::equals(lowerCaseName, XMLUni::fgDOMElementContentWhitespace)) {
+ return FEATURE_ELEMENT_CONTENT_WHITESPACE;
} else {
throw DOMException(DOMException::NOT_FOUND_ERR, 0, fMemoryManager);
}
diff --git a/src/xercesc/dom/impl/DOMConfigurationImpl.hpp b/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
index 8947e4f24..0e56d3dbf 100644
--- a/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
@@ -69,7 +69,7 @@ public:
FEATURE_SPLIT_CDATA_SECTIONS = 0x0400,
FEATURE_VALIDATE = 0x0800,
FEATURE_VALIDATE_IF_SCHEMA = 0x1000,
- FEATURE_WHITESPACE_IN_ELEMENT_CONTENT = 0x2000
+ FEATURE_ELEMENT_CONTENT_WHITESPACE = 0x2000
};
unsigned short featureValues;
@@ -78,21 +78,24 @@ public:
// Setter methods
// -----------------------------------------------------------------------
- void setParameter(const XMLCh* name, const void* value);
+ virtual void setParameter(const XMLCh* name, const void* value);
+ virtual void setParameter(const XMLCh* name, bool value);
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- const void* getParameter(const XMLCh* name) const;
+ virtual const void* getParameter(const XMLCh* name) const;
// -----------------------------------------------------------------------
// Query methods
// -----------------------------------------------------------------------
- bool canSetParameter(const XMLCh* name, const void* value) const;
+ virtual bool canSetParameter(const XMLCh* name, const void* value) const;
+ virtual bool canSetParameter(const XMLCh* name, bool value) const;
+ virtual const RefVectorOf<const XMLCh*>* getParameterNames() const;
// ---------------------------------------------------------------------------
// Impl specific methods
@@ -113,30 +116,8 @@ public:
void setSchemaLocation(const XMLCh* sl);
- // --------------------------------------
- // static consts names
- // --------------------------------------
- static const XMLCh fgCANONICAL_FORM[];
- static const XMLCh fgCDATA_SECTIONS[];
- static const XMLCh fgCOMMENTS[];
- static const XMLCh fgDATATYPE_NORMALIZATION[];
- static const XMLCh fgDISCARD_DEFAULT_CONTENT[];
- static const XMLCh fgENTITIES[];
- static const XMLCh fgINFOSET[];
- static const XMLCh fgNAMESPACES[];
- static const XMLCh fgNAMESPACE_DECLARATIONS[];
- static const XMLCh fgNORMALIZE_CHARACTERS[];
- static const XMLCh fgSPLIT_CDATA_SECTIONS[];
- static const XMLCh fgVALIDATE[];
- static const XMLCh fgVALIDATE_IF_SCHEMA[];
- static const XMLCh fgWHITESPACE_IN_ELEMENT_CONTENT[];
-
- static const XMLCh fgERROR_HANDLER[];
- static const XMLCh fgSCHEMA_TYPE[];
- static const XMLCh fgSCHEMA_LOCATION[];
-
// The default values for the boolean parameters
- // from CANONICAL_FORM to WHITESPACE_IN_ELEMENT_CONTENT
+ // from CANONICAL_FORM to ELEMENT_CONTENT_WHITESPACE
// 10010110010110 = 0x2596
static const unsigned short fDEFAULT_VALUES;
@@ -154,9 +135,6 @@ private:
// the schema location
const XMLCh* fSchemaLocation;
- static const bool fFalse;
- static const bool fTrue;
-
MemoryManager* fMemoryManager;
};
diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.cpp b/src/xercesc/dom/impl/DOMImplementationImpl.cpp
index 9d3acddd7..eb1e75c4e 100644
--- a/src/xercesc/dom/impl/DOMImplementationImpl.cpp
+++ b/src/xercesc/dom/impl/DOMImplementationImpl.cpp
@@ -21,7 +21,7 @@
#include "DOMImplementationImpl.hpp"
#include "DOMDocumentImpl.hpp"
#include "DOMDocumentTypeImpl.hpp"
-#include "DOMWriterImpl.hpp"
+#include "DOMLSSerializerImpl.hpp"
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMDocumentType.hpp>
@@ -34,16 +34,13 @@
#include <xercesc/util/XMLStringTokenizer.hpp>
#include <xercesc/util/XMLDOMMsg.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
-#include <xercesc/parsers/DOMBuilderImpl.hpp>
+#include <xercesc/parsers/DOMLSParserImpl.hpp>
XERCES_CPP_NAMESPACE_BEGIN
// ------------------------------------------------------------
-//
-// Static constants. These are lazily initialized on first usage.
-// (Static constructors can not be safely used because
-// of order of initialization dependencies.)
+// Static constants
// ------------------------------------------------------------
static const XMLCh g1_0[] = // Points to "1.0"
{chDigit_1, chPeriod, chDigit_0, chNull};
@@ -130,8 +127,8 @@ void XMLInitializer::initializeMsgLoader4DOM()
// Singleton DOMImplementationImpl
// -----------------------------------------------------------------------
static DOMImplementationImpl *gDomimp = 0; // Points to the singleton instance
- // of DOMImplementation that is returnedreturned
- // by any call to getImplementation().
+ // of DOMImplementation that is returnedreturned
+ // by any call to getImplementation().
static XMLRegisterCleanup implementationCleanup;
static void reinitImplementation()
@@ -264,6 +261,19 @@ bool DOMImplementation::loadDOMExceptionMsg
return DOMImplementationImpl::getMsgLoader4DOM()->loadMsg(XMLDOMMsg::DOMEXCEPTION_ERRX+msgToLoad, toFill, maxChars);
}
+bool DOMImplementation::loadDOMExceptionMsg
+(
+ const DOMLSException::LSExceptionCode msgToLoad
+ , XMLCh* const toFill
+ , const unsigned int maxChars
+)
+{
+ // load the text, the msgToLoad+XMLDOMMsgs::DOMLSEXCEPTION_ERRX+msgToLoad is the corresponding XMLDOMMsg Code
+ // TODO
+// return DOMImplementationImpl::getMsgLoader4DOM()->loadMsg(XMLDOMMsg::DOMLSEXCEPTION_ERRX+msgToLoad, toFill, maxChars);
+ return false;
+}
+
bool DOMImplementation::loadDOMExceptionMsg
(
const DOMRangeException::RangeExceptionCode msgToLoad
@@ -279,30 +289,37 @@ bool DOMImplementation::loadDOMExceptionMsg
// DOMImplementationLS Virtual interface
// ------------------------------------------------------------
//Introduced in DOM Level 3
-DOMBuilder* DOMImplementationImpl::createDOMBuilder(const short mode,
- const XMLCh* const,
+DOMLSParser* DOMImplementationImpl::createLSParser( const unsigned short mode,
+ const XMLCh* const schemaType,
MemoryManager* const manager,
XMLGrammarPool* const gramPool)
{
if (mode == DOMImplementationLS::MODE_ASYNCHRONOUS)
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, manager);
- return new (manager) DOMBuilderImpl(0, manager, gramPool);
+ // TODO: schemaType
+ return new (manager) DOMLSParserImpl(0, manager, gramPool);
}
-DOMWriter* DOMImplementationImpl::createDOMWriter(MemoryManager* const manager)
+DOMLSSerializer* DOMImplementationImpl::createLSSerializer(MemoryManager* const manager)
{
- return new (manager) DOMWriterImpl(manager);
+ return new (manager) DOMLSSerializerImpl(manager);
}
-DOMInputSource* DOMImplementationImpl::createDOMInputSource()
+DOMLSInput* DOMImplementationImpl::createLSInput()
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
+DOMLSOutput* DOMImplementationImpl::createLSOutput()
+{
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
+
+ return 0;
+}
// ------------------------------------------------------------
// DOMImplementationSource Virtual interface
diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.hpp b/src/xercesc/dom/impl/DOMImplementationImpl.hpp
index d289d9320..73e94d64d 100644
--- a/src/xercesc/dom/impl/DOMImplementationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMImplementationImpl.hpp
@@ -76,13 +76,13 @@ public:
// DOMImplementationLS Virtual interface
// ------------------------------------------------------------
// Introduced in DOM Level 3
- // Experimental - subject to change
- virtual DOMBuilder* createDOMBuilder(const short mode,
- const XMLCh* const schemaType,
- MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager,
- XMLGrammarPool* const gramPool = 0);
- virtual DOMWriter* createDOMWriter(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
- virtual DOMInputSource* createDOMInputSource();
+ virtual DOMLSParser* createLSParser(const unsigned short mode,
+ const XMLCh* const schemaType,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager,
+ XMLGrammarPool* const gramPool = 0);
+ virtual DOMLSSerializer* createLSSerializer(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+ virtual DOMLSInput* createLSInput();
+ virtual DOMLSOutput* createLSOutput();
// ------------------------------------------------------------
// DOMImplementationSource Virtual interface
diff --git a/src/xercesc/dom/impl/DOMWriterImpl.cpp b/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
similarity index 93%
rename from src/xercesc/dom/impl/DOMWriterImpl.cpp
rename to src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
index 8c3b424da..c1ba5dfeb 100644
--- a/src/xercesc/dom/impl/DOMWriterImpl.cpp
+++ b/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
@@ -18,12 +18,13 @@
* $Id$
*/
-#include "DOMWriterImpl.hpp"
+#include "DOMLSSerializerImpl.hpp"
#include "DOMErrorImpl.hpp"
#include "DOMLocatorImpl.hpp"
#include "DOMImplementationImpl.hpp"
#include <xercesc/framework/MemBufFormatTarget.hpp>
+#include <xercesc/framework/LocalFileFormatTarget.hpp>
#include <xercesc/util/TransService.hpp>
#include <xercesc/util/TranscodingException.hpp>
@@ -264,7 +265,7 @@ static int lastWhiteSpaceInTextNode = 0;
// REVISIT: use throwing exception to abort serialization is an interesting
// thing here, since the serializer is a recusive function, we
// can't use return, obviously. However we may have multiple try/catch
-// along its way going back to writeNode(). So far we don't come up with a
+// along its way going back to write(). So far we don't come up with a
// "short-cut" to go "directly" back.
//
#define TRY_CATCH_THROW(action, forceToRethrow) \
@@ -282,7 +283,7 @@ catch(TranscodingException const &e) \
throw e; \
}
-DOMWriterImpl::~DOMWriterImpl()
+DOMLSSerializerImpl::~DOMLSSerializerImpl()
{
fMemoryManager->deallocate(fEncoding);//delete [] fEncoding;
fMemoryManager->deallocate(fNewLine);//delete [] fNewLine;
@@ -290,7 +291,7 @@ DOMWriterImpl::~DOMWriterImpl()
// we don't own/adopt error handler and filter
}
-DOMWriterImpl::DOMWriterImpl(MemoryManager* const manager)
+DOMLSSerializerImpl::DOMLSSerializerImpl(MemoryManager* const manager)
:fFeatures(0)
,fEncoding(0)
,fNewLine(0)
@@ -323,15 +324,32 @@ DOMWriterImpl::DOMWriterImpl(MemoryManager* const manager)
}
-bool DOMWriterImpl::canSetFeature(const XMLCh* const featName
- , bool state) const
+bool DOMLSSerializerImpl::canSetParameter(const XMLCh* const featName
+ , const void* value) const
+{
+ if(XMLString::compareIStringASCII(featName, XMLUni::fgDOMErrorHandler)==0)
+ return true;
+ return false;
+}
+
+bool DOMLSSerializerImpl::canSetParameter(const XMLCh* const featName
+ , bool state) const
{
int featureId = INVALID_FEATURE_ID;
return checkFeature(featName, false, featureId) ? canSetFeature(featureId, state) : false;
}
-void DOMWriterImpl::setFeature(const XMLCh* const featName
- , bool state)
+void DOMLSSerializerImpl::setParameter(const XMLCh* const featName
+ , const void* value)
+{
+ if(XMLString::compareIStringASCII(featName, XMLUni::fgDOMErrorHandler)==0)
+ fErrorHandler = (DOMErrorHandler*)value;
+ else
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, fMemoryManager);
+}
+
+void DOMLSSerializerImpl::setParameter(const XMLCh* const featName
+ , bool state)
{
int featureId = INVALID_FEATURE_ID;
checkFeature(featName, true, featureId);
@@ -372,56 +390,56 @@ void DOMWriterImpl::setFeature(const XMLCh* const featName
if ((featureId == FORMAT_PRETTY_PRINT_ID) && state)
setFeature(CANONICAL_FORM_ID, false);
+}
- return;
+const void* DOMLSSerializerImpl::getParameter(const XMLCh* const featName) const
+{
+ if(XMLString::compareIStringASCII(featName, XMLUni::fgDOMErrorHandler)==0)
+ {
+ return (void*)fErrorHandler;
+ }
+ else
+ {
+ int featureId = INVALID_FEATURE_ID;
+ checkFeature(featName, true, featureId);
+ return (void*)getFeature(featureId);
+ }
}
-bool DOMWriterImpl::getFeature(const XMLCh* const featName) const
+const RefVectorOf<const XMLCh*>* DOMLSSerializerImpl::getParameterNames() const
{
- int featureId = INVALID_FEATURE_ID;
- checkFeature(featName, true, featureId);
- return getFeature(featureId);
+ return 0;
}
// we don't check the validity of the encoding set
-void DOMWriterImpl::setEncoding(const XMLCh* const encoding)
+void DOMLSSerializerImpl::setEncoding(const XMLCh* const encoding)
{
fMemoryManager->deallocate(fEncoding);//delete [] fEncoding;
fEncoding = XMLString::replicate(encoding, fMemoryManager);
}
-const XMLCh* DOMWriterImpl::getEncoding() const
+const XMLCh* DOMLSSerializerImpl::getEncoding() const
{
return fEncoding;
}
-void DOMWriterImpl::setNewLine(const XMLCh* const newLine)
+void DOMLSSerializerImpl::setNewLine(const XMLCh* const newLine)
{
fMemoryManager->deallocate(fNewLine);//delete [] fNewLine;
fNewLine = XMLString::replicate(newLine, fMemoryManager);
}
-const XMLCh* DOMWriterImpl::getNewLine() const
+const XMLCh* DOMLSSerializerImpl::getNewLine() const
{
return fNewLine;
}
-void DOMWriterImpl::setErrorHandler(DOMErrorHandler *errorHandler)
-{
- fErrorHandler = errorHandler;
-}
-
-DOMErrorHandler* DOMWriterImpl::getErrorHandler() const
-{
- return fErrorHandler;
-}
-
-void DOMWriterImpl::setFilter(DOMWriterFilter *filter)
+void DOMLSSerializerImpl::setFilter(DOMLSSerializerFilter *filter)
{
fFilter = filter;
}
-DOMWriterFilter* DOMWriterImpl::getFilter() const
+DOMLSSerializerFilter* DOMLSSerializerImpl::getFilter() const
{
return fFilter;
}
@@ -429,11 +447,11 @@ DOMWriterFilter* DOMWriterImpl::getFilter() const
//
//
//
-bool DOMWriterImpl::writeNode(XMLFormatTarget* const destination
- , const DOMNode &nodeToWrite)
+bool DOMLSSerializerImpl::write(const DOMNode* nodeToWrite,
+ XMLFormatTarget* const destination)
{
//init session vars
- initSession(&nodeToWrite);
+ initSession(nodeToWrite);
try
{
@@ -446,14 +464,14 @@ bool DOMWriterImpl::writeNode(XMLFormatTarget* const destination
}
catch (const TranscodingException& e)
{
- reportError(&nodeToWrite, DOMError::DOM_SEVERITY_FATAL_ERROR, e.getMessage());
+ reportError(nodeToWrite, DOMError::DOM_SEVERITY_FATAL_ERROR, e.getMessage());
return false;
}
try
{
Janitor<XMLFormatter> janName(fFormatter);
- processNode(&nodeToWrite);
+ processNode(nodeToWrite);
destination->flush();
}
@@ -502,11 +520,17 @@ bool DOMWriterImpl::writeNode(XMLFormatTarget* const destination
return ((fErrorCount == 0)? true : false);
}
+bool DOMLSSerializerImpl::writeToURI(const DOMNode* nodeToWrite, const XMLCh* uri)
+{
+ LocalFileFormatTarget target(uri);
+ return write(nodeToWrite, &target);
+}
+
//
// We don't throw DOMSTRING_SIZE_ERR since we are no longer
// using DOMString.
//
-XMLCh* DOMWriterImpl::writeToString(const DOMNode &nodeToWrite)
+XMLCh* DOMLSSerializerImpl::writeToString(const DOMNode* nodeToWrite)
{
MemBufFormatTarget destination(1023, fMemoryManager);
bool retVal;
@@ -517,7 +541,7 @@ XMLCh* DOMWriterImpl::writeToString(const DOMNode &nodeToWrite)
try
{
- retVal = writeNode(&destination, nodeToWrite);
+ retVal = write(nodeToWrite, &destination);
}
catch(const OutOfMemoryException&)
{
@@ -537,7 +561,7 @@ XMLCh* DOMWriterImpl::writeToString(const DOMNode &nodeToWrite)
return (retVal ? XMLString::replicate((XMLCh*) destination.getRawBuffer(), fMemoryManager) : 0);
}
-void DOMWriterImpl::initSession(const DOMNode* const nodeToWrite)
+void DOMLSSerializerImpl::initSession(const DOMNode* const nodeToWrite)
{
/**
@@ -648,7 +672,7 @@ void DOMWriterImpl::initSession(const DOMNode* const nodeToWrite)
// a document node and it will do the whole thing.
// ---------------------------------------------------------------------------
-void DOMWriterImpl::processNode(const DOMNode* const nodeToWrite, int level)
+void DOMLSSerializerImpl::processNode(const DOMNode* const nodeToWrite, int level)
{
// Get the name and value out for convenience
@@ -1296,13 +1320,13 @@ void DOMWriterImpl::processNode(const DOMNode* const nodeToWrite, int level)
}
-bool DOMWriterImpl::customNodeSerialize(const DOMNode* const, int) {
+bool DOMLSSerializerImpl::customNodeSerialize(const DOMNode* const, int) {
return false;
}
//
//
-DOMNodeFilter::FilterAction DOMWriterImpl::checkFilter(const DOMNode* const node) const
+DOMNodeFilter::FilterAction DOMLSSerializerImpl::checkFilter(const DOMNode* const node) const
{
if (!fFilter ||
((fFilter->getWhatToShow() & (1 << (node->getNodeType() - 1))) == 0))
@@ -1317,7 +1341,7 @@ DOMNodeFilter::FilterAction DOMWriterImpl::checkFilter(const DOMNode* const node
}
-bool DOMWriterImpl::checkFeature(const XMLCh* const featName
+bool DOMLSSerializerImpl::checkFeature(const XMLCh* const featName
, bool toThrow
, int& featureId) const
{
@@ -1366,7 +1390,7 @@ bool DOMWriterImpl::checkFeature(const XMLCh* const featName
return true;
}
-bool DOMWriterImpl::reportError(const DOMNode* const errorNode
+bool DOMLSSerializerImpl::reportError(const DOMNode* const errorNode
, DOMError::ErrorSeverity errorType
, const XMLCh* const errorMsg)
{
@@ -1385,7 +1409,7 @@ bool DOMWriterImpl::reportError(const DOMNode* const errorNode
return toContinueProcess;
}
-bool DOMWriterImpl::reportError(const DOMNode* const errorNode
+bool DOMLSSerializerImpl::reportError(const DOMNode* const errorNode
, DOMError::ErrorSeverity errorType
, XMLDOMMsg::Codes toEmit)
{
@@ -1415,7 +1439,7 @@ bool DOMWriterImpl::reportError(const DOMNode* const errorNode
//
//
//
-void DOMWriterImpl::procCdataSection(const XMLCh* const nodeValue
+void DOMLSSerializerImpl::procCdataSection(const XMLCh* const nodeValue
, const DOMNode* const nodeToWrite
, int level)
{
@@ -1484,7 +1508,7 @@ void DOMWriterImpl::procCdataSection(const XMLCh* const nodeValue
//
//
//
-void DOMWriterImpl::procUnrepCharInCdataSection(const XMLCh* const nodeValue
+void DOMLSSerializerImpl::procUnrepCharInCdataSection(const XMLCh* const nodeValue
, const DOMNode* const nodeToWrite
, int level)
{
@@ -1581,18 +1605,18 @@ void DOMWriterImpl::procUnrepCharInCdataSection(const XMLCh* const nodeValue
}
}
-void DOMWriterImpl::processNode(const DOMNode* const nodeToWrite)
+void DOMLSSerializerImpl::processNode(const DOMNode* const nodeToWrite)
{
processNode(nodeToWrite, 0);
}
-bool DOMWriterImpl::canSetFeature(const int featureId
+bool DOMLSSerializerImpl::canSetFeature(const int featureId
, bool val) const
{
return featuresSupported[2*featureId + (val? 0: 1)];
}
-void DOMWriterImpl::printNewLine()
+void DOMLSSerializerImpl::printNewLine()
{
if (getFeature(FORMAT_PRETTY_PRINT_ID))
{
@@ -1601,7 +1625,7 @@ void DOMWriterImpl::printNewLine()
}
}
-void DOMWriterImpl::printIndent(int level) const
+void DOMLSSerializerImpl::printIndent(int level) const
{
if (getFeature(FORMAT_PRETTY_PRINT_ID))
{
@@ -1619,13 +1643,13 @@ void DOMWriterImpl::printIndent(int level) const
}
}
-void DOMWriterImpl::release()
+void DOMLSSerializerImpl::release()
{
- DOMWriterImpl* writer = (DOMWriterImpl*) this;
+ DOMLSSerializerImpl* writer = (DOMLSSerializerImpl*) this;
delete writer;
}
-void DOMWriterImpl::processBOM()
+void DOMLSSerializerImpl::processBOM()
{
// if the feature is not set, don't output bom
if (!getFeature(BYTE_ORDER_MARK_ID))
diff --git a/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp b/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
new file mode 100644
index 000000000..b33d6fc98
--- /dev/null
+++ b/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+
+#ifndef DOMLSSerializerImpl_HEADER_GUARD_
+#define DOMLSSerializerImpl_HEADER_GUARD_
+
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMLSSerializer.hpp>
+#include <xercesc/util/XMLDOMMsg.hpp>
+#include <xercesc/util/RefHashTableOf.hpp>
+#include <xercesc/util/RefVectorOf.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+
+class CDOM_EXPORT DOMLSSerializerImpl : public XMemory,
+ public DOMLSSerializer,
+ public DOMConfiguration
+{
+
+public:
+
+ /** @name Constructor and Destructor */
+ //@{
+
+ /**
+ * Constructor.
+ */
+ DOMLSSerializerImpl(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+
+ /**
+ * Destructor.
+ */
+ ~DOMLSSerializerImpl();
+ //@}
+
+ /** @name Implementation of DOMLSSerializer interface */
+ //@{
+
+ virtual DOMConfiguration* getDomConfig();
+
+ virtual void setEncoding(const XMLCh* const encoding);
+ virtual const XMLCh* getEncoding() const;
+
+ virtual void setNewLine(const XMLCh* const newLine);
+ virtual const XMLCh* getNewLine() const;
+
+ virtual void setFilter(DOMLSSerializerFilter *filter);
+ virtual DOMLSSerializerFilter* getFilter() const;
+
+ virtual bool write(const DOMNode* nodeToWrite,
+ XMLFormatTarget* const destination);
+ virtual bool writeToURI(const DOMNode* nodeToWrite,
+ const XMLCh* uri);
+ /**
+ * The caller is responsible for the release of the returned string
+ */
+ virtual XMLCh* writeToString(const DOMNode* nodeToWrite);
+ virtual void release();
+
+ //@}
+
+ /** @name Implementation of DOMConfiguration interface */
+ //@{
+ virtual void setParameter(const XMLCh* name, const void* value);
+ virtual void setParameter(const XMLCh* name, bool value);
+ virtual const void* getParameter(const XMLCh* name) const;
+ virtual bool canSetParameter(const XMLCh* name, const void* value) const;
+ virtual bool canSetParameter(const XMLCh* name, bool value) const;
+ virtual const RefVectorOf<const XMLCh*>* getParameterNames() const;
+ //@}
+
+private:
+
+ /** unimplemented copy ctor and assignment operator */
+ DOMLSSerializerImpl(const DOMLSSerializerImpl&);
+ DOMLSSerializerImpl & operator = (const DOMLSSerializerImpl&);
+
+ /** helper **/
+ void initSession(const DOMNode* const);
+ void processNode(const DOMNode* const);
+
+ void procCdataSection(const XMLCh* const nodeValue
+ , const DOMNode* const nodeToWrite
+ , int level);
+
+ void procUnrepCharInCdataSection(const XMLCh* const nodeValue
+ , const DOMNode* const nodeToWrite
+ , int level);
+
+protected:
+ /**
+ * Overidden by derived classes to extend the abilities of the standard writer
+ * always returns false in the default implementation
+ * @return true if the method deals with nodeToWrite
+ */
+ virtual bool customNodeSerialize(const DOMNode* const nodeToWrite, int level);
+
+ DOMNodeFilter::FilterAction checkFilter(const DOMNode* const) const;
+
+ bool checkFeature(const XMLCh* const featName
+ , bool state
+ , int& featureId) const;
+
+ bool reportError(const DOMNode* const errorNode
+ , DOMError::ErrorSeverity errorType
+ , const XMLCh* const errorMsg);
+ bool reportError(const DOMNode* const errorNode
+ , DOMError::ErrorSeverity errorType
+ , XMLDOMMsg::Codes toEmit);
+
+ bool canSetFeature(const int featureId
+ , bool val) const;
+ void setFeature(const int featureId
+ , bool val);
+ bool getFeature(const int featureId) const;
+
+ void printNewLine();
+ void setURCharRef();
+
+
+ void printIndent(int level) const;
+ //does the actual work for processNode while keeping track of the level
+ void processNode(const DOMNode* const nodeToWrite, int level);
+
+ void processBOM();
+
+ // -----------------------------------------------------------------------
+ // Private data members
+ //
+ // fFeatures
+ //
+ // fEncoding
+ // own it
+ //
+ // fNewLine
+ // own it
+ //
+ // fErrorHandler
+ // don't own it
+ //
+ // fFilter
+ // don't own it
+ //
+ // fDocumentVersion
+ // The XML Version of the document to be serialized.
+ //
+ // fEncodingUsed (session var)
+ // the actual encoding used in write(),
+ // it does not own any data(memory).
+ //
+ // fNewLineUsed (session var)
+ // the actual "end of line" sequence used in write(),
+ // it does not own any data(memory).
+ //
+ // fFormatter (session var)
+ // the formatter used in write()
+ //
+ // fErrorCount
+ // the count of error encountered in the serialization,
+ // which neither the error handler, nor the serializer itself,
+ // treat as fatal. And the serializer will return true/false
+ // based on this value.
+ //
+ // fCurrentLine
+ // the current line. Used to track the line number the current
+ // node begins on
+ //
+ // -----------------------------------------------------------------------
+
+ int fFeatures;
+ XMLCh *fEncoding;
+ XMLCh *fNewLine;
+ DOMErrorHandler *fErrorHandler;
+ DOMLSSerializerFilter *fFilter;
+ const XMLCh *fDocumentVersion;
+
+ //session vars
+ const XMLCh *fEncodingUsed;
+ const XMLCh *fNewLineUsed;
+ XMLFormatter *fFormatter;
+ int fErrorCount;
+ int fCurrentLine;
+
+ RefVectorOf< RefHashTableOf<XMLCh> >* fNamespaceStack;
+ MemoryManager* fMemoryManager;
+};
+
+inline DOMConfiguration* DOMLSSerializerImpl::getDomConfig()
+{
+ return this;
+}
+
+inline void DOMLSSerializerImpl::setFeature(const int featureId
+ , bool val)
+{
+ (val)? fFeatures |= (1<<featureId) : fFeatures &= ~(1<<featureId);
+};
+
+inline bool DOMLSSerializerImpl::getFeature(const int featureId) const
+{
+ return ((fFeatures & ( 1<<featureId )) != 0) ? true : false;
+};
+
+inline void DOMLSSerializerImpl::setURCharRef()
+{
+ fFormatter->setUnRepFlags(XMLFormatter::UnRep_CharRef);
+}
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
diff --git a/src/xercesc/dom/impl/DOMWriterImpl.hpp b/src/xercesc/dom/impl/DOMWriterImpl.hpp
deleted file mode 100644
index ecac4fdd1..000000000
--- a/src/xercesc/dom/impl/DOMWriterImpl.hpp
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * $Id$
- */
-
-/**
- * DOMWriterImpl provides an API for serializing (writing) a DOM document out in
- * an XML document. The XML data is written to an output stream, the type of
- * which depends on the specific language bindings in use. During
- * serialization of XML data, namespace fixup is done when possible.
- * <p> <code>DOMWriterImpl</code> accepts any node type for serialization. For
- * nodes of type <code>Document</code> or <code>Entity</code>, well formed
- * XML will be created if possible. The serialized output for these node
- * types is either as a Document or an External Entity, respectively, and is
- * acceptable input for an XML parser. For all other types of nodes the
- * serialized form is not specified, but should be something useful to a
- * human for debugging or diagnostic purposes. Note: rigorously designing an
- * external (source) form for stand-alone node types that don't already have
- * one defined in seems a bit much to take on here.
- * <p>Within a Document or Entity being serialized, Nodes are processed as
- * follows Documents are written including an XML declaration and a DTD
- * subset, if one exists in the DOM. Writing a document node serializes the
- * entire document. Entity nodes, when written directly by
- * <code>writeNode</code> defined in the <code>DOMWriterImpl</code> interface,
- * output the entity expansion but no namespace fixup is done. The resulting
- * output will be valid as an external entity. Entity References nodes are
- * serializes as an entity reference of the form
- * <code>"&entityName;"</code>) in the output. Child nodes (the
- * expansion) of the entity reference are ignored. CDATA sections
- * containing content characters that can not be represented in the
- * specified output encoding are handled according to the
- * "split-cdata-sections" feature.If the feature is <code>true</code>, CDATA
- * sections are split, and the unrepresentable characters are serialized as
- * numeric character references in ordinary content. The exact position and
- * number of splits is not specified. If the feature is <code>false</code>,
- * unrepresentable characters in a CDATA section are reported as errors. The
- * error is not recoverable - there is no mechanism for supplying
- * alternative characters and continuing with the serialization. All other
- * node types (Element, Text, etc.) are serialized to their corresponding
- * XML source form.
- * <p> Within the character data of a document (outside of markup), any
- * characters that cannot be represented directly are replaced with
- * character references. Occurrences of '<' and '&' are replaced by
- * the predefined entities &lt; and &amp. The other predefined
- * entities (&gt, &apos, etc.) are not used; these characters can be
- * included directly. Any character that can not be represented directly in
- * the output character encoding is serialized as a numeric character
- * reference.
- * <p> Attributes not containing quotes are serialized in quotes. Attributes
- * containing quotes but no apostrophes are serialized in apostrophes
- * (single quotes). Attributes containing both forms of quotes are
- * serialized in quotes, with quotes within the value represented by the
- * predefined entity &quot;. Any character that can not be represented
- * directly in the output character encoding is serialized as a numeric
- * character reference.
- * <p> Within markup, but outside of attributes, any occurrence of a character
- * that cannot be represented in the output character encoding is reported
- * as an error. An example would be serializing the element
- * <LaCa�ada/> with the encoding="us-ascii".
- * <p> When requested by setting the <code>normalize-characters</code> feature
- * on <code>DOMWriterImpl</code>, all data to be serialized, both markup and
- * character data, is W3C Text normalized according to the rules defined in
- * . The W3C Text normalization process affects only the data as it is being
- * written; it does not alter the DOM's view of the document after
- * serialization has completed.
- * <p>Namespaces are fixed up during serialization, the serialization process
- * will verify that namespace declarations, namespace prefixes and the
- * namespace URIs associated with Elements and Attributes are consistent. If
- * inconsistencies are found, the serialized form of the document will be
- * altered to remove them. The algorithm used for doing the namespace fixup
- * while seralizing a document is a combination of the algorithms used for
- * lookupNamespaceURI and lookupNamespacePrefix . previous paragraph to be
- * defined closer here.
- * <p>Any changes made affect only the namespace prefixes and declarations
- * appearing in the serialized data. The DOM's view of the document is not
- * altered by the serialization operation, and does not reflect any changes
- * made to namespace declarations or prefixes in the serialized output.
- * <p> While serializing a document the serializer will write out
- * non-specified values (such as attributes whose <code>specified</code> is
- * <code>false</code>) if the <code>output-default-values</code> feature is
- * set to <code>true</code>. If the <code>output-default-values</code> flag
- * is set to <code>false</code> and the <code>use-abstract-schema</code>
- * feature is set to <code>true</code> the abstract schema will be used to
- * determine if a value is specified or not, if
- * <code>use-abstract-schema</code> is not set the <code>specified</code>
- * flag on attribute nodes is used to determine if attribute values should
- * be written out.
- * <p> Ref to Core spec (1.1.9, XML namespaces, 5th paragraph) entity ref
- * description about warning about unbound entity refs. Entity refs are
- * always serialized as &foo;, also mention this in the load part of
- * this spec.
- * <p> When serializing a document the DOMWriterImpl checks to see if the document
- * element in the document is a DOM Level 1 element or a DOM Level 2 (or
- * higher) element (this check is done by looking at the localName of the
- * root element). If the root element is a DOM Level 1 element then the
- * DOMWriterImpl will issue an error if a DOM Level 2 (or higher) element is
- * found while serializing. Likewise if the document element is a DOM Level
- * 2 (or higher) element and the DOMWriterImpl sees a DOM Level 1 element an
- * error is issued. Mixing DOM Level 1 elements with DOM Level 2 (or higher)
- * is not supported.
- * <p> <code>DOMWriterImpl</code>s have a number of named features that can be
- * queried or set. The name of <code>DOMWriterImpl</code> features must be valid
- * XML names. Implementation specific features (extensions) should choose an
- * implementation dependent prefix to avoid name collisions.
- * <p>Here is a list of properties that must be recognized by all
- * implementations.
- * <dl>
- * <dt><code>"normalize-characters"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[
- * optional] (default) Perform the W3C Text Normalization of the characters
- * in document as they are written out. Only the characters being written
- * are (potentially) altered. The DOM document itself is unchanged. </dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[required] do not perform character normalization. </dd>
- * </dl></dd>
- * <dt>
- * <code>"split-cdata-sections"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[required] (default)
- * Split CDATA sections containing the CDATA section termination marker
- * ']]>' or characters that can not be represented in the output
- * encoding, and output the characters using numeric character references.
- * If a CDATA section is split a warning is issued. </dd>
- * <dt><code>false</code></dt>
- * <dd>[
- * required] Signal an error if a <code>CDATASection</code> contains an
- * unrepresentable character. </dd>
- * </dl></dd>
- * <dt><code>"validation"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[
- * optional] Use the abstract schema to validate the document as it is being
- * serialized. If validation errors are found the error handler is notified
- * about the error. Setting this state will also set the feature
- * <code>use-abstract-schema</code> to <code>true</code>. </dd>
- * <dt><code>false</code></dt>
- * <dd>[
- * required] (default) Don't validate the document as it is being
- * serialized. </dd>
- * </dl></dd>
- * <dt><code>"expand-entity-references"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[
- * optional] Expand <code>EntityReference</code> nodes when serializing. </dd>
- * <dt>
- * <code>false</code></dt>
- * <dd>[required] (default) Serialize all
- * <code>EntityReference</code> nodes as XML entity references. </dd>
- * </dl></dd>
- * <dt>
- * <code>"whitespace-in-element-content"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[required] (
- * default) Output all white spaces in the document. </dd>
- * <dt><code>false</code></dt>
- * <dd>[
- * optional] Only output white space that is not within element content. The
- * implementation is expected to use the
- * <code>isWhitespaceInElementContent</code> flag on <code>Text</code> nodes
- * to determine if a text node should be written out or not. </dd>
- * </dl></dd>
- * <dt>
- * <code>"discard-default-content"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[required] (default
- * ) Use whatever information available to the implementation (i.e. XML
- * schema, DTD, the <code>specified</code> flag on <code>Attr</code> nodes,
- * and so on) to decide what attributes and content should be serialized or
- * not. Note that the <code>specified</code> flag on <code>Attr</code> nodes
- * in itself is not always reliable, it is only reliable when it is set to
- * <code>false</code> since the only case where it can be set to
- * <code>false</code> is if the attribute was created by a Level 1
- * implementation. </dd>
- * <dt><code>false</code></dt>
- * <dd>[required] Output all attributes and
- * all content. </dd>
- * </dl></dd>
- * <dt><code>"format-canonical"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[optional]
- * This formatting writes the document according to the rules specified in .
- * Setting this feature to true will set the feature "format-pretty-print"
- * to false. </dd>
- * <dt><code>false</code></dt>
- * <dd>[required] (default) Don't canonicalize the
- * output. </dd>
- * </dl></dd>
- * <dt><code>"format-pretty-print"</code></dt>
- * <dd>
- * <dl>
- * <dt><code>true</code></dt>
- * <dd>[optional]
- * Formatting the output by adding whitespace to produce a pretty-printed,
- * indented, human-readable form. The exact form of the transformations is
- * not specified by this specification. Setting this feature to true will
- * set the feature "format-canonical" to false. </dd>
- * <dt><code>false</code></dt>
- * <dd>[required]
- * (default) Don't pretty-print the result. </dd>
- * </dl></dd>
- * </dl>
- * <p>See also the <a href='http://www.w3.org/TR/2001/WD-DOM-Level-3-ASLS-20011025'>Document Object Model (DOM) Level 3 Abstract Schemas and Load
- * and Save Specification</a>.
- */
-
-#ifndef DOMWriterImpl_HEADER_GUARD_
-#define DOMWriterImpl_HEADER_GUARD_
-
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
-#include <xercesc/util/XMLDOMMsg.hpp>
-#include <xercesc/util/RefHashTableOf.hpp>
-#include <xercesc/util/RefVectorOf.hpp>
-
-XERCES_CPP_NAMESPACE_BEGIN
-
-
-class CDOM_EXPORT DOMWriterImpl:public XMemory,
- public DOMWriter {
-
-public:
-
- /** @name Constructor and Destructor */
- //@{
-
- /**
- * Constructor.
- */
- DOMWriterImpl(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
-
- /**
- * Destructor.
- */
- ~DOMWriterImpl();
- //@}
-
- /** @name Inplementation of Abstract interface */
-
- virtual bool canSetFeature(const XMLCh* const featName
- , bool state) const;
-
- virtual void setFeature(const XMLCh* const featName
- , bool state);
- virtual bool getFeature(const XMLCh* const featName) const;
-
- virtual void setEncoding(const XMLCh* const encoding);
- virtual const XMLCh* getEncoding() const;
-
- virtual void setNewLine(const XMLCh* const newLine);
- virtual const XMLCh* getNewLine() const;
-
- virtual void setErrorHandler(DOMErrorHandler *errorHandler);
- virtual DOMErrorHandler* getErrorHandler() const;
-
- virtual void setFilter(DOMWriterFilter *filter);
- virtual DOMWriterFilter* getFilter() const;
-
- virtual bool writeNode(XMLFormatTarget* const destination
- , const DOMNode &nodeToWrite);
- virtual void release();
-
- /**
- * The caller is responsible for the release of the returned string
- */
-
- virtual XMLCh* writeToString(const DOMNode &nodeToWrite);
- //@}
-
-private:
-
- /** unimplemented copy ctor and assignment operator */
- DOMWriterImpl(const DOMWriterImpl&);
- DOMWriterImpl & operator = (const DOMWriterImpl&);
-
- /** helper **/
- void initSession(const DOMNode* const);
- void processNode(const DOMNode* const);
-
- void procCdataSection(const XMLCh* const nodeValue
- , const DOMNode* const nodeToWrite
- , int level);
-
- void procUnrepCharInCdataSection(const XMLCh* const nodeValue
- , const DOMNode* const nodeToWrite
- , int level);
-
-protected:
- /**
- * Overidden by derived classes to extend the abilities of the standard writer
- * always returns false in the default implementation
- * @return true if the method deals with nodeToWrite
- */
- virtual bool customNodeSerialize(const DOMNode* const nodeToWrite, int level);
-
- DOMNodeFilter::FilterAction checkFilter(const DOMNode* const) const;
-
- bool checkFeature(const XMLCh* const featName
- , bool state
- , int& featureId) const;
-
- bool reportError(const DOMNode* const errorNode
- , DOMError::ErrorSeverity errorType
- , const XMLCh* const errorMsg);
- bool reportError(const DOMNode* const errorNode
- , DOMError::ErrorSeverity errorType
- , XMLDOMMsg::Codes toEmit);
-
- bool canSetFeature(const int featureId
- , bool val) const;
- void setFeature(const int featureId
- , bool val);
- bool getFeature(const int featureId) const;
-
- void printNewLine();
- void setURCharRef();
-
-
- void printIndent(int level) const;
- //does the actual work for processNode while keeping track of the level
- void processNode(const DOMNode* const nodeToWrite, int level);
-
- void processBOM();
-
- // -----------------------------------------------------------------------
- // Private data members
- //
- // fFeatures
- //
- // fEncoding
- // own it
- //
- // fNewLine
- // own it
- //
- // fErrorHandler
- // don't own it
- //
- // fFilter
- // don't own it
- //
- // fDocumentVersion
- // The XML Version of the document to be serialized.
- //
- // fEncodingUsed (session var)
- // the actual encoding used in WriteNode(),
- // it does not own any data(memory).
- //
- // fNewLineUsed (session var)
- // the actual "end of line" sequence used in WriteNode(),
- // it does not own any data(memory).
- //
- // fFormatter (session var)
- // the formatter used in WriteNode()
- //
- // fErrorCount
- // the count of error encountered in the serialization,
- // which neither the error handler, nor the serializer itself,
- // treat as fatal. And the serializer will return true/false
- // based on this value.
- //
- // fCurrentLine
- // the current line. Used to track the line number the current
- // node begins on
- //
- // -----------------------------------------------------------------------
-
- int fFeatures;
- XMLCh *fEncoding;
- XMLCh *fNewLine;
- DOMErrorHandler *fErrorHandler;
- DOMWriterFilter *fFilter;
- const XMLCh *fDocumentVersion;
-
- //session vars
- const XMLCh *fEncodingUsed;
- const XMLCh *fNewLineUsed;
- XMLFormatter *fFormatter;
- int fErrorCount;
- int fCurrentLine;
-
- RefVectorOf< RefHashTableOf<XMLCh> >* fNamespaceStack;
- MemoryManager* fMemoryManager;
-};
-
-inline void DOMWriterImpl::setFeature(const int featureId
- , bool val)
-{
- (val)? fFeatures |= (1<<featureId) : fFeatures &= ~(1<<featureId);
-};
-
-inline bool DOMWriterImpl::getFeature(const int featureId) const
-{
- return ((fFeatures & ( 1<<featureId )) != 0) ? true : false;
-};
-
-inline void DOMWriterImpl::setURCharRef()
-{
- fFormatter->setUnRepFlags(XMLFormatter::UnRep_CharRef);
-}
-
-XERCES_CPP_NAMESPACE_END
-
-#endif
diff --git a/src/xercesc/framework/LocalFileFormatTarget.cpp b/src/xercesc/framework/LocalFileFormatTarget.cpp
index 740ef3627..4a47a57d0 100644
--- a/src/xercesc/framework/LocalFileFormatTarget.cpp
+++ b/src/xercesc/framework/LocalFileFormatTarget.cpp
@@ -114,7 +114,7 @@ void LocalFileFormatTarget::writeChars(const XMLByte* const toWrite
void LocalFileFormatTarget::flushBuffer()
{
// Exception thrown in writeBufferToFile, if any, will be propagated to
- // the XMLFormatter and then to the DOMWriter, which may notify
+ // the XMLFormatter and then to the DOMLSSerializer, which may notify
// application through DOMErrorHandler, if any.
XMLPlatformUtils::writeBufferToFile(fSource, (long) fIndex, fDataBuf, fMemoryManager);
fIndex = 0;
diff --git a/src/xercesc/framework/MemBufFormatTarget.hpp b/src/xercesc/framework/MemBufFormatTarget.hpp
index 20f1f0d3c..89b65a01c 100644
--- a/src/xercesc/framework/MemBufFormatTarget.hpp
+++ b/src/xercesc/framework/MemBufFormatTarget.hpp
@@ -27,7 +27,7 @@ XERCES_CPP_NAMESPACE_BEGIN
/*
* The MemBufFormatTarget is a derivative from XMLFormatTarget, which user code
- * may plug into DOMWriter to retrieve the serialized XML stream (from DOM Tree)
+ * may plug into DOMLSSerializer to retrieve the serialized XML stream (from DOM Tree)
* in a memory buffer.
*
* The MemBufFormatTarget is initalized to have a memory buffer of 1023 upon
diff --git a/src/xercesc/framework/Wrapper4DOMInputSource.cpp b/src/xercesc/framework/Wrapper4DOMLSInput.cpp
similarity index 69%
rename from src/xercesc/framework/Wrapper4DOMInputSource.cpp
rename to src/xercesc/framework/Wrapper4DOMLSInput.cpp
index 3fab23906..3353ca817 100644
--- a/src/xercesc/framework/Wrapper4DOMInputSource.cpp
+++ b/src/xercesc/framework/Wrapper4DOMLSInput.cpp
@@ -22,16 +22,16 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/framework/Wrapper4DOMInputSource.hpp>
-#include <xercesc/dom/DOMInputSource.hpp>
+#include <xercesc/framework/Wrapper4DOMLSInput.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
#include <xercesc/util/NullPointerException.hpp>
XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
-// Wrapper4DOMInputSource: Constructor and Destructor
+// Wrapper4DOMLSInput: Constructor and Destructor
// ---------------------------------------------------------------------------
-Wrapper4DOMInputSource::Wrapper4DOMInputSource(DOMInputSource* const inputSource,
+Wrapper4DOMLSInput::Wrapper4DOMLSInput(DOMLSInput* const inputSource,
const bool adoptFlag,
MemoryManager* const manager) :
InputSource(manager)
@@ -42,7 +42,7 @@ Wrapper4DOMInputSource::Wrapper4DOMInputSource(DOMInputSource* const inputSource
ThrowXMLwithMemMgr(NullPointerException, XMLExcepts::CPtr_PointerIsZero, getMemoryManager());
}
-Wrapper4DOMInputSource::~Wrapper4DOMInputSource()
+Wrapper4DOMLSInput::~Wrapper4DOMLSInput()
{
if (fAdoptInputSource)
delete fInputSource;
@@ -50,62 +50,62 @@ Wrapper4DOMInputSource::~Wrapper4DOMInputSource()
// ---------------------------------------------------------------------------
-// Wrapper4DOMInputSource: Getter methods
+// Wrapper4DOMLSInput: Getter methods
// ---------------------------------------------------------------------------
-bool Wrapper4DOMInputSource::getIssueFatalErrorIfNotFound() const
+bool Wrapper4DOMLSInput::getIssueFatalErrorIfNotFound() const
{
return fInputSource->getIssueFatalErrorIfNotFound();
}
-const XMLCh* Wrapper4DOMInputSource::getEncoding() const
+const XMLCh* Wrapper4DOMLSInput::getEncoding() const
{
return fInputSource->getEncoding();
}
-const XMLCh* Wrapper4DOMInputSource::getSystemId() const
+const XMLCh* Wrapper4DOMLSInput::getSystemId() const
{
return fInputSource->getSystemId();
}
-const XMLCh* Wrapper4DOMInputSource::getPublicId() const
+const XMLCh* Wrapper4DOMLSInput::getPublicId() const
{
return fInputSource->getPublicId();
}
// ---------------------------------------------------------------------------
-// Wrapper4DOMInputSource: Setter methods
+// Wrapper4DOMLSInput: Setter methods
// ---------------------------------------------------------------------------
-void Wrapper4DOMInputSource::setIssueFatalErrorIfNotFound(const bool flag)
+void Wrapper4DOMLSInput::setIssueFatalErrorIfNotFound(const bool flag)
{
fInputSource->setIssueFatalErrorIfNotFound(flag);
}
-void Wrapper4DOMInputSource::setEncoding(const XMLCh* const encodingStr)
+void Wrapper4DOMLSInput::setEncoding(const XMLCh* const encodingStr)
{
fInputSource->setEncoding(encodingStr);
}
-void Wrapper4DOMInputSource::setPublicId(const XMLCh* const publicId)
+void Wrapper4DOMLSInput::setPublicId(const XMLCh* const publicId)
{
fInputSource->setPublicId(publicId);
}
-void Wrapper4DOMInputSource::setSystemId(const XMLCh* const systemId)
+void Wrapper4DOMLSInput::setSystemId(const XMLCh* const systemId)
{
fInputSource->setSystemId(systemId);
}
// ---------------------------------------------------------------------------
-// Wrapper4DOMInputSource: Stream methods
+// Wrapper4DOMLSInput: Stream methods
// ---------------------------------------------------------------------------
-BinInputStream* Wrapper4DOMInputSource::makeStream() const
+BinInputStream* Wrapper4DOMLSInput::makeStream() const
{
- return fInputSource->makeStream();
+ return fInputSource->getByteStream();
}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/Wrapper4DOMInputSource.hpp b/src/xercesc/framework/Wrapper4DOMLSInput.hpp
similarity index 84%
rename from src/xercesc/framework/Wrapper4DOMInputSource.hpp
rename to src/xercesc/framework/Wrapper4DOMLSInput.hpp
index db344626d..68fc459a2 100644
--- a/src/xercesc/framework/Wrapper4DOMInputSource.hpp
+++ b/src/xercesc/framework/Wrapper4DOMLSInput.hpp
@@ -26,13 +26,13 @@
XERCES_CPP_NAMESPACE_BEGIN
-class DOMInputSource;
+class DOMLSInput;
/**
- * Wrap a DOMInputSource object to a SAX InputSource.
+ * Wrap a DOMLSInput object to a SAX InputSource.
*/
-class XMLPARSER_EXPORT Wrapper4DOMInputSource: public InputSource
+class XMLPARSER_EXPORT Wrapper4DOMLSInput: public InputSource
{
public:
/** @name Constructors and Destructor */
@@ -41,18 +41,18 @@ public:
/**
* Constructor
*
- * Wrap a DOMInputSource and pretend it to be a SAX InputSource.
- * By default, the wrapper will adopt the DOMInputSource that is wrapped.
+ * Wrap a DOMLSInput and pretend it to be a SAX InputSource.
+ * By default, the wrapper will adopt the DOMLSInput that is wrapped.
*
- * @param inputSource The DOMInputSource to be wrapped
+ * @param inputSource The DOMLSInput to be wrapped
* @param adoptFlag Indicates if the wrapper should adopt the wrapped
- * DOMInputSource. Default is true.
+ * DOMLSInput. Default is true.
* @param manager Pointer to the memory manager to be used to
* allocate objects.
*/
- Wrapper4DOMInputSource
+ Wrapper4DOMLSInput
(
- DOMInputSource* const inputSource
+ DOMLSInput* const inputSource
, const bool adoptFlag = true
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -61,7 +61,7 @@ public:
* Destructor
*
*/
- virtual ~Wrapper4DOMInputSource();
+ virtual ~Wrapper4DOMLSInput();
//@}
@@ -69,7 +69,6 @@ public:
/** @name Virtual input source interface */
//@{
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Makes the byte stream for this input source.
*
@@ -86,7 +85,6 @@ public:
/** @name Getter methods */
//@{
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* An input source can be set to force the parser to assume a particular
* encoding for the data that input source reprsents, via the setEncoding()
@@ -101,7 +99,6 @@ public:
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Get the public identifier for this input source. Delegated to the
* wrapped input source object.
@@ -113,7 +110,6 @@ public:
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Get the system identifier for this input source. Delegated to the
* wrapped input source object.
@@ -125,8 +121,7 @@ public:
*/
const XMLCh* getSystemId() const;
- /**
- * <p><b>"Experimental - subject to change"</b></p>
+ /**
*
* Get the flag that indicates if the parser should issue fatal error if
* this input source is not found. Delegated to the wrapped input source
@@ -147,7 +142,6 @@ public:
//@{
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Set the encoding which will be required for use with the XML text read
* via a stream opened by this input source. This will update the wrapped
@@ -164,7 +158,6 @@ public:
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Set the public identifier for this input source. This will update the
* wrapped input source object.
@@ -180,7 +173,6 @@ public:
void setPublicId(const XMLCh* const publicId);
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Set the system identifier for this input source. This will update the
* wrapped input source object.
@@ -199,7 +191,6 @@ public:
void setSystemId(const XMLCh* const systemId);
/**
- * <p><b>"Experimental - subject to change"</b></p>
*
* Indicates if the parser should issue fatal error if this input source
* is not found. If set to false, the parser issue warning message instead.
@@ -219,14 +210,14 @@ private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
- Wrapper4DOMInputSource(const Wrapper4DOMInputSource&);
- Wrapper4DOMInputSource& operator=(const Wrapper4DOMInputSource&);
+ Wrapper4DOMLSInput(const Wrapper4DOMLSInput&);
+ Wrapper4DOMLSInput& operator=(const Wrapper4DOMLSInput&);
// -----------------------------------------------------------------------
// Private data members
// -----------------------------------------------------------------------
bool fAdoptInputSource;
- DOMInputSource* fInputSource;
+ DOMLSInput* fInputSource;
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/Wrapper4InputSource.cpp b/src/xercesc/framework/Wrapper4InputSource.cpp
index 23d85c806..9a0302aef 100644
--- a/src/xercesc/framework/Wrapper4InputSource.cpp
+++ b/src/xercesc/framework/Wrapper4InputSource.cpp
@@ -102,7 +102,7 @@ void Wrapper4InputSource::setSystemId(const XMLCh* const systemId)
// ---------------------------------------------------------------------------
// Wrapper4InputSource: Stream methods
// ---------------------------------------------------------------------------
-BinInputStream* Wrapper4InputSource::makeStream() const
+BinInputStream* Wrapper4InputSource::getByteStream() const
{
return fInputSource->makeStream();
}
diff --git a/src/xercesc/framework/Wrapper4InputSource.hpp b/src/xercesc/framework/Wrapper4InputSource.hpp
index 8c347f135..7c0498ba8 100644
--- a/src/xercesc/framework/Wrapper4InputSource.hpp
+++ b/src/xercesc/framework/Wrapper4InputSource.hpp
@@ -22,7 +22,7 @@
#ifndef WRAPPER4INPUTSOURCE_HPP
#define WRAPPER4INPUTSOURCE_HPP
-#include <xercesc/dom/DOMInputSource.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
#include <xercesc/util/PlatformUtils.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -31,9 +31,9 @@ class InputSource;
/**
- * Wrap a SAX InputSource object to a DOM InputSource.
+ * Wrap a SAX InputSource object to a DOMLSInput.
*/
-class XMLPARSER_EXPORT Wrapper4InputSource: public DOMInputSource
+class XMLPARSER_EXPORT Wrapper4InputSource: public DOMLSInput
{
public:
/** @name Constructors and Destructor */
@@ -66,8 +66,6 @@ public:
/** @name Virtual input source interface */
//@{
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
* Makes the byte stream for this input source.
*
* <p>The function will call the makeStream of the wrapped input source.
@@ -75,7 +73,7 @@ public:
*
* @see BinInputStream
*/
- BinInputStream* makeStream() const;
+ BinInputStream* getByteStream() const;
//@}
diff --git a/src/xercesc/parsers/AbstractDOMParser.hpp b/src/xercesc/parsers/AbstractDOMParser.hpp
index 4d10455fa..4d44d511c 100644
--- a/src/xercesc/parsers/AbstractDOMParser.hpp
+++ b/src/xercesc/parsers/AbstractDOMParser.hpp
@@ -47,7 +47,7 @@ class PSVIHandler;
/**
* This class implements the Document Object Model (DOM) interface.
- * It is used as a base for DOM parsers (i.e. XercesDOMParser, DOMBuilder).
+ * It is used as a base for DOM parsers (i.e. XercesDOMParser, DOMLSParser).
*/
class PARSERS_EXPORT AbstractDOMParser :
diff --git a/src/xercesc/parsers/DOMBuilderImpl.cpp b/src/xercesc/parsers/DOMLSParserImpl.cpp
similarity index 60%
rename from src/xercesc/parsers/DOMBuilderImpl.cpp
rename to src/xercesc/parsers/DOMLSParserImpl.cpp
index bae594b74..b1c56bc93 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.cpp
+++ b/src/xercesc/parsers/DOMLSParserImpl.cpp
@@ -28,16 +28,17 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/parsers/DOMBuilderImpl.hpp>
+#include <xercesc/parsers/DOMLSParserImpl.hpp>
#include <xercesc/util/IOException.hpp>
#include <xercesc/dom/DOMEntityResolver.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/dom/impl/DOMErrorImpl.hpp>
#include <xercesc/dom/impl/DOMLocatorImpl.hpp>
+#include <xercesc/dom/impl/DOMConfigurationImpl.hpp>
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/sax/SAXParseException.hpp>
#include <xercesc/internal/XMLScanner.hpp>
-#include <xercesc/framework/Wrapper4DOMInputSource.hpp>
+#include <xercesc/framework/Wrapper4DOMLSInput.hpp>
#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/framework/XMLSchemaDescription.hpp>
#include <xercesc/util/Janitor.hpp>
@@ -50,9 +51,9 @@ XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Constructors and Destructor
+// DOMLSParserImpl: Constructors and Destructor
// ---------------------------------------------------------------------------
-DOMBuilderImpl::DOMBuilderImpl( XMLValidator* const valToAdopt
+DOMLSParserImpl::DOMLSParserImpl( XMLValidator* const valToAdopt
, MemoryManager* const manager
, XMLGrammarPool* const gramPool) :
@@ -71,80 +72,117 @@ AbstractDOMParser(valToAdopt, manager, gramPool)
}
-DOMBuilderImpl::~DOMBuilderImpl()
+DOMLSParserImpl::~DOMLSParserImpl()
{
}
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Setter methods
+// DOMLSParserImpl: Setter methods
// ---------------------------------------------------------------------------
-void DOMBuilderImpl::setErrorHandler(DOMErrorHandler* const handler)
+bool DOMLSParserImpl::getBusy() const
{
- fErrorHandler = handler;
- if (fErrorHandler) {
- getScanner()->setErrorReporter(this);
- }
- else {
- getScanner()->setErrorReporter(0);
- }
+ return fParseInProgress;
}
-void DOMBuilderImpl::setEntityResolver(DOMEntityResolver* const handler)
+// ---------------------------------------------------------------------------
+// DOMLSParserImpl: Setter methods
+// ---------------------------------------------------------------------------
+void DOMLSParserImpl::setFilter(DOMLSParserFilter* const)
{
- fEntityResolver = handler;
- if (fEntityResolver) {
- getScanner()->setEntityHandler(this);
- fXMLEntityResolver = 0;
- }
- else {
- getScanner()->setEntityHandler(0);
- }
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
}
-void DOMBuilderImpl::setXMLEntityResolver(XMLEntityResolver* const handler)
+// ---------------------------------------------------------------------------
+// DOMLSParserImpl: DOMConfiguration methods
+// ---------------------------------------------------------------------------
+void DOMLSParserImpl::setParameter(const XMLCh* name, const void* value)
{
- fXMLEntityResolver = handler;
- if (fXMLEntityResolver) {
- getScanner()->setEntityHandler(this);
- fEntityResolver = 0;
+ if (XMLString::compareIStringASCII(name, XMLUni::fgDOMResourceResolver) == 0)
+ {
+ fEntityResolver = (DOMEntityResolver*)value;
+ if (fEntityResolver) {
+ getScanner()->setEntityHandler(this);
+ fXMLEntityResolver = 0;
+ }
+ else {
+ getScanner()->setEntityHandler(0);
+ }
}
- else {
- getScanner()->setEntityHandler(0);
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMErrorHandler) == 0)
+ {
+ fErrorHandler = (DOMErrorHandler*)value;
+ if (fErrorHandler) {
+ getScanner()->setErrorReporter(this);
+ }
+ else {
+ getScanner()->setErrorReporter(0);
+ }
}
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesEntityResolver) == 0)
+ {
+ fXMLEntityResolver = (XMLEntityResolver*)value;
+ if (fXMLEntityResolver) {
+ getScanner()->setEntityHandler(this);
+ fEntityResolver = 0;
+ }
+ else {
+ getScanner()->setEntityHandler(0);
+ }
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalSchemaLocation) == 0)
+ {
+ setExternalSchemaLocation((XMLCh*)value);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
+ {
+ setExternalNoNamespaceSchemaLocation((XMLCh*)value);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSecurityManager) == 0)
+ {
+ setSecurityManager((SecurityManager*)value);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesScannerName))
+ {
+ AbstractDOMParser::useScanner((const XMLCh*) value);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesParserUseDocumentFromImplementation))
+ {
+ useImplementation((const XMLCh*) value);
+ }
+ else
+ throw DOMException(DOMException::NOT_FOUND_ERR, 0, getMemoryManager());
}
-void DOMBuilderImpl::setFilter(DOMBuilderFilter* const)
-{
- throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
-}
-
-
-// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Feature methods
-// ---------------------------------------------------------------------------
-void DOMBuilderImpl::setFeature(const XMLCh* const name, const bool state)
+void DOMLSParserImpl::setParameter(const XMLCh* name, bool state)
{
- if (XMLString::compareIStringASCII(name, XMLUni::fgDOMEntities) == 0) {
- setCreateEntityReferenceNodes(state);
+ if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0)
+ {
+ // in fact, setting this has no effect to the parser
+ fCharsetOverridesXMLEncoding = state;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMComments) == 0) {
- setCreateCommentNodes(state);
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMDisallowDoctype) == 0)
+ {
+ // TODO
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMDatatypeNormalization) == 0) {
- getScanner()->setNormalizeData(state);
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMIgnoreUnknownCharacterDenormalization) == 0)
+ {
+ // TODO
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaces) == 0) {
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaces) == 0)
+ {
setDoNamespaces(state);
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMWhitespaceInElementContent) == 0) {
- setIncludeIgnorableWhitespace(state);
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSupportedMediatypesOnly) == 0)
+ {
+ if (state)
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidation) == 0) {
-
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0)
+ {
fValidation = state;
- if (state) {
+ if (fValidation) {
if (getValidationScheme() == AbstractDOMParser::Val_Never)
setValidationScheme(AbstractDOMParser::Val_Always);
}
@@ -152,29 +190,73 @@ void DOMBuilderImpl::setFeature(const XMLCh* const name, const bool state)
setValidationScheme(AbstractDOMParser::Val_Never);
}
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0) {
-
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0)
+ {
fAutoValidation = state;
- if (state) {
+ if (fAutoValidation) {
setValidationScheme(AbstractDOMParser::Val_Auto);
}
else {
setValidationScheme(AbstractDOMParser::Val_Never);
}
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0) {
- // in fact, setting this has no effect to the parser
- fCharsetOverridesXMLEncoding = state;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMWellFormed) == 0)
+ {
+ if(state==false)
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSupportedMediatypesOnly) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm) == 0 ) {
- if (state)
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm) == 0 )
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections) == 0 )
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCheckCharacterNormalization) == 0 )
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMComments) == 0)
+ {
+ setCreateCommentNodes(state);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMDatatypeNormalization) == 0)
+ {
+ getScanner()->setNormalizeData(state);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMElementContentWhitespace) == 0)
+ {
+ setIncludeIgnorableWhitespace(state);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMEntities) == 0)
+ {
+ setCreateEntityReferenceNodes(state);
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaceDeclarations) == 0)
+ {
+ if (state==false)
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaceDeclarations) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections) == 0 ) {
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNormalizeCharacters) == 0)
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaLocation) == 0)
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaType) == 0)
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSplitCDATASections) == 0)
+ {
+ // TODO
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0)
+ {
if (!state)
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
}
@@ -193,12 +275,10 @@ void DOMBuilderImpl::setFeature(const XMLCh* const name, const bool state)
else
fUserAdoptsDocument = false;
}
-
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesLoadExternalDTD) == 0)
{
setLoadExternalDTD(state);
}
-
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesContinueAfterFatalError) == 0)
{
setExitOnFirstFatalError(!state);
@@ -259,239 +339,241 @@ void DOMBuilderImpl::setFeature(const XMLCh* const name, const bool state)
{
getScanner()->setSkipDTDValidation(state);
}
- else {
+ else
throw DOMException(DOMException::NOT_FOUND_ERR, 0, getMemoryManager());
- }
}
-bool DOMBuilderImpl::getFeature(const XMLCh* const name) const
+const void* DOMLSParserImpl::getParameter(const XMLCh* name) const
{
- if (XMLString::compareIStringASCII(name, XMLUni::fgDOMEntities) == 0) {
- return getCreateEntityReferenceNodes();
+ if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0)
+ {
+ return (void*)fCharsetOverridesXMLEncoding;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMComments) == 0) {
- return getCreateCommentNodes();
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMDisallowDoctype) == 0)
+ {
+ // TODO
+ return 0;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMDatatypeNormalization) == 0) {
- return getScanner()->getNormalizeData();
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMIgnoreUnknownCharacterDenormalization) == 0)
+ {
+ // TODO
+ return 0;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaces) == 0) {
- return getDoNamespaces();
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaces) == 0)
+ {
+ return (void*)getDoNamespaces();
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMWhitespaceInElementContent) == 0) {
- return getIncludeIgnorableWhitespace();
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMResourceResolver) == 0)
+ {
+ return fEntityResolver;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidation) == 0) {
- return fValidation;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSupportedMediatypesOnly) == 0)
+ {
+ return (void*)false;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0) {
- return fAutoValidation;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0)
+ {
+ return (void*)fValidation;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0) {
- return fCharsetOverridesXMLEncoding;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0)
+ {
+ return (void*)fAutoValidation;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSupportedMediatypesOnly) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm) == 0 ) {
- return false;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMWellFormed) == 0)
+ {
+ return (void*)true;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaceDeclarations) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections) == 0 ) {
- return true;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm) == 0 )
+ {
+ // TODO
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections) == 0 )
+ {
+ // TODO
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMCheckCharacterNormalization) == 0 )
+ {
+ // TODO
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMComments) == 0)
+ {
+ return (void*)getCreateCommentNodes();
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMDatatypeNormalization) == 0)
+ {
+ return (void*)getScanner()->getNormalizeData();
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMElementContentWhitespace) == 0)
+ {
+ return (void*)getIncludeIgnorableWhitespace();
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMEntities) == 0)
+ {
+ return (void*)getCreateEntityReferenceNodes();
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMErrorHandler) == 0)
+ {
+ return fErrorHandler;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaceDeclarations) == 0)
+ {
+ return (void*)true;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNormalizeCharacters) == 0)
+ {
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaLocation) == 0)
+ {
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSchemaType) == 0)
+ {
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSplitCDATASections) == 0)
+ {
+ return 0;
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0)
+ {
+ return (void*)true;
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchema) == 0)
{
- return getDoSchema();
+ return (void*)getDoSchema();
}
-
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaFullChecking) == 0)
{
- return getValidationSchemaFullChecking();
+ return (void*)getValidationSchemaFullChecking();
}
-
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesIdentityConstraintChecking) == 0)
{
- return getIdentityConstraintChecking();
+ return (void*)getIdentityConstraintChecking();
}
-
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesLoadExternalDTD) == 0)
{
- return getLoadExternalDTD();
+ return (void*)getLoadExternalDTD();
}
-
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesContinueAfterFatalError) == 0)
{
- return !getExitOnFirstFatalError();
+ return (void*)!getExitOnFirstFatalError();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesValidationErrorAsFatal) == 0)
{
- return getValidationConstraintFatal();
+ return (void*)getValidationConstraintFatal();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesCacheGrammarFromParse) == 0)
{
- return getScanner()->isCachingGrammarFromParse();
+ return (void*)getScanner()->isCachingGrammarFromParse();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesUseCachedGrammarInParse) == 0)
{
- return getScanner()->isUsingCachedGrammarInParse();
+ return (void*)getScanner()->isUsingCachedGrammarInParse();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesCalculateSrcOfs) == 0)
{
- return getScanner()->getCalculateSrcOfs();
+ return (void*)getScanner()->getCalculateSrcOfs();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesStandardUriConformant) == 0)
{
- return getScanner()->getStandardUriConformant();
+ return (void*)getScanner()->getStandardUriConformant();
}
- else if(XMLString::compareIStringASCII(name, XMLUni::fgXercesUserAdoptsDOMDocument) == 0) {
- return fUserAdoptsDocument;
+ else if(XMLString::compareIStringASCII(name, XMLUni::fgXercesUserAdoptsDOMDocument) == 0)
+ {
+ return (void*)fUserAdoptsDocument;
}
- else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesDOMHasPSVIInfo) == 0) {
- return getCreateSchemaInfo();
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesDOMHasPSVIInfo) == 0)
+ {
+ return (void*)getCreateSchemaInfo();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesGenerateSyntheticAnnotations) == 0)
{
- return getScanner()->getGenerateSyntheticAnnotations();
+ return (void*)getScanner()->getGenerateSyntheticAnnotations();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesValidateAnnotations) == 0)
{
- return getScanner()->getValidateAnnotations();
+ return (void*)getScanner()->getValidateAnnotations();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesIgnoreCachedDTD) == 0)
{
- return getScanner()->getIgnoreCachedDTD();
+ return (void*)getScanner()->getIgnoreCachedDTD();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesIgnoreAnnotations) == 0)
{
- return getScanner()->getIgnoreAnnotations();
+ return (void*)getScanner()->getIgnoreAnnotations();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesDisableDefaultEntityResolution) == 0)
{
- return getScanner()->getDisableDefaultEntityResolution();
+ return (void*)getScanner()->getDisableDefaultEntityResolution();
}
else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSkipDTDValidation) == 0)
{
- return getScanner()->getSkipDTDValidation();
+ return (void*)getScanner()->getSkipDTDValidation();
}
- else {
- throw DOMException(DOMException::NOT_FOUND_ERR, 0, getMemoryManager());
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesEntityResolver) == 0)
+ {
+ return fXMLEntityResolver;
}
-
- return false;
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalSchemaLocation) == 0)
+ {
+ return getExternalSchemaLocation();
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
+ {
+ return getExternalNoNamespaceSchemaLocation();
+ }
+ else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSecurityManager) == 0)
+ {
+ return getSecurityManager();
+ }
+ else
+ throw DOMException(DOMException::NOT_FOUND_ERR, 0, getMemoryManager());
}
-bool DOMBuilderImpl::canSetFeature(const XMLCh* const name, const bool state) const
+bool DOMLSParserImpl::canSetParameter(const XMLCh* name, const void* value) const
{
- if ((XMLString::compareIStringASCII(name, XMLUni::fgDOMEntities) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMComments) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMDatatypeNormalization) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaces) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidation) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgDOMWhitespaceInElementContent) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesUserAdoptsDOMDocument) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesCalculateSrcOfs) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesStandardUriConformant) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesDOMHasPSVIInfo) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesValidateAnnotations) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesGenerateSyntheticAnnotations) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesIdentityConstraintChecking) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesIgnoreCachedDTD) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesIgnoreAnnotations) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesDisableDefaultEntityResolution) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesSkipDTDValidation) == 0)
- ) {
+ if((XMLString::compareIStringASCII(name, XMLUni::fgDOMCharsetOverridesXMLEncoding) == 0)
+ )
return true;
- }
-
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMSupportedMediatypesOnly) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMInfoset) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCanonicalForm) == 0 ) {
- if (!state)
- return true;
- }
- else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMNamespaceDeclarations) == 0 ||
- XMLString::compareIStringASCII(name, XMLUni::fgDOMCDATASections) == 0 ) {
- if (state)
- return true;
- }
- else if ((XMLString::compareIStringASCII(name, XMLUni::fgXercesSchema) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaFullChecking) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesLoadExternalDTD) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesContinueAfterFatalError) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesValidationErrorAsFatal) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesCacheGrammarFromParse) == 0) ||
- (XMLString::compareIStringASCII(name, XMLUni::fgXercesUseCachedGrammarInParse) == 0)) {
- return true;
- }
+
return false;
}
-
-// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Non standard extension
-// ---------------------------------------------------------------------------
-void DOMBuilderImpl::setProperty(const XMLCh* const name, void* value)
+bool DOMLSParserImpl::canSetParameter(const XMLCh* name, bool value) const
{
- if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalSchemaLocation) == 0)
- {
- setExternalSchemaLocation((XMLCh*)value);
- }
-
- else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
- {
- setExternalNoNamespaceSchemaLocation((XMLCh*)value);
- }
- else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSecurityManager) == 0)
- {
- setSecurityManager((SecurityManager*)value);
- }
- else if (XMLString::equals(name, XMLUni::fgXercesScannerName))
- {
- AbstractDOMParser::useScanner((const XMLCh*) value);
- }
- else if (XMLString::equals(name, XMLUni::fgXercesParserUseDocumentFromImplementation))
- {
- useImplementation((const XMLCh*) value);
- }
-
- else
- throw DOMException(DOMException::NOT_FOUND_ERR, 0, getMemoryManager());
+ return false;
}
-
-void* DOMBuilderImpl::getProperty(const XMLCh* const name) const
+const RefVectorOf<const XMLCh*>* DOMLSParserImpl::getParameterNames() const
{
- if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalSchemaLocation) == 0)
- return (void*)getExternalSchemaLocation();
- else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSchemaExternalNoNameSpaceSchemaLocation) == 0)
- return (void*)getExternalNoNamespaceSchemaLocation();
- else if (XMLString::compareIStringASCII(name, XMLUni::fgXercesSecurityManager) == 0)
- return (void*)getSecurityManager();
- else
- throw DOMException(DOMException::NOT_FOUND_ERR, 0, getMemoryManager());
return 0;
}
-void DOMBuilderImpl::release()
+// ---------------------------------------------------------------------------
+// DOMLSParserImpl: Feature methods
+// ---------------------------------------------------------------------------
+void DOMLSParserImpl::release()
{
- DOMBuilderImpl* builder = (DOMBuilderImpl*) this;
+ DOMLSParserImpl* builder = (DOMLSParserImpl*) this;
delete builder;
}
-void DOMBuilderImpl::resetDocumentPool()
+void DOMLSParserImpl::resetDocumentPool()
{
resetPool();
}
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Parsing methods
+// DOMLSParserImpl: Parsing methods
// ---------------------------------------------------------------------------
-DOMDocument* DOMBuilderImpl::parse(const DOMInputSource& source)
+DOMDocument* DOMLSParserImpl::parse(const DOMLSInput& source)
{
- Wrapper4DOMInputSource isWrapper((DOMInputSource*) &source, false, getMemoryManager());
+ Wrapper4DOMLSInput isWrapper((DOMLSInput*) &source, false, getMemoryManager());
AbstractDOMParser::parse(isWrapper);
if (fUserAdoptsDocument)
@@ -500,7 +582,7 @@ DOMDocument* DOMBuilderImpl::parse(const DOMInputSource& source)
return getDocument();
}
-DOMDocument* DOMBuilderImpl::parseURI(const XMLCh* const systemId)
+DOMDocument* DOMLSParserImpl::parseURI(const XMLCh* const systemId)
{
AbstractDOMParser::parse(systemId);
if (fUserAdoptsDocument)
@@ -509,7 +591,7 @@ DOMDocument* DOMBuilderImpl::parseURI(const XMLCh* const systemId)
return getDocument();
}
-DOMDocument* DOMBuilderImpl::parseURI(const char* const systemId)
+DOMDocument* DOMLSParserImpl::parseURI(const char* const systemId)
{
AbstractDOMParser::parse(systemId);
if (fUserAdoptsDocument)
@@ -518,18 +600,22 @@ DOMDocument* DOMBuilderImpl::parseURI(const char* const systemId)
return getDocument();
}
-void DOMBuilderImpl::parseWithContext(const DOMInputSource&,
- DOMNode* const,
- const short)
+void DOMLSParserImpl::parseWithContext(const DOMLSInput&,
+ DOMNode* ,
+ const unsigned short)
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
}
+void DOMLSParserImpl::abort()
+{
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
+}
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Implementation of the XMLErrorReporter interface
+// DOMLSParserImpl: Implementation of the XMLErrorReporter interface
// ---------------------------------------------------------------------------
-void DOMBuilderImpl::error( const unsigned int code
+void DOMLSParserImpl::error( const unsigned int code
, const XMLCh* const
, const XMLErrorReporter::ErrTypes errType
, const XMLCh* const errorText
@@ -556,16 +642,16 @@ void DOMBuilderImpl::error( const unsigned int code
}
}
-void DOMBuilderImpl::resetErrors()
+void DOMLSParserImpl::resetErrors()
{
}
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Implementation of XMLEntityHandler interface
+// DOMLSParserImpl: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
InputSource*
-DOMBuilderImpl::resolveEntity(const XMLCh* const publicId,
+DOMLSParserImpl::resolveEntity(const XMLCh* const publicId,
const XMLCh* const systemId,
const XMLCh* const baseURI)
{
@@ -575,28 +661,30 @@ DOMBuilderImpl::resolveEntity(const XMLCh* const publicId,
//
if (fEntityResolver) {
- DOMInputSource* is = fEntityResolver->resolveEntity(publicId, systemId, baseURI);
+ DOMLSInput* is = fEntityResolver->resolveEntity(0, 0, publicId, systemId, baseURI);
if (is)
- return new (getMemoryManager()) Wrapper4DOMInputSource(is, true, getMemoryManager());
+ return new (getMemoryManager()) Wrapper4DOMLSInput(is, true, getMemoryManager());
}
return 0;
}
InputSource*
-DOMBuilderImpl::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
+DOMLSParserImpl::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
{
//
// Just map it to the SAX entity resolver. If there is not one installed,
// return a null pointer to cause the default resolution.
//
if (fEntityResolver) {
- DOMInputSource* is = fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
- resourceIdentifier->getSystemId(),
- resourceIdentifier->getBaseURI());
+ DOMLSInput* is = fEntityResolver->resolveEntity(resourceIdentifier->getResourceIdentifierType()==XMLResourceIdentifier::ExternalEntity?XMLUni::fgDOMDTDType:XMLUni::fgDOMXMLSchemaType,
+ resourceIdentifier->getNameSpace(),
+ resourceIdentifier->getPublicId(),
+ resourceIdentifier->getSystemId(),
+ resourceIdentifier->getBaseURI());
if (is)
- return new (getMemoryManager()) Wrapper4DOMInputSource(is, true, getMemoryManager());
+ return new (getMemoryManager()) Wrapper4DOMLSInput(is, true, getMemoryManager());
}
if (fXMLEntityResolver) {
return(fXMLEntityResolver->resolveEntity(resourceIdentifier));
@@ -605,12 +693,12 @@ DOMBuilderImpl::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
return 0;
}
-typedef JanitorMemFunCall<DOMBuilderImpl> ResetParseType;
+typedef JanitorMemFunCall<DOMLSParserImpl> ResetParseType;
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Grammar preparsing methods
+// DOMLSParserImpl: Grammar preparsing methods
// ---------------------------------------------------------------------------
-Grammar* DOMBuilderImpl::loadGrammar(const char* const systemId,
+Grammar* DOMLSParserImpl::loadGrammar(const char* const systemId,
const short grammarType,
const bool toCache)
{
@@ -618,7 +706,7 @@ Grammar* DOMBuilderImpl::loadGrammar(const char* const systemId,
if (getParseInProgress())
ThrowXMLwithMemMgr(IOException, XMLExcepts::Gen_ParseInProgress, fMemoryManager);
- ResetParseType resetParse(this, &DOMBuilderImpl::resetParse);
+ ResetParseType resetParse(this, &DOMLSParserImpl::resetParse);
Grammar* grammar = 0;
@@ -644,7 +732,7 @@ Grammar* DOMBuilderImpl::loadGrammar(const char* const systemId,
return grammar;
}
-Grammar* DOMBuilderImpl::loadGrammar(const XMLCh* const systemId,
+Grammar* DOMLSParserImpl::loadGrammar(const XMLCh* const systemId,
const short grammarType,
const bool toCache)
{
@@ -652,7 +740,7 @@ Grammar* DOMBuilderImpl::loadGrammar(const XMLCh* const systemId,
if (getParseInProgress())
ThrowXMLwithMemMgr(IOException, XMLExcepts::Gen_ParseInProgress, fMemoryManager);
- ResetParseType resetParse(this, &DOMBuilderImpl::resetParse);
+ ResetParseType resetParse(this, &DOMLSParserImpl::resetParse);
Grammar* grammar = 0;
@@ -678,7 +766,7 @@ Grammar* DOMBuilderImpl::loadGrammar(const XMLCh* const systemId,
return grammar;
}
-Grammar* DOMBuilderImpl::loadGrammar(const DOMInputSource& source,
+Grammar* DOMLSParserImpl::loadGrammar(const DOMLSInput& source,
const short grammarType,
const bool toCache)
{
@@ -686,13 +774,13 @@ Grammar* DOMBuilderImpl::loadGrammar(const DOMInputSource& source,
if (getParseInProgress())
ThrowXMLwithMemMgr(IOException, XMLExcepts::Gen_ParseInProgress, fMemoryManager);
- ResetParseType resetParse(this, &DOMBuilderImpl::resetParse);
+ ResetParseType resetParse(this, &DOMLSParserImpl::resetParse);
Grammar* grammar = 0;
try
{
- Wrapper4DOMInputSource isWrapper((DOMInputSource*) &source, false, getMemoryManager());
+ Wrapper4DOMLSInput isWrapper((DOMLSInput*) &source, false, getMemoryManager());
setParseInProgress(true);
if (grammarType == Grammar::DTDGrammarType)
@@ -714,12 +802,12 @@ Grammar* DOMBuilderImpl::loadGrammar(const DOMInputSource& source,
return grammar;
}
-void DOMBuilderImpl::resetCachedGrammarPool()
+void DOMLSParserImpl::resetCachedGrammarPool()
{
getGrammarResolver()->resetCachedGrammar();
}
-void DOMBuilderImpl::resetParse()
+void DOMLSParserImpl::resetParse()
{
if (getScanner()->getDocTypeHandler() == 0)
{
@@ -729,22 +817,22 @@ void DOMBuilderImpl::resetParse()
setParseInProgress(false);
}
-Grammar* DOMBuilderImpl::getGrammar(const XMLCh* const nameSpaceKey) const
+Grammar* DOMLSParserImpl::getGrammar(const XMLCh* const nameSpaceKey) const
{
return getGrammarResolver()->getGrammar(nameSpaceKey);
}
-Grammar* DOMBuilderImpl::getRootGrammar() const
+Grammar* DOMLSParserImpl::getRootGrammar() const
{
return getScanner()->getRootGrammar();
}
-const XMLCh* DOMBuilderImpl::getURIText(unsigned int uriId) const
+const XMLCh* DOMLSParserImpl::getURIText(unsigned int uriId) const
{
return getScanner()->getURIText(uriId);
}
-unsigned int DOMBuilderImpl::getSrcOffset() const
+unsigned int DOMLSParserImpl::getSrcOffset() const
{
return getScanner()->getSrcOffset();
}
diff --git a/src/xercesc/parsers/DOMBuilderImpl.hpp b/src/xercesc/parsers/DOMLSParserImpl.hpp
similarity index 52%
rename from src/xercesc/parsers/DOMBuilderImpl.hpp
rename to src/xercesc/parsers/DOMLSParserImpl.hpp
index 5be204516..75b4a7a70 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.hpp
+++ b/src/xercesc/parsers/DOMLSParserImpl.hpp
@@ -24,7 +24,9 @@
#include <xercesc/parsers/AbstractDOMParser.hpp>
-#include <xercesc/dom/DOMBuilder.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
+#include <xercesc/dom/DOMConfiguration.hpp>
#include <xercesc/util/XercesDefs.hpp>
@@ -36,12 +38,13 @@ class XMLResourceIdentifier;
/**
* Introduced in DOM Level 3
*
- * DOMBuilderImpl provides an implementation of a DOMBuilder interface.
- * A DOMBuilder instance is obtained from the DOMImplementationLS interface
- * by invoking its createDOMBuilder method.
+ * DOMLSParserImpl provides an implementation of a DOMLSParser interface.
+ * A DOMLSParser instance is obtained from the DOMImplementationLS interface
+ * by invoking its createDOMLSParser method.
*/
-class PARSERS_EXPORT DOMBuilderImpl : public AbstractDOMParser,
- public DOMBuilder
+class PARSERS_EXPORT DOMLSParserImpl : public AbstractDOMParser,
+ public DOMLSParser,
+ public DOMConfiguration
{
public :
// -----------------------------------------------------------------------
@@ -50,7 +53,7 @@ public :
/** @name Constructors and Destructor */
//@{
- /** Construct a DOMBuilderImpl, with an optional validator
+ /** Construct a DOMLSParserImpl, with an optional validator
*
* Constructor with an instance of validator class to use for
* validation. If you don't provide a validator, a default one will
@@ -63,7 +66,7 @@ public :
* @param valToAdopt Pointer to the validator instance to use. The
* parser is responsible for freeing the memory.
*/
- DOMBuilderImpl
+ DOMLSParserImpl
(
XMLValidator* const valToAdopt = 0
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
@@ -73,12 +76,12 @@ public :
/**
* Destructor
*/
- virtual ~DOMBuilderImpl();
+ virtual ~DOMLSParserImpl();
//@}
// -----------------------------------------------------------------------
- // Implementation of DOMBuilder interface
+ // Implementation of DOMLSParser interface
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
// Getter methods
@@ -88,97 +91,24 @@ public :
//@{
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Get a pointer to the error handler
- *
- * This method returns the installed error handler. If no handler
- * has been installed, then it will be a zero pointer.
- *
- * @return The pointer to the installed error handler object.
- */
- DOMErrorHandler* getErrorHandler();
-
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Get a const pointer to the error handler
- *
- * This method returns the installed error handler. If no handler
- * has been installed, then it will be a zero pointer.
- *
- * @return A const pointer to the installed error handler object.
- */
- const DOMErrorHandler* getErrorHandler() const;
-
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Get a pointer to the entity resolver
- *
- * This method returns the installed entity resolver. If no resolver
- * has been installed, then it will be a zero pointer.
- *
- * @return The pointer to the installed entity resolver object.
- */
- DOMEntityResolver* getEntityResolver();
-
- /**
- * Get a pointer to the entity resolver
- *
- * This method returns the installed entity resolver. If no resolver
- * has been installed, then it will be a zero pointer.
- *
- * @return The pointer to the installed entity resolver object.
- */
- XMLEntityResolver* getXMLEntityResolver();
-
- /**
- * Get a const pointer to the entity resolver
- *
- * This method returns the installed entity resolver. If no resolver
- * has been installed, then it will be a zero pointer.
- *
- * @return A const pointer to the installed entity resolver object.
+ * @see DOMLSParser#getDomConfig
*/
- const XMLEntityResolver* getXMLEntityResolver() const;
+ virtual DOMConfiguration* getDomConfig();
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Get a const pointer to the entity resolver
- *
- * This method returns the installed entity resolver. If no resolver
- * has been installed, then it will be a zero pointer.
- *
- * @return A const pointer to the installed entity resolver object.
+ * @see DOMLSParser#getFilter
*/
- const DOMEntityResolver* getEntityResolver() const;
+ virtual const DOMLSParserFilter* getFilter() const;
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Get a pointer to the application filter
- *
- * This method returns the installed application filter. If no filter
- * has been installed, then it will be a zero pointer.
- *
- * @return The pointer to the installed application filter.
+ * @see DOMLSParser#getAsync
*/
- DOMBuilderFilter* getFilter();
+ virtual bool getAsync() const;
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Get a const pointer to the application filter
- *
- * This method returns the installed application filter. If no filter
- * has been installed, then it will be a zero pointer.
- *
- * @return A const pointer to the installed application filter
+ * @see DOMLSParser#getBusy
*/
- const DOMBuilderFilter* getFilter() const;
-
+ virtual bool getBusy() const;
//@}
@@ -188,267 +118,52 @@ public :
/** @name Setter methods */
//@{
-
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Set the error handler
- *
- * This method allows applications to install their own error handler
- * to trap error and warning messages.
- *
- * <i>Any previously set handler is merely dropped, since the parser
- * does not own them.</i>
- *
- * @param handler A const pointer to the user supplied error
- * handler.
- *
- * @see #getErrorHandler
+ * @see DOMLSParser#setFilter
*/
- void setErrorHandler(DOMErrorHandler* const handler);
-
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Set the entity resolver
- *
- * This method allows applications to install their own entity
- * resolver. By installing an entity resolver, the applications
- * can trap and potentially redirect references to external
- * entities.
- *
- * <i>Any previously set entity resolver is merely dropped, since the parser
- * does not own them. If both setEntityResolver and setXMLEntityResolver
- * are called, then the last one is used.</i>
- *
- * @param handler A const pointer to the user supplied entity
- * resolver.
- *
- * @see #getEntityResolver
- */
- void setEntityResolver(DOMEntityResolver* const handler);
-
- /**
- * Set the entity resolver
- *
- * This method allows applications to install their own entity
- * resolver. By installing an entity resolver, the applications
- * can trap and potentially redirect references to external
- * entities.
- *
- * <i>Any previously set entity resolver is merely dropped, since the parser
- * does not own them. If both setEntityResolver and setXMLEntityResolver
- * are called, then the last one is used.</i>
- *
- * @param handler A const pointer to the user supplied entity
- * resolver.
- *
- * @see #getXMLEntityResolver
- */
- void setXMLEntityResolver(XMLEntityResolver* const handler);
-
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Set the application filter
- *
- * When the application provides a filter, the parser will call out to
- * the filter at the completion of the construction of each Element node.
- * The filter implementation can choose to remove the element from the
- * document being constructed (unless the element is the document element)
- * or to terminate the parse early. If the document is being validated
- * when it's loaded the validation happens before the filter is called.
- *
- * <i>Any previously set filter is merely dropped, since the parser
- * does not own them.</i>
- *
- * @param filter A const pointer to the user supplied application
- * filter.
- *
- * @see #getFilter
- */
- void setFilter(DOMBuilderFilter* const filter);
+ virtual void setFilter(DOMLSParserFilter* const filter);
//@}
-
// -----------------------------------------------------------------------
- // Feature methods
+ // Parsing methods
// -----------------------------------------------------------------------
- /** @name Feature methods */
+ /** @name Parsing methods */
//@{
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Set the state of a feature
- *
- * It is possible for a DOMBuilder to recognize a feature name but to be
- * unable to set its value.
- *
- * @param name The feature name.
- * @param state The requested state of the feature (true or false).
- * @exception DOMException
- * NOT_SUPPORTED_ERR: Raised when the DOMBuilder recognizes the
- * feature name but cannot set the requested value.
- * <br>NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the feature name.
- *
- * @see #getFeature
- * @see #canSetFeature
- */
- void setFeature(const XMLCh* const name, const bool state);
-
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Look up the value of a feature.
- *
- * @param name The feature name.
- * @return The current state of the feature (true or false)
- * @exception DOMException
- * NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the feature name.
- *
- * @see #setFeature
- * @see #canSetFeature
- */
- bool getFeature(const XMLCh* const name) const;
-
- /**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Query whether setting a feature to a specific value is supported.
- *
- * @param name The feature name.
- * @param state The requested state of the feature (true or false).
- * @return <code>true</code> if the feature could be successfully set
- * to the specified value, or <code>false</code> if the feature
- * is not recognized or the requested value is not supported. The
- * value of the feature itself is not changed.
- *
- * @see #getFeature
- * @see #setFeature
- */
- bool canSetFeature(const XMLCh* const name, const bool state) const;
-
- //@}
-
// -----------------------------------------------------------------------
// Parsing methods
// -----------------------------------------------------------------------
- /** @name Parsing methods */
- //@{
-
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Parse via an input source object
- *
- * This method invokes the parsing process on the XML file specified
- * by the DOMInputSource parameter. This API is borrowed from the
- * SAX Parser interface.
- *
- * @param source A const reference to the DOMInputSource object which
- * points to the XML file to be parsed.
- * @return If the DOMBuilder is a synchronous DOMBuilder the newly created
- * and populated Document is returned. If the DOMBuilder is
- * asynchronous then <code>null</code> is returned since the
- * document object is not yet parsed when this method returns.
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOMException A DOM exception as per DOM spec.
- *
- * @see DOMInputSource#DOMInputSource
- * @see #setEntityResolver
- * @see #setErrorHandler
+ * @see DOMLSParser#parse
*/
- DOMDocument* parse(const DOMInputSource& source);
+ virtual DOMDocument* parse(const DOMLSInput& source);
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Parse via a file path or URL
- *
- * This method invokes the parsing process on the XML file specified by
- * the Unicode string parameter 'systemId'.
- *
- * @param systemId A const XMLCh pointer to the Unicode string which
- * contains the path to the XML file to be parsed.
- * @return If the DOMBuilder is a synchronous DOMBuilder the newly created
- * and populated Document is returned. If the DOMBuilder is
- * asynchronous then <code>null</code> is returned since the
- * document object is not yet parsed when this method returns.
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOM_DOMException A DOM exception as per DOM spec.
- *
- * @see #parse(DOMInputSource,...)
+ * @see DOMLSParser#parseURI
*/
- DOMDocument* parseURI(const XMLCh* const systemId);
+ virtual DOMDocument* parseURI(const XMLCh* const uri);
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Parse via a file path or URL (in the local code page)
- *
- * This method invokes the parsing process on the XML file specified by
- * the native char* string parameter 'systemId'.
- *
- * @param systemId A const char pointer to a native string which
- * contains the path to the XML file to be parsed.
- * @return If the DOMBuilder is a synchronous DOMBuilder the newly created
- * and populated Document is returned. If the DOMBuilder is
- * asynchronous then <code>null</code> is returned since the
- * document object is not yet parsed when this method returns.
- * @exception SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception XMLException An exception from the parser or client
- * handler code.
- * @exception DOM_DOMException A DOM exception as per DOM spec.
- *
- * @see #parse(DOMInputSource,...)
+ * @see DOMLSParser#parseURI
*/
- DOMDocument* parseURI(const char* const systemId);
+ virtual DOMDocument* parseURI(const char* const uri);
/**
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * Parse via an input source object
- *
- * This method invokes the parsing process on the XML file specified
- * by the DOMInputSource parameter, and inserts the content into an
- * existing document at the position specified with the contextNode
- * and action arguments. When parsing the input stream the context node
- * is used for resolving unbound namespace prefixes.
- *
- * @param source A const reference to the DOMInputSource object which
- * points to the XML file to be parsed.
- * @param contextNode The node that is used as the context for the data
- * that is being parsed. This node must be a Document
- * node, a DocumentFragment node, or a node of a type
- * that is allowed as a child of an element, e.g. it
- * can not be an attribute node.
- * @param action This parameter describes which action should be taken
- * between the new set of node being inserted and the
- * existing children of the context node.
- * @exception DOMException
- * NOT_SUPPORTED_ERR: Raised when the DOMBuilder doesn't support
- * this method.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is
- * readonly.
+ * @see DOMLSParser#parseWithContext
*/
virtual void parseWithContext
(
- const DOMInputSource& source
- , DOMNode* const contextNode
- , const short action
+ const DOMLSInput& source
+ , DOMNode* contextNode
+ , const unsigned short action
);
+ /**
+ * @see DOMLSParser#abort
+ */
+ virtual void abort();
+
// -----------------------------------------------------------------------
// Non-standard Extension
@@ -457,53 +172,7 @@ public :
//@{
/**
- * Query the current value of a property in a DOMBuilder.
- *
- * The builder owns the returned pointer. The memory allocated for
- * the returned pointer will be destroyed when the builder is deleted.
- *
- * To ensure assessiblity of the returned information after the builder
- * is deleted, callers need to copy and store the returned information
- * somewhere else; otherwise you may get unexpected result. Since the returned
- * pointer is a generic void pointer, see
- * http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties to learn
- * exactly what type of property value each property returns for replication.
- *
- * @param name The unique identifier (URI) of the property being set.
- * @return The current value of the property. The pointer spans the same
- * life-time as the parser. A null pointer is returned if nothing
- * was specified externally.
- * @exception DOMException
- * <br>NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the requested property.
- */
- virtual void* getProperty(const XMLCh* const name) const;
-
- /**
- * Set the value of any property in a DOMBuilder.
- * See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties for
- * the list of supported properties.
- *
- * It takes a void pointer as the property value. Application is required to initialize this void
- * pointer to a correct type. See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties
- * to learn exactly what type of property value each property expects for processing.
- * Passing a void pointer that was initialized with a wrong type will lead to unexpected result.
- * If the same property is set more than once, the last one takes effect.
- *
- * @param name The unique identifier (URI) of the property being set.
- * @param value The requested value for the property.
- * See http://xml.apache.org/xerces-c/program-dom.html#DOMBuilderProperties to learn
- * exactly what type of property value each property expects for processing.
- * Passing a void pointer that was initialized with a wrong type will lead
- * to unexpected result.
- * @exception DOMException
- * <br>NOT_FOUND_ERR: Raised when the DOMBuilder does not recognize
- * the requested property.
- */
- virtual void setProperty(const XMLCh* const name, void* value);
-
- /**
- * Called to indicate that this DOMBuilder is no longer in use
+ * Called to indicate that this DOMLSParser is no longer in use
* and that the implementation may relinquish any resources associated with it.
*
*/
@@ -539,13 +208,11 @@ public :
* object.
*
* This method invokes the preparsing process on a schema grammar XML
- * file specified by the DOMInputSource parameter. If the 'toCache' flag
+ * file specified by the DOMLSInput parameter. If the 'toCache' flag
* is enabled, the parser will cache the grammars for re-use. If a grammar
* key is found in the pool, no caching of any grammar will take place.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @param source A const reference to the DOMInputSource object which
+ * @param source A const reference to the DOMLSInput object which
* points to the schema grammar file to be preparsed.
* @param grammarType The grammar type (Schema or DTD).
* @param toCache If <code>true</code>, we cache the preparsed grammar,
@@ -559,9 +226,9 @@ public :
* handler code.
* @exception DOMException A DOM exception as per DOM spec.
*
- * @see DOMInputSource#DOMInputSource
+ * @see DOMLSInput#DOMLSInput
*/
- virtual Grammar* loadGrammar(const DOMInputSource& source,
+ virtual Grammar* loadGrammar(const DOMLSInput& source,
const short grammarType,
const bool toCache = false);
@@ -573,8 +240,6 @@ public :
* is enabled, the parser will cache the grammars for re-use. If a grammar
* key is found in the pool, no caching of any grammar will take place.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @param systemId A const XMLCh pointer to the Unicode string which
* contains the path to the XML grammar file to be
* preparsed.
@@ -602,8 +267,6 @@ public :
* is enabled, the parser will cache the grammars for re-use. If a grammar
* key is found in the pool, no caching of any grammar will take place.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @param systemId A const char pointer to a native string which contains
* the path to the XML grammar file to be preparsed.
* @param grammarType The grammar type (Schema or DTD).
@@ -660,6 +323,73 @@ public :
//@}
+ // -----------------------------------------------------------------------
+ // Implementation of the DOMConfiguration interface.
+ // -----------------------------------------------------------------------
+ /** @name Implementation of the DOMConfiguration interface. */
+ //@{
+ /**
+ * Set the value of a parameter.
+ *
+ * @param name The name of the parameter to set.
+ * @param value The new value or null if the user wishes to unset the
+ * parameter. While the type of the value parameter is defined as
+ * <code>DOMUserData</code>, the object type must match the type defined
+ * by the definition of the parameter. For example, if the parameter is
+ * "error-handler", the value must be of type <code>DOMErrorHandler</code>
+ *
+ * @exception DOMException (NOT_SUPPORTED_ERR) Raised when the
+ * parameter name is recognized but the requested value cannot be set.
+ * @exception DOMException (NOT_FOUND_ERR) Raised when the
+ * parameter name is not recognized.
+ *
+ * @since DOM level 3
+ **/
+ virtual void setParameter(const XMLCh* name, const void* value);
+ virtual void setParameter(const XMLCh* name, bool value);
+
+ /**
+ * Return the value of a parameter if known.
+ *
+ * @param name The name of the parameter.
+ * @return The current object associated with the specified parameter or
+ * null if no object has been associated or if the parameter is not
+ * supported.
+ *
+ * @exception DOMException (NOT_FOUND_ERR) Raised when the i
+ * boolean parameter
+ * name is not recognized.
+ *
+ * @since DOM level 3
+ **/
+ virtual const void* getParameter(const XMLCh* name) const;
+
+ /**
+ * Check if setting a parameter to a specific value is supported.
+ *
+ * @param name The name of the parameter to check.
+ * @param value An object. if null, the returned value is true.
+ * @return true if the parameter could be successfully set to the specified
+ * value, or false if the parameter is not recognized or the requested value
+ * is not supported. This does not change the current value of the parameter
+ * itself.
+ *
+ * @since DOM level 3
+ **/
+ virtual bool canSetParameter(const XMLCh* name, const void* value) const;
+ virtual bool canSetParameter(const XMLCh* name, bool value) const;
+
+ /**
+ * The list of the parameters supported by this DOMConfiguration object and
+ * for which at least one value can be set by the application.
+ * Note that this list can also contain parameter names defined outside this specification.
+ *
+ * @return The list of parameters that can be used with setParameter/getParameter
+ * @since DOM level 3
+ **/
+ virtual const RefVectorOf<const XMLCh*>* getParameterNames() const;
+ //@}
+
// -----------------------------------------------------------------------
// Implementation of the XMLErrorReporter interface.
// -----------------------------------------------------------------------
@@ -785,7 +515,7 @@ public :
* or <code>null</code> if there is no base URI.
* @return The value returned by the user installed resolveEntity
* method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the DOMBuilder which is
+ * The returned InputSource is owned by the DOMLSParser which is
* responsible to clean up the memory.
* @see DOMEntityResolver
* @see XMLEntityHandler
@@ -844,9 +574,19 @@ private :
// -----------------------------------------------------------------------
// Private data members
//
+ // fAutoValidation
+ // Whether validation will be enabled in case a schema reference is found
+ //
+ // fValidation
+ // Whether validation will be enabled (if fAutoValidation has been set,
+ // setting it is a no-op)
+ //
// fEntityResolver
// The installed DOM entity resolver, if any. Null if none.
//
+ // fXMLEntityResolver
+ // The installed Xerces entity resolver, if any. Null if none.
+ //
// fErrorHandler
// The installed DOM error handler, if any. Null if none.
//
@@ -866,83 +606,59 @@ private :
DOMEntityResolver* fEntityResolver;
XMLEntityResolver* fXMLEntityResolver;
DOMErrorHandler* fErrorHandler;
- DOMBuilderFilter* fFilter;
+ DOMLSParserFilter* fFilter;
bool fCharsetOverridesXMLEncoding;
bool fUserAdoptsDocument;
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
- DOMBuilderImpl(const DOMBuilderImpl &);
- DOMBuilderImpl & operator = (const DOMBuilderImpl &);
+ DOMLSParserImpl(const DOMLSParserImpl &);
+ DOMLSParserImpl & operator = (const DOMLSParserImpl &);
};
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Handlers for the XMLEntityHandler interface
+// DOMLSParserImpl: Handlers for the XMLEntityHandler interface
// ---------------------------------------------------------------------------
-inline void DOMBuilderImpl::endInputSource(const InputSource&)
+inline void DOMLSParserImpl::endInputSource(const InputSource&)
{
// The DOM entity resolver doesn't handle this
}
-inline bool DOMBuilderImpl::expandSystemId(const XMLCh* const, XMLBuffer&)
+inline bool DOMLSParserImpl::expandSystemId(const XMLCh* const, XMLBuffer&)
{
// The DOM entity resolver doesn't handle this
return false;
}
-inline void DOMBuilderImpl::resetEntities()
+inline void DOMLSParserImpl::resetEntities()
{
// Nothing to do on this one
}
-inline void DOMBuilderImpl::startInputSource(const InputSource&)
+inline void DOMLSParserImpl::startInputSource(const InputSource&)
{
// The DOM entity resolver doesn't handle this
}
// ---------------------------------------------------------------------------
-// DOMBuilderImpl: Getter methods
+// DOMLSParserImpl: Getter methods
// ---------------------------------------------------------------------------
-inline DOMErrorHandler* DOMBuilderImpl::getErrorHandler()
-{
- return fErrorHandler;
-}
-
-inline const DOMErrorHandler* DOMBuilderImpl::getErrorHandler() const
-{
- return fErrorHandler;
-}
-
-inline DOMEntityResolver* DOMBuilderImpl::getEntityResolver()
-{
- return fEntityResolver;
-}
-
-inline const DOMEntityResolver* DOMBuilderImpl::getEntityResolver() const
-{
- return fEntityResolver;
-}
-
-inline XMLEntityResolver* DOMBuilderImpl::getXMLEntityResolver()
+inline DOMConfiguration* DOMLSParserImpl::getDomConfig()
{
- return fXMLEntityResolver;
+ return this;
}
-inline const XMLEntityResolver* DOMBuilderImpl::getXMLEntityResolver() const
+inline bool DOMLSParserImpl::getAsync() const
{
- return fXMLEntityResolver;
-}
-
-inline DOMBuilderFilter* DOMBuilderImpl::getFilter()
-{
- return fFilter;
+ // We are a synchronous parser
+ return false;
}
-inline const DOMBuilderFilter* DOMBuilderImpl::getFilter() const
+inline const DOMLSParserFilter* DOMLSParserImpl::getFilter() const
{
return fFilter;
}
diff --git a/src/xercesc/util/XMLUni.cpp b/src/xercesc/util/XMLUni.cpp
index ef2ca4b9c..0be71efb4 100644
--- a/src/xercesc/util/XMLUni.cpp
+++ b/src/xercesc/util/XMLUni.cpp
@@ -1128,8 +1128,8 @@ const XMLCh XMLUni::fgXercesGenerateSyntheticAnnotations[] =
, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull
};
-const XMLCh XMLUni::fgXercesValidateAnnotations[] =
//Xerces: http://apache.org/xml/features/validate-annotations
+const XMLCh XMLUni::fgXercesValidateAnnotations[] =
{
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
, chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
@@ -1221,6 +1221,19 @@ const XMLCh XMLUni::fgXercesParserUseDocumentFromImplementation[] =
, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
};
+//Property
+//Xerces: http://apache.org/xml/properties/entity-resolver
+const XMLCh XMLUni::fgXercesEntityResolver[] =
+{
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
+ , chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
+ , chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
+ , chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_p, chLatin_a
+ , chLatin_r, chLatin_s, chLatin_e, chLatin_r, chDash, chLatin_e, chLatin_n
+ , chLatin_t, chLatin_i, chLatin_t, chLatin_y, chDash, chLatin_r, chLatin_e
+ , chLatin_s, chLatin_o, chLatin_l, chLatin_v, chLatin_e, chLatin_r, chNull
+};
+
//Xerces: http://apache.org/xml/features/dom/user-adopts-DOMDocument
const XMLCh XMLUni::fgXercesUserAdoptsDOMDocument[] =
@@ -1360,6 +1373,15 @@ const XMLCh XMLUni::fgDOMCharsetOverridesXMLEncoding[] =
, chLatin_n, chLatin_g, chNull
};
+const XMLCh XMLUni::fgDOMCheckCharacterNormalization[] =
+{
+ chLatin_c, chLatin_h, chLatin_e, chLatin_c, chLatin_k, chDash
+ , chLatin_c, chLatin_h, chLatin_a, chLatin_r, chLatin_a, chLatin_c, chLatin_t
+ , chLatin_e, chLatin_r, chDash, chLatin_n, chLatin_o, chLatin_r, chLatin_m
+ , chLatin_a, chLatin_l, chLatin_i, chLatin_z, chLatin_a, chLatin_t, chLatin_i
+ , chLatin_o, chLatin_n, chNull
+};
+
const XMLCh XMLUni::fgDOMDatatypeNormalization[] =
{
chLatin_d, chLatin_a, chLatin_t, chLatin_a, chLatin_t, chLatin_y, chLatin_p
@@ -1368,17 +1390,48 @@ const XMLCh XMLUni::fgDOMDatatypeNormalization[] =
, chLatin_n, chNull
};
+const XMLCh XMLUni::fgDOMDisallowDoctype[] =
+{
+ chLatin_d, chLatin_i, chLatin_s, chLatin_a, chLatin_l, chLatin_l, chLatin_o
+ , chLatin_w, chDash, chLatin_d, chLatin_o, chLatin_c, chLatin_t, chLatin_y
+ , chLatin_e, chNull
+};
+
+const XMLCh XMLUni::fgDOMElementContentWhitespace[] =
+{
+ chLatin_e, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n, chLatin_t
+ , chDash, chLatin_c, chLatin_o, chLatin_n, chLatin_t, chLatin_e, chLatin_n
+ , chLatin_t, chDash, chLatin_w, chLatin_h, chLatin_i, chLatin_t, chLatin_e
+ , chLatin_s, chLatin_p, chLatin_a, chLatin_c, chLatin_e, chNull
+};
+
const XMLCh XMLUni::fgDOMEntities[] =
{
chLatin_e, chLatin_n, chLatin_t, chLatin_i, chLatin_t, chLatin_i, chLatin_e
, chLatin_s, chNull
};
+const XMLCh XMLUni::fgDOMErrorHandler[] =
+{
+ chLatin_e, chLatin_r, chLatin_r, chLatin_o, chLatin_r, chDash, chLatin_h
+ , chLatin_a, chLatin_n, chLatin_d, chLatin_l, chLatin_e, chLatin_r, chNull
+};
+
const XMLCh XMLUni::fgDOMInfoset[] =
{
chLatin_i, chLatin_n, chLatin_f, chLatin_o, chLatin_s, chLatin_e, chLatin_t, chNull
};
+const XMLCh XMLUni::fgDOMIgnoreUnknownCharacterDenormalization[] =
+{
+ chLatin_i, chLatin_g, chLatin_n, chLatin_o, chLatin_r, chLatin_e, chDash
+ , chLatin_u, chLatin_n, chLatin_k, chLatin_n, chLatin_o, chLatin_w, chLatin_n
+ , chDash, chLatin_c, chLatin_h, chLatin_a, chLatin_r, chLatin_a, chLatin_c
+ , chLatin_t, chLatin_e, chLatin_r, chDash, chLatin_d, chLatin_e, chLatin_n
+ , chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i, chLatin_z
+ , chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
+};
+
const XMLCh XMLUni::fgDOMNamespaces[] =
{
chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chLatin_p, chLatin_a
@@ -1393,14 +1446,54 @@ const XMLCh XMLUni::fgDOMNamespaceDeclarations[] =
, chLatin_s, chNull
};
+const XMLCh XMLUni::fgDOMNormalizeCharacters[] =
+{
+ chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i
+ , chLatin_z, chLatin_e, chDash, chLatin_c, chLatin_h, chLatin_a, chLatin_r
+ , chLatin_a, chLatin_c, chLatin_t, chLatin_e, chLatin_r, chLatin_s, chNull
+};
+
+const XMLCh XMLUni::fgDOMResourceResolver[] =
+{
+ chLatin_r, chLatin_e, chLatin_s, chLatin_o, chLatin_u, chLatin_r, chLatin_c
+ , chLatin_e, chDash, chLatin_r, chLatin_e, chLatin_s, chLatin_o, chLatin_l
+ , chLatin_v, chLatin_e, chLatin_r, chNull
+};
+
+const XMLCh XMLUni::fgDOMSchemaLocation[] =
+{
+ chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chDash
+ , chLatin_l, chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i, chLatin_o
+ , chLatin_n, chNull
+};
+
+const XMLCh XMLUni::fgDOMSchemaType[] =
+{
+ chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chDash
+ , chLatin_t, chLatin_y, chLatin_p, chLatin_e, chNull
+};
+
+const XMLCh XMLUni::fgDOMSplitCDATASections[] =
+{
+ chLatin_s, chLatin_p, chLatin_l, chLatin_i, chLatin_t, chDash, chLatin_c
+ , chLatin_d, chLatin_a, chLatin_t, chLatin_a, chDash, chLatin_s, chLatin_e
+ , chLatin_c, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull
+};
+
const XMLCh XMLUni::fgDOMSupportedMediatypesOnly[] =
{
chLatin_s, chLatin_u, chLatin_p, chLatin_p, chLatin_o, chLatin_r, chLatin_t
, chLatin_e, chLatin_d, chDash, chLatin_m, chLatin_e, chLatin_d, chLatin_i
- , chLatin_a, chLatin_t, chLatin_y, chLatin_p, chLatin_e, chLatin_s, chDash
+ , chLatin_a, chDash, chLatin_t, chLatin_y, chLatin_p, chLatin_e, chLatin_s, chDash
, chLatin_o, chLatin_n, chLatin_l, chLatin_y, chNull
};
+const XMLCh XMLUni::fgDOMValidate[] =
+{
+ chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t
+ , chLatin_e, chNull
+};
+
const XMLCh XMLUni::fgDOMValidateIfSchema[] =
{
chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t
@@ -1408,19 +1501,31 @@ const XMLCh XMLUni::fgDOMValidateIfSchema[] =
, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chNull
};
-const XMLCh XMLUni::fgDOMValidation[] =
+const XMLCh XMLUni::fgDOMWellFormed[] =
{
- chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d, chLatin_a, chLatin_t
- , chLatin_i, chLatin_o, chLatin_n, chNull
+ chLatin_w, chLatin_e, chLatin_l, chLatin_l, chDash, chLatin_f, chLatin_o
+ , chLatin_r, chLatin_m, chLatin_e, chLatin_d, chNull
};
-const XMLCh XMLUni::fgDOMWhitespaceInElementContent[] =
+
+
+const XMLCh XMLUni::fgDOMXMLSchemaType[] =
{
- chLatin_w, chLatin_h, chLatin_i, chLatin_t, chLatin_e, chLatin_s, chLatin_p
- , chLatin_a, chLatin_c, chLatin_e, chDash, chLatin_i, chLatin_n, chDash
- , chLatin_e, chLatin_l, chLatin_e, chLatin_m, chLatin_e, chLatin_n, chLatin_t
- , chDash, chLatin_c, chLatin_o, chLatin_n, chLatin_t, chLatin_e, chLatin_n
- , chLatin_t, chNull
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
+ , chForwardSlash, chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w
+ , chDigit_3, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
+ , chDigit_2, chDigit_0, chDigit_0, chDigit_1, chForwardSlash, chLatin_X
+ , chLatin_M, chLatin_L, chLatin_S, chLatin_c, chLatin_h, chLatin_e
+ , chLatin_m, chLatin_a, chNull
+};
+
+const XMLCh XMLUni::fgDOMDTDType[] =
+{
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
+ , chForwardSlash, chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w
+ , chDigit_3, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
+ , chLatin_T, chLatin_R, chForwardSlash, chLatin_R, chLatin_E, chLatin_C
+ , chDash, chLatin_x, chLatin_m, chLatin_l, chNull
};
//Introduced in DOM Level 3
diff --git a/src/xercesc/util/XMLUni.hpp b/src/xercesc/util/XMLUni.hpp
index 6d991f281..738de00b6 100644
--- a/src/xercesc/util/XMLUni.hpp
+++ b/src/xercesc/util/XMLUni.hpp
@@ -229,7 +229,7 @@ public :
static const XMLCh fgXercesIgnoreAnnotations[];
static const XMLCh fgXercesDisableDefaultEntityResolution[];
static const XMLCh fgXercesSkipDTDValidation[];
-
+ static const XMLCh fgXercesEntityResolver[];
// SAX2 features/properties names
static const XMLCh fgSAX2CoreValidation[];
@@ -237,23 +237,36 @@ public :
static const XMLCh fgSAX2CoreNameSpacePrefixes[];
// Introduced in DOM Level 3
- // DOMBuilder features
+ // DOMLSParser features
static const XMLCh fgDOMCanonicalForm[];
static const XMLCh fgDOMCDATASections[];
static const XMLCh fgDOMComments[];
static const XMLCh fgDOMCharsetOverridesXMLEncoding[];
+ static const XMLCh fgDOMCheckCharacterNormalization[];
static const XMLCh fgDOMDatatypeNormalization[];
+ static const XMLCh fgDOMDisallowDoctype[];
+ static const XMLCh fgDOMElementContentWhitespace[];
+ static const XMLCh fgDOMErrorHandler[];
static const XMLCh fgDOMEntities[];
+ static const XMLCh fgDOMIgnoreUnknownCharacterDenormalization[];
static const XMLCh fgDOMInfoset[];
static const XMLCh fgDOMNamespaces[];
static const XMLCh fgDOMNamespaceDeclarations[];
+ static const XMLCh fgDOMNormalizeCharacters[];
+ static const XMLCh fgDOMResourceResolver[];
+ static const XMLCh fgDOMSchemaLocation[];
+ static const XMLCh fgDOMSchemaType[];
+ static const XMLCh fgDOMSplitCDATASections[];
static const XMLCh fgDOMSupportedMediatypesOnly[];
+ static const XMLCh fgDOMValidate[];
static const XMLCh fgDOMValidateIfSchema[];
- static const XMLCh fgDOMValidation[];
- static const XMLCh fgDOMWhitespaceInElementContent[];
+ static const XMLCh fgDOMWellFormed[];
+
+ static const XMLCh fgDOMXMLSchemaType[];
+ static const XMLCh fgDOMDTDType[];
// Introduced in DOM Level 3
- // DOMWriter feature
+ // DOMLSSerializer feature
static const XMLCh fgDOMWRTCanonicalForm[];
static const XMLCh fgDOMWRTDiscardDefaultContent[];
static const XMLCh fgDOMWRTEntities[];
diff --git a/tests/src/DOM/Normalizer/Normalizer.cpp b/tests/src/DOM/Normalizer/Normalizer.cpp
index fdf945904..310395441 100644
--- a/tests/src/DOM/Normalizer/Normalizer.cpp
+++ b/tests/src/DOM/Normalizer/Normalizer.cpp
@@ -205,12 +205,12 @@ void Normalizer::serializeNode(const DOMNode * const node) {
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
- DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
- theSerializer->setFeature(X("format-pretty-print"), true);
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+ theSerializer->getDomConfig()->setParameter(X("format-pretty-print"), true);
XMLFormatTarget *myFormTarget;
myFormTarget = new StdOutFormatTarget();
- theSerializer->writeNode(myFormTarget, *node);
+ theSerializer->write(node,myFormTarget);
}
int main(int argc, char **argv) {
@@ -373,7 +373,7 @@ int main(int argc, char **argv) {
DOMConfigurationImpl *cImpl = new ((DOMDocumentImpl*)doc) DOMConfigurationImpl();
((DOMDocumentImpl*)doc)->setDOMConfiguration(cImpl);
cImpl->setErrorHandler(normalizer);
- cImpl->setParameter(X("namespaces"), (void*)tmpTrue);
+ cImpl->setParameter(X("namespaces"), true);
DOMElement *level1Node = doc->createElement(X("level1Node"));
docFirstElement->appendChild(level1Node);
@@ -396,7 +396,7 @@ int main(int argc, char **argv) {
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cImpl->setParameter(X("comments"), (void*)tmpFalse);
+ cImpl->setParameter(X("comments"), false);
docFirstElement->appendChild(comment);
doc->normalizeDocument();
normalizer->serializeNode(doc);
@@ -408,7 +408,7 @@ int main(int argc, char **argv) {
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cImpl->setParameter(X("cdata-sections"), (void*)tmpFalse);
+ cImpl->setParameter(X("cdata-sections"), false);
docFirstElement->appendChild(cData);
doc->normalizeDocument();
normalizer->serializeNode(doc);
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.cpp b/tests/src/MemHandlerTest/MemoryMonitor.cpp
index 75a9901ed..69c0d546c 100755
--- a/tests/src/MemHandlerTest/MemoryMonitor.cpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.cpp
@@ -67,7 +67,7 @@ static void usage()
{
XERCES_STD_QUALIFIER cout << "\nUsage:\n"
" MemHandlerTest [options] <XML file | List file>\n\n"
- "This program invokes the XercesDOMParser, DOMBuilder, SAXParser ,\n"
+ "This program invokes the XercesDOMParser, DOMLSParser, SAXParser ,\n"
"and the SAX2XMLReader, and ensures that MemoryManagers set on these\n"
"domBuilders are called to delete just as many bytes as they allocate.\n"
"This is done for each XML file, and each file is processed\n"
@@ -85,11 +85,11 @@ static void usage()
<< XERCES_STD_QUALIFIER endl;
}
-class DOMBuilderHandler : public DOMErrorHandler
+class DOMLSParserHandler : public DOMErrorHandler
{
public:
- DOMBuilderHandler() {};
- ~DOMBuilderHandler() {};
+ DOMLSParserHandler() {};
+ ~DOMLSParserHandler() {};
bool handleError(const DOMError &error)
{
char *message = 0;
@@ -255,9 +255,9 @@ int main (int argC, char *argV[])
MemoryMonitor *domBuilderMemMonitor = new MemoryMonitor();
static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
- DOMBuilder *domBuilder = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0, domBuilderMemMonitor);
- DOMBuilderHandler domBuilderHandler;
- domBuilder->setErrorHandler(&domBuilderHandler);
+ DOMLSParser *domBuilder = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0, domBuilderMemMonitor);
+ DOMLSParserHandler domBuilderHandler;
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &domBuilderHandler);
// Instantiate the SAX2 domBuilder with its memory manager.
MemoryMonitor *sax2MemMonitor = new MemoryMonitor();
@@ -276,24 +276,24 @@ int main (int argC, char *argV[])
saxParser->setErrorHandler(&saxErrorHandler);
// set features
- domBuilder->setFeature(XMLUni::fgDOMNamespaces, doNamespaces);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMNamespaces, doNamespaces);
sax2parser->setFeature(XMLUni::fgSAX2CoreNameSpaces, doNamespaces);
depDOMParser->setDoNamespaces(doNamespaces);
saxParser->setDoNamespaces(doNamespaces);
- domBuilder->setFeature(XMLUni::fgXercesSchema, doSchema);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgXercesSchema, doSchema);
sax2parser->setFeature(XMLUni::fgXercesSchema, doSchema);
depDOMParser->setDoSchema(doSchema);
saxParser->setDoSchema(doSchema);
- domBuilder->setFeature(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
sax2parser->setFeature(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
depDOMParser->setValidationSchemaFullChecking(schemaFullChecking);
saxParser->setValidationSchemaFullChecking(schemaFullChecking);
if (domBuilderValScheme == AbstractDOMParser::Val_Auto)
{
- domBuilder->setFeature(XMLUni::fgDOMValidateIfSchema, true);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMValidateIfSchema, true);
sax2parser->setFeature(XMLUni::fgSAX2CoreValidation, true);
sax2parser->setFeature(XMLUni::fgXercesDynamic, true);
depDOMParser->setValidationScheme(DOMParser::Val_Auto);
@@ -301,14 +301,14 @@ int main (int argC, char *argV[])
}
else if (domBuilderValScheme == AbstractDOMParser::Val_Never)
{
- domBuilder->setFeature(XMLUni::fgDOMValidation, false);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMValidate, false);
sax2parser->setFeature(XMLUni::fgSAX2CoreValidation, false);
depDOMParser->setValidationScheme(DOMParser::Val_Never);
saxParser->setValidationScheme(SAXParser::Val_Never);
}
else if (domBuilderValScheme == AbstractDOMParser::Val_Always)
{
- domBuilder->setFeature(XMLUni::fgDOMValidation, true);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMValidate, true);
sax2parser->setFeature(XMLUni::fgSAX2CoreValidation, true);
sax2parser->setFeature(XMLUni::fgXercesDynamic, false);
depDOMParser->setValidationScheme(DOMParser::Val_Always);
@@ -316,7 +316,7 @@ int main (int argC, char *argV[])
}
// enable datatype normalization - default is off
- domBuilder->setFeature(XMLUni::fgDOMDatatypeNormalization, true);
+ domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMDatatypeNormalization, true);
XERCES_STD_QUALIFIER ifstream fin;
bool more = true;
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.hpp b/tests/src/MemHandlerTest/MemoryMonitor.hpp
index 4c092ba91..2e9c2baef 100755
--- a/tests/src/MemHandlerTest/MemoryMonitor.hpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.hpp
@@ -22,7 +22,7 @@
#include <xercesc/framework/MemoryManager.hpp>
#include <xercesc/util/PlatformUtils.hpp>
#include "SimpleHashPtr.hpp"
-#include <xercesc/dom/DOMBuilder.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/dom/DOMError.hpp>
#include <xercesc/dom/DOMImplementation.hpp>
diff --git a/tests/src/ThreadTest/ThreadTest.cpp b/tests/src/ThreadTest/ThreadTest.cpp
index b57cdfac2..a962a35e0 100644
--- a/tests/src/ThreadTest/ThreadTest.cpp
+++ b/tests/src/ThreadTest/ThreadTest.cpp
@@ -777,10 +777,10 @@ void ThreadParser::domPrint()
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
- DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
XMLFormatTarget *myFormTarget = new StdOutFormatTarget();
DOMNode *doc = fXercesDOMParser->getDocument();
- theSerializer->writeNode(myFormTarget, *doc);
+ theSerializer->write(doc,myFormTarget);
delete theSerializer;
}
catch (...)
--
GitLab