You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/07/23 23:13:13 UTC
svn commit: r224543 [1/5] - in /xerces/c/trunk:
Projects/Win32/BCC.551/Xerces-all/XercesLib/
Projects/Win32/VC6/xerces-all/XercesLib/
Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/
Projects/Win32/VC7.1/xerces-all/DOMCount/ Projects/Win32/VC7.1/xerc...
Author: amassari
Date: Sat Jul 23 14:11:41 2005
New Revision: 224543
URL: http://svn.apache.org/viewcvs?rev=224543&view=rev
Log:
DOM Level 3 Load and Save: updated interfaces
Added:
xerces/c/trunk/src/xercesc/dom/DOMLSException.cpp (with props)
xerces/c/trunk/src/xercesc/dom/DOMLSException.hpp (with props)
xerces/c/trunk/src/xercesc/dom/DOMLSInput.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/dom/DOMInputSource.hpp
xerces/c/trunk/src/xercesc/dom/DOMLSOutput.hpp (with props)
xerces/c/trunk/src/xercesc/dom/DOMLSParser.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/dom/DOMBuilder.hpp
xerces/c/trunk/src/xercesc/dom/DOMLSParserFilter.hpp (with props)
xerces/c/trunk/src/xercesc/dom/DOMLSSerializer.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/dom/DOMWriter.hpp
xerces/c/trunk/src/xercesc/dom/DOMLSSerializerFilter.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/dom/DOMWriterFilter.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.hpp
xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.cpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.cpp
xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.hpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/parsers/DOMBuilderImpl.cpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
- copied, changed from r201963, xerces/c/trunk/src/xercesc/parsers/DOMBuilderImpl.hpp
Removed:
xerces/c/trunk/src/xercesc/dom/DOMBuilder.hpp
xerces/c/trunk/src/xercesc/dom/DOMInputSource.hpp
xerces/c/trunk/src/xercesc/dom/DOMWriter.hpp
xerces/c/trunk/src/xercesc/dom/DOMWriterFilter.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.hpp
xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.cpp
xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.hpp
xerces/c/trunk/src/xercesc/parsers/DOMBuilderImpl.cpp
xerces/c/trunk/src/xercesc/parsers/DOMBuilderImpl.hpp
Modified:
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp
xerces/c/trunk/samples/src/DOMPrint/DOMPrint.cpp
xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp
xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp
xerces/c/trunk/scripts/sanityTest_ExpectedResult.log
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/src/Makefile.in
xerces/c/trunk/src/xercesc/dom/DOM.hpp
xerces/c/trunk/src/xercesc/dom/DOMConfiguration.hpp
xerces/c/trunk/src/xercesc/dom/DOMEntityResolver.hpp
xerces/c/trunk/src/xercesc/dom/DOMImplementation.hpp
xerces/c/trunk/src/xercesc/dom/DOMImplementationLS.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp
xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.cpp
xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp
xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.cpp
xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
xerces/c/trunk/src/xercesc/util/XMLUni.cpp
xerces/c/trunk/src/xercesc/util/XMLUni.hpp
xerces/c/trunk/tests/src/DOM/Normalizer/Normalizer.cpp
xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.cpp
xerces/c/trunk/tests/src/MemHandlerTest/MemoryMonitor.hpp
xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
Modified: xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak (original)
+++ xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak Sat Jul 23 14:11:41 2005
@@ -287,10 +287,11 @@
$(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 @@
!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
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp Sat Jul 23 14:11:41 2005
@@ -1385,11 +1385,11 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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
@@ -3138,14 +3158,6 @@
# Begin Source File
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
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/CreateDOMDocument.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMCount/DOMCount.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMMemTest/DOMMemTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMNormalizerTest/DOMNormalizerTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMPrint/DOMPrint.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTest/DOMTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTraversalTest/DOMTraversalTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DOMTypeInfoTest/DOMTypeInfoTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/DeprecatedDOMCount/DeprecatedDOMCount.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EncodingTest/EncodingTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/EnumVal/EnumVal.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/InitTermTest/InitTermTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemHandlerTest/MemHandlerTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/MemParse/MemParse.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PParse/PParse.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/RangeTest/RangeTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/Redirect/Redirect.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Count/SAX2Count.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAX2Print/SAX2Print.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win3From commits-return-14083-apmail-xerces-commits-archive=xerces.apache.org@xerces.apache.org Sat Jul 23 21:13:51 2005
Return-Path: <co...@xerces.apache.org>
Delivered-To: apmail-xerces-commits-archive@www.apache.org
Received: (qmail 65366 invoked from network); 23 Jul 2005 21:13:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
by minotaur.apache.org with SMTP; 23 Jul 2005 21:13:51 -0000
Received: (qmail 33167 invoked by uid 500); 23 Jul 2005 21:13:50 -0000
Delivered-To: apmail-xerces-commits-archive@xerces.apache.org
Received: (qmail 32993 invoked by uid 500); 23 Jul 2005 21:13:48 -0000
Mailing-List: contact commits-help@xerces.apache.org; run by ezmlm
Precedence: bulk
List-Help: <ma...@xerces.apache.org>
List-Unsubscribe: <ma...@xerces.apache.org>
List-Post: <ma...@xerces.apache.org>
List-Id: <commits.xerces.apache.org>
Delivered-To: mailing list commits@xerces.apache.2/VC7.1/xerces-all/SAXCount/SAXCount.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXCount/SAXCount.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xorg
Received: (qmail 32973 invoked by uid 99); 23 Jul 2005 21:13:48 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Jul 2005 14:13:48 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
by apache.org (qpsmtpd/0.29) with SMTP; Sat, 23 Jul 2005 14:13:40 -0700
Received: (qmail 65273 invoked by uid 65534); 23 Jul 2005 21:13:44 -0000
Message-ID: <20...@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r224543 [4/5] - in /xerces/c/trunk:
Projects/Win32/BCC.551/Xerces-all/XercesLib/
Projects/Win32/VC6/xerces-all/XercesLib/
Projects/Win32/VC7.1/xerces-all/CreateDOMDocument/
Projects/Win32/VC7.1/xerces-all/DOMCount/ Projects/Win32/VC7.1/xerc...
Date: Sat, 23 Jul 2005 21:13:13 -0000
To: commiterces-all/SAXPrint/SAXPrint.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SAXPrint/SAXPrint.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj?rev=224543&r1=224542&r2=224543&view=diff
========================================s@xerces.apache.org
From: amassari@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.cpp Sat Jul 23 14:11:41 2005
@@ -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 };
-
-/* c======================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SCMPrint/SCMPrint.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj (data-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, chLoriginal)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/SEnumVal/SEnumVal.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/StdInParse/StdInParse.vcproj Sat Jul 23 14:atin_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::fgNORMALIZE11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/ThreadTest/ThreadTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSValueTest/XSValueTest.vcproj Sat Jul 23 14:11:41 2005
@@ -26,6 +26,7 @@
PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="FALSE"
PrecompiledHeaderFile=".\..\..\..\..\..\Build_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 };
-\Win32\VC7.1\Debug\obj/XSValueTest.pch"
AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XSerializerTest/XSerializerTest.vcproj Sat Jul 23 14:11:41 2005
@@ -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"
AssemblerListingLo
-/* 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, ccation=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj Sat Jul 23 14:11:41 2005
@@ -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"
AssemblerListinghLatin_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 @@
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)) {
- Location=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
ObjectFile=".\..\..\..\..\..\Build\Win32\VC7.1\Debug\obj/"
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj Sat Jul 23 14:11:41 2005
@@ -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_STRNIC 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,MP;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 @@
<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).msv value)) {
+ throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, fMemoryManager);
+ }
+
+ DOMConfigurationFeature whichFlag = getFeatureFlag(lowerCaseName);
+ if(value) {
+ featureValues |= whichFlag;
+ } else {
+ featureValues &= ~whichFlag;
}
}
@@ -137,17 +91,17 @@
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 @@
* 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)) {
+ c.hpp"
Outputs="$(InputPath)"/>
</FileConfiguration>
@@ -493,7 +496,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>
@@ -502,7 +506,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>
@@ -1193,10 +1198,10 @@
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 @@
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">
@@ -2315,9 +2320,6 @@
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMAttr.hpp">
</File>
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) retur <File
- RelativePath="..\..\..\..\..\src\xercesc\dom\DOMBuilder.hpp">
- </File>
- <File
RelativePath="..\..\..\..\..\src\xercesc\dom\DOMCDATASection.hpp">
</File>
<File
@@ -2381,10 +2383,31 @@
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="..\..\.n 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:
- .\..\..\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">
@@ -2429,12 +2452,6 @@
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>
<File
@@ -2582,6 +2599,12 @@
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>
<File
@@ -2670,12 +2693,6 @@
</File>
<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">
Modified: xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/xerces-com/xerces-com.vcproj (original)
+++ xerces/c/trunk/Projects/Win32/V 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; // requiredC7.1/xerces-all/xerces-com/xerces-com.vcproj Sat Jul 23 14:11:41 2005
@@ -97,6 +97,7 @@
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"
Modified: xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp (original)
+++ xerces/c/trunk/samples/src/DOMCount/DOMCount.cpp Sat Jul 23 14:11:41 2005
@@ -26,7 +26,7 @@
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
#include <xercesc/dom/DOMImplementationRegistry.h //
-
- 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 rpp>
-#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 @@
{
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 @@
// 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_SYNCHRONOUSeturn 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 //
+ , 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 == Abs 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 //
+ tractDOMParser::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
Modified: xerces/c/trunk/samples/src/DOMPrint/DOMPrint.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/samples/src/DOMPrint/DOMPrint.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMPrint/DOMPrint.cpp (original)
+++ xerces/c/trunk/samples/src/DOMPrint/DOMPrint.cpp default: return false; // should never be here
}
return false;
}
+const RefVectorOf<const XMLCh*>* DOMConfigurationImpl::getParameterNames() const
+{
+ return 0;
+}
+
// -------------------------------------------
// Impl methods
// -------------------------------------------
@@ -249,34 +216,34 @@
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: Sat Jul 23 14:11:41 2005
@@ -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 <xe: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)) {
rcesc/dom/DOMWriter.hpp>
+#include <xercesc/dom/DOMLSSerializer.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <xercesc/framework/LocalFileFormatTarget.hpp>
@@ -129,7 +129,7 @@
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 @@
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 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, XM Validation scheme [always | never | auto*].\n"
@@ -430,10 +430,10 @@
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 @@
// 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
- LUni::fgDOMElementContentWhitespace)) {
+ return FEATURE_ELEMENT_CONTENT_WHITESPACE;
} else {
throw DOMException(DOMException::NOT_FOUND_ERR, 0, fMemoryManager);
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMConfigurationImpl.hpp Sat Jul 23 14:11:41 2005
@@ -69,7 +69,7 @@
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 @@
// Se // 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 @@
// 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:tter 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 XML: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))
+ Ch* name, bool value) const;
+ virtual const RefVectorOf<const XMLCh*>* getParameterNames() const;
// ---------------------------------------------------------------------------
// Impl specific methods
@@ -113,30 +116,8 @@
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 XMLC 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 @@
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;
Modified: xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp
URL: http://svn.apache.org/viewcvsh 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 @@
// the schema location
const XMLCh* fSchemaLocation;
- static const bool fFalse;
- static const bool fTrue;
-
MemoryManager* fMemoryManager;
};
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/d/xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp (original)
+++ xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp Sat Jul 23 14:11:41 2005
@@ -39,13 +39,12 @@
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 @@
om/impl/DOMImplementationImpl.cpp Sat Jul 23 14:11:41 2005
@@ -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 {
// 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
Modified: xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp (original)
+++ xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp Sat Jul 23 14:11:41 2005
@@ -26,11 +26,11 @@
#ifndef DOMPrintFilter_HEADER_GUARD_
#define DOMPrintFilter_HEADER_GUARD_
-#include <xercesc/dom/DOMWriterFilter.hpp>
+#include <xercesc/d to "1.0"
{chDigit_1, chPeriod, chDigit_0, chNull};
@@ -130,8 +127,8 @@
// 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()
@@ -266,6 +263,19 @@
bool DOMImplementation::loadDOMExceptionMsg
(
+ const DOMLSException::LSExceptionCode msgToLoad
+ , XMLCh* const toFill
+ , const unsigned int maxChars
+)
+{
+ // load the text, the msgToLoad+XMLDOMMsgs:om/DOMLSSerializerFilter.hpp>
XERCES_CPP_NAMESPACE_USE
-class DOMPrintFilter : public DOMWriterFilter {
+class DOMPrintFilter : public DOMLSSerializerFilter {
public:
/** @name Constructors */
@@ -46,8 +46,6 @@
//@{
virtual unsigned long getWhatToShow() const {return fWhatToShow;};
-
- virtual void setWhatToShow(unsigned long toShow) {fWhatToShow = toShow;};
private:
// unimplemented copy ctor and assignement operator
Modified: xerces/c/trunk/scripts/sanityTest_ExpectedResult.log
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/scripts/sanityTest_ExpectedResult.log?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/scripts/sanityTest_ExpectedResult.log (original)
+++ xerces/c/trunk/scripts/sanityTest_ExpectedResult.log Sat Jul 23 14:11:41 2005
@@ -610,7 +610,7 @@
Usage:
DOMCount [options] <XML file | List file>
-This program invokes the DOMBuilder, builds the DOM tree,
+This pr: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
, XMLCh* const toFill
, const unsigned int maxChars
@@ -279,30 +289,37 @@
// 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 managerogram invokes the DOMLSParser, builds the DOM tree,
and then prints the number of elements found in each XML file.
Options:
@@ -634,7 +634,7 @@
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:
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
Modified: xerces/c/trunk/src/Makefile.am
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/,
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;
+}
// ----------Makefile.am?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Sat Jul 23 14:11:41 2005
@@ -254,7 +254,6 @@
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 @@
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 \
@--------------------------------------------------
// DOMImplementationSource Virtual interface
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp Sat Jul 23 14:11:41 2005
@@ -76,13 +76,13 @@
// 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 = XMLPlatformUtil@ -291,8 +296,6 @@
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_sources = \
xercesc/dom/DOMException.cpp \
+ xercesc/dom/DOMLSException.cpp \
xercesc/dom/DOMRangeException.cpp \
xercesc/dom/DOMXPathException.cpp
@@ -345,7 +349,7 @@
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 @@
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 \
xercs::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
Copied: xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp (from r201963, xeresc/dom/impl/XSDElementNSImpl.cpp
@@ -427,7 +431,7 @@
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 @@
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 @@
parsers_headers = \
xercesc/parsers/AbstractDOMParser.hpp \
- xercesc/parsers/DOMBuilderImpl.hpp \
+ xercesc/parsers/DOMLSParserImpl.hpp \
xercesc/parsers/SAX2XMLFilterImpl.hpp \
xercesc/parsers/SAX2XMLReaderImpl.hpp \
xerceces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.cpp)
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp?p2=xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp&p1=xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.cpp&r1=201963&r2=224543&rev=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp Sat Jul 23 14:11:41 2005
@@ -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 @@
// REVISIT: use throwing exception to abort serializasc/parsers/SAXParser.hpp \
@@ -572,7 +576,7 @@
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 \
Modified: xerces/c/trunk/src/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/Makefile.in?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.in (original)
+++ xerces/c/trunk/src/Makefile.in Sat Jul 23 14:11:41 2005
@@ -180,7 +180,7 @@
@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,7tion 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 @@
throw e; \
}
-DOMWriterImpl::~DOMWriterImpl()
+DOMLSSerializerImpl::~DOMLSSerializerImpl()
{
fMemoryManager->deallocate(fEncoding);//delete [] fEncoding;
fMemoryManager->deallocate(fNewLine);//delete [] fNewLine;
@@ -290,7 +291,7 @@
// 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 @@
}
-bool DOMW +220,7 @@
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 @@
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 @@
@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/SAX2XMLReaderImpriterImpl::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)
+l.lo \
xercesc/parsers/SAXParser.lo \
@@ -1106,7 +1106,6 @@
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 @@
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 @@
xercesc/dom/DOMTreeWalker.hpp \
xercesc/dom/DOMTypeInfo.hpp \
xercesc/dom/DOMUserDataHandler.hpp \
- xercesc/dom/DOMWriter.hpp \
- xercesc/dom/DOMWriterFilter.hpp \
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 @@
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::xercesc/dom/DOMXPathEvaluator.hpp \
xercesc/dom/DOMXPathException.hpp \
xercesc/dom/DOMXPathExpression.hpp \
@@ -1155,6 +1158,7 @@
dom_sources = \
xercesc/dom/DOMException.cpp \
+ xercesc/dom/DOMLSException.cpp \
xercesc/dom/DOMRangeException.cpp \
xercesc/dom/DOMXPathException.cpp
@@ -1196,7 +1200,7 @@
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 @@
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 @@
xercesc/framework/StdOutFormatTarget.hpp \
xercesc/framework/URLInputSource.hpp \
xercesc/framework/ValidationContexgetParameterNames() 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;
}
-voit.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 @@
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 @@
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_sources = \
xercesc/parsers/AbstractDOMParser.cpp \
- xercesc/parsers/DOMBuilderImpl.cpp \
+ xercesc/parsers/DOMLSd 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 @@
//
//
//
-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 @@
}
catch (const TranscodingException& e)
{
- reportError(&nodeToWrite, DParserImpl.cpp \
xercesc/parsers/SAX2XMLFilterImpl.cpp \
xercesc/parsers/SAX2XMLReaderImpl.cpp \
xercesc/parsers/SAXParser.cpp \
@@ -2103,6 +2107,8 @@
@: > 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/$(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__OMError::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 @@
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 @@
try
{
- retVal = writeNode(&destination, nodeToWrite);
+ retVal = write(ndirstamp) \
@@ -2314,7 +2321,7 @@
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/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 @@
-rm -f *.$(OBJEXT)
-rm -f xercesc/dom/DOMException.$(OBJEXT)
-rm -f xercesc/dom/DOMException.lo
+ -rm -f xercesc/dom/DOMLSEodeToWrite, &destination);
}
catch(const OutOfMemoryException&)
{
@@ -537,7 +561,7 @@
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 @@
// 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 @@
}
-bool DOMWriterImpl::customNodeSerialize(const DOMNode* const, int) {
+bool DOMLSSerializerImpl::customNodeSerialize(const DOMNode* const, int) {
return false;
}
//
//
-DOMNodeFilter::FilterAction DOMWriterImpl::checkFilter(const DOMNode* const node) cxception.$(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 @@
-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 @@
-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/frameonst
+DOMNodeFilter::FilterAction DOMLSSerializerImpl::checkFilter(const DOMNode* const node) const
{
if (!fFilter ||
((fFilter->getWhatToShow() & (1 << (node->getNodeType() - 1))) == 0))
@@ -1317,7 +1341,7 @@
}
-bool DOMWriterImpl::checkFeature(const XMLCh* const featName
+bool DOMLSSerializerImpl::checkFeature(const XMLCh* const featName
, bool toThrow
, int& featureId) const
{
@@ -1366,7 +1390,7 @@
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 @@
return toContinueProcess;
}
-bool DOMWriterImpl::reportError(const DOMNode* const errorNode
+bool DOMLSSerializerImpl::reportError(const DOMNode* const errorNode
work/BinOutputStream.$(OBJEXT)
@@ -3196,8 +3205,8 @@
-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 @@
-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 , DOMError::ErrorSeverity errorType
, XMLDOMMsg::Codes toEmit)
{
@@ -1415,7 +1439,7 @@
//
//
//
-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::procUnrepCharInCdataSection(const XMLCh* const nodeValue
+void DOMLSSerializerImpl::procUnrepCharInCdataSection(const XMLCh* const nodeValue
, const DOMNode* const nodeToWrite
, int level)
{
@@ -1581,18 +1605,18 @@
}
}
-void DOMWriterImpl::processNode(const DOMNode* const nodeToWrite)
+void DOMLSSerializerImpl::processNode(const DOMNode* const nodeToWrite)
{
processNode(nodeToWrite, 0);
}
-bool DOMWriterImpl::canSetFeatur.lo
-rm -f xercesc/parsers/SAX2XMLReaderImpl.$(OBJEXT)
@@ -3725,6 +3734,7 @@
-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 @@
@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/de(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::printIndent(int level) const
+void DOMLSSerializerImpl::printIndent(int level) const
{
if (getFeature(FORMAT_PRETTY_PRINT_ID))
{
@@ -1619,13 +1643,13 @@
}
}
-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))
Copied: xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.om/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 @@
@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 @@
@AMDEP_TRUE@@am__include@ @am__quote@xercesc/framework/$(DEPDhpp (from r201963, xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.hpp)
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp?p2=xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp&p1=xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.hpp&r1=201963&r2=224543&rev=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMWriterImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.hpp Sat Jul 23 14:11:41 2005
@@ -18,227 +18,12 @@
* $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</codIR)/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 @@
@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.e> 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 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@
Modified: xerces/c/trunk/src/xercesc/dom/DOM.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/DOM.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOM.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOM.hpp Sat Jul 23 14:11:41 2005
@@ -55,8 +55,7 @@
#include <xercesc/dom/DOMTreeWalker.hpp>
// Introduced in DOM Level 3
-// Experimental - subject to change
-#include <xercesc/dom/DOMBuilder.hpp>
+#iexternal 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 nclude <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>
Modified: xerces/c/trunk/src/xercesc/dom/DOMConfiguration.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/DOMConfiguration.hpp?rev=224543&r1=224542&r2=224543&view=diff
===============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 ===============================================================
--- xerces/c/trunk/src/xercesc/dom/DOMConfiguration.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMConfiguration.hpp Sat Jul 23 14:11:41 2005
@@ -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 Saveof 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] 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 @@
* 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 @@
* within an error handler will result in implementation
* dependent behaviour.
*
- * Issue DOMConfiguration-4:
- * Should we say non "readonly" operations are
- * implementation 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<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 @@
* 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 @@
* [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
- * /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 nu "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 @@
* [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 @@
* won't be removed if an implementation does not have
* any information available.
*
- * Issue normalizationFeatumber 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
- * ']]>' re-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 @@
* 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
* [requior 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 <cored] (default)
* Remove all EntityReference and Entity
@@ -271,23 +223,9 @@
* 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 Fede>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,
- b 2002).
- *
* "namespaces"
*
* true
@@ -384,19 +322,12 @@
* 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 @@
* @since DOM level 3
**/
virtual void setParameter(const XMLCh* name, const void* value) = 0;
+ virtual void setParameter(const XMLCh* name, bool value) = 0;
* 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]
// -----------------------------------------------------------------------
// Getter methods
@@ -486,6 +418,17 @@
* @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
---------------------------------------------------------------------
To unsubscr- * 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_
+#ifndef DOMLSSerializerImpl_HEADER_GUARD_
+#define DOMLSSerializerImpl_HEADER_GUARD_
#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
+#include <xercesc/dom/DOMLSSerializer.hpp>
#include <xercesc/util/XMLDOMMsg.hpp>
#include <xercesc/util/RefHashTableOf.hpp>
#include <xercesc/util/RefVectorOf.hpp>
@@ -246,8 +31,10 @@
XERCES_Cibe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org
PP_NAMESPACE_BEGIN
-class CDOM_EXPORT DOMWriterImpl:public XMemory,
- public DOMWriter {
+class CDOM_EXPORT DOMLSSerializerImpl : public XMemory,
+ public DOMLSSerializer,
+ public DOMConfiguration
+{
public:
@@ -257,51 +44,55 @@
/**
* Constructor.
*/
- DOMWriterImpl(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+ DOMLSSerializerImpl(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
/**
* Destructor.
*/
- ~DOMWriterImpl();
+ ~DOMLSSerializerImpl();
//@}
- /** @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;
+ /** @name Implementation of DOMLSSerializer interface */
+ //@{
- virtual void setNewLine(const XMLCh* const newLine);
- virtual const XMLCh* getNewLine() const;
+ virtual DOMConfiguration* getDomConfig();
- virtual void setErrorHandler(DOMErrorHandler *errorHandler);
- virtual DOMErrorHandler* getErrorHandler() const;
+ virtual void setEncoding(const XMLCh* const encoding);
+ virtual const XMLCh* getEncoding() const;
- virtual void setFilter(DOMWriterFilter *filter);
- virtual DOMWriterFilter* getFilter() const;
+ virtual void setNewLine(const XMLCh* const newLine);
+ virtual const XMLCh* getNewLine() const;
- virtual bool writeNode(XMLFormatTarget* const destination
- , const DOMNode &nodeToWrite);
- virtual void release();
+ 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();
- virtual XMLCh* writeToString(const DOMNode &nodeToWrite);
+ //@}
+
+ /** @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 */
- DOMWriterImpl(const DOMWriterImpl&);
- DOMWriterImpl & operator = (const DOMWriterImpl&);
+ DOMLSSerializerImpl(const DOMLSSerializerImpl&);
+ DOMLSSerializerImpl & operator = (const DOMLSSerializerImpl&);
/** helper **/
void initSession(const DOMNode* const);
@@ -373,15 +164,15 @@
// The XML Version of the document to be serialized.
//
// fEncodingUsed (session var)
- // the actual encoding used in WriteNode(),
+ // the actual encoding used in write(),
// it does not own any data(memory).
//
// fNewLineUsed (session var)
- // the actual "end of line" sequence used in WriteNode(),
+ // the actual "end of line" sequence used in write(),
// it does not own any data(memory).
//
// fFormatter (session var)
- // the formatter used in WriteNode()
+ // the formatter used in write()
//
// fErrorCount
// the count of error encountered in the serialization,
@@ -399,7 +190,7 @@
XMLCh *fEncoding;
XMLCh *fNewLine;
DOMErrorHandler *fErrorHandler;
- DOMWriterFilter *fFilter;
+ DOMLSSerializerFilter *fFilter;
const XMLCh *fDocumentVersion;
//session vars
@@ -413,18 +204,23 @@
MemoryManager* fMemoryManager;
};
-inline void DOMWriterImpl::setFeature(const int featureId
+inline DOMConfiguration* DOMLSSerializerImpl::getDomConfig()
+{
+ return this;
+}
+
+inline void DOMLSSerializerImpl::setFeature(const int featureId
, bool val)
{
(val)? fFeatures |= (1<<featureId) : fFeatures &= ~(1<<featureId);
};
-inline bool DOMWriterImpl::getFeature(const int featureId) const
+inline bool DOMLSSerializerImpl::getFeature(const int featureId) const
{
return ((fFeatures & ( 1<<featureId )) != 0) ? true : false;
};
-inline void DOMWriterImpl::setURCharRef()
+inline void DOMLSSerializerImpl::setURCharRef()
{
fFormatter->setUnRepFlags(XMLFormatter::UnRep_CharRef);
}
Modified: xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/LocalFileFormatTarget.cpp Sat Jul 23 14:11:41 2005
@@ -114,7 +114,7 @@
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;
Modified: xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/MemBufFormatTarget.hpp Sat Jul 23 14:11:41 2005
@@ -27,7 +27,7 @@
/*
* 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
Copied: xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.cpp (from r201963, xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.cpp)
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.cpp?p2=xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.cpp&p1=xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.cpp&r1=201963&r2=224543&rev=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.cpp Sat Jul 23 14:11:41 2005
@@ -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 @@
ThrowXMLwithMemMgr(NullPointerException, XMLExcepts::CPtr_PointerIsZero, getMemoryManager());
}
-Wrapper4DOMInputSource::~Wrapper4DOMInputSource()
+Wrapper4DOMLSInput::~Wrapper4DOMLSInput()
{
if (fAdoptInputSource)
delete fInputSource;
@@ -50,62 +50,62 @@
// ---------------------------------------------------------------------------
-// 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
Copied: xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp (from r201963, xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.hpp)
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp?p2=xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp&p1=xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.hpp&r1=201963&r2=224543&rev=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/Wrapper4DOMInputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/Wrapper4DOMLSInput.hpp Sat Jul 23 14:11:41 2005
@@ -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 @@
/**
* 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 @@
* Destructor
*
*/
- virtual ~Wrapper4DOMInputSource();
+ virtual ~Wrapper4DOMLSInput();
//@}
@@ -69,7 +69,6 @@
/** @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 @@
/** @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 @@
/**
- * <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 @@
/**
- * <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 @@
*/
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 @@
//@{
/**
- * <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 @@
/**
- * <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 @@
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 @@
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 @@
// -----------------------------------------------------------------------
// 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
Modified: xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.cpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.cpp Sat Jul 23 14:11:41 2005
@@ -102,7 +102,7 @@
// ---------------------------------------------------------------------------
// Wrapper4InputSource: Stream methods
// ---------------------------------------------------------------------------
-BinInputStream* Wrapper4InputSource::makeStream() const
+BinInputStream* Wrapper4InputSource::getByteStream() const
{
return fInputSource->makeStream();
}
Modified: xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/Wrapper4InputSource.hpp Sat Jul 23 14:11:41 2005
@@ -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 @@
/**
- * 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 @@
/** @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 @@
*
* @see BinInputStream
*/
- BinInputStream* makeStream() const;
+ BinInputStream* getByteStream() const;
//@}
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp?rev=224543&r1=224542&r2=224543&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp Sat Jul 23 14:11:41 2005
@@ -47,7 +47,7 @@
/**
* 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 :
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org