diff --git a/doc/build-winunix.xml b/doc/build-winunix.xml
index a972e77583f39410cea2681bd591038fcf7d6251..bf34e6afa187dffa8411b207420d4d508ab56268 100644
--- a/doc/build-winunix.xml
+++ b/doc/build-winunix.xml
@@ -33,8 +33,12 @@
all other samples is in:</p>
<p>For MSVC Version 6:</p>
<source>&XercesCSrcInstallDir;\Projects\Win32\VC6\xerces-all\xerces-all.dsw</source>
- <p>For MSVC Version 7 (Visual C++.Net):</p>
+ <p>For MSVC Version 7 (Visual C++ .NET 2002):</p>
<source>&XercesCSrcInstallDir;\Projects\Win32\VC7\xerces-all\xerces-all.sln</source>
+ <p>For MSVC Version 7.1 (Visual C++ .NET 2003):</p>
+<source>&XercesCSrcInstallDir;\Projects\Win32\VC7.1\xerces-all\xerces-all.sln</source>
+ <p>For MSVC Version 8.0 (Visual C++ .NET 2005):</p>
+<source>&XercesCSrcInstallDir;\Projects\Win32\VC8\xerces-all\xerces-all.sln</source>
<p>Once you are inside MSVC, you need to build the project marked
<em>XercesLib</em>.</p>
@@ -42,6 +46,8 @@
you need to pick up:</p>
<source>(For MSVC V6) &XercesCSrcInstallDir;\Projects\Win32\VC6\xerces-all\XercesLib\XercesLib.dsp
(For MSVC V7) &XercesCSrcInstallDir;\Projects\Win32\VC7\xerces-all\XercesLib\XercesLib.vcproj</source>
+(For MSVC V7.1) &XercesCSrcInstallDir;\Projects\Win32\VC7.1\xerces-all\XercesLib\XercesLib.vcproj</source>
+(For MSVC V8) &XercesCSrcInstallDir;\Projects\Win32\VC8\xerces-all\XercesLib\XercesLib.vcproj</source>
<p>You must make sure that you are linking your application with
the &XercesCWindowsLib;.lib library and also make sure that
the associated DLL is somewhere in your path.</p>
diff --git a/doc/dom3.xml b/doc/dom3.xml
index f3b27d661aff60c060ec463465e575b0878da46d..3f0ce437508436f8736f5f92e7d37bde5b0463a3 100644
--- a/doc/dom3.xml
+++ b/doc/dom3.xml
@@ -18,66 +18,27 @@
<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
<s1 title="DOM Level 3 Support">
-<s2 title="Disclaimer">
- <p>
- The &XercesCName; &XercesCVersion; contains a partial implementation of the W3C Document Object Model
- Level 3. This implementation is experimental. The DOM Level 3 specification is
- still in working draft stage: you should not consider this implementation complete or correct.</p>
- <p>The limitations of this implementation are detailed below.
- Please, read this document before using &XercesCName; &XercesCVersion;.
- </p>
-</s2>
<s2 title="Introduction">
<p>
- The &XercesCName; &XercesCVersion; contains an experimental implementation of
- a subset of the W3C DOM Level 3 as specified in </p>
+ The &XercesCName; &XercesCVersion; contains an implementation of the W3C DOM Level 3 as specified in </p>
<ul>
<li><jump href="http://www.w3.org/TR/DOM-Level-3-Core/">
- DOM Level 3.0 Core Specification</jump>, Version 1.0 W3C Working Draft 26 February 2003 and </li>
+ DOM Level 3.0 Core Specification</jump>, Version 1.0 W3C Recommendation 07 April 2004</li> and
<li> <jump href="http://www.w3.org/TR/DOM-Level-3-LS/">
Document Object Model (DOM) Level 3 Load and Save Specification</jump>,
- Version 1.0 W3C Working Draft 26 February 2003 </li>
+ Version 1.0 W3C Recommendation 07 April 2004</li>
</ul>
</s2>
<s2 title='Implementation of DOM Level 3 Core'>
- <p>The following are implemented in &XercesCName; &XercesCVersion;.</p>
+ <p>The following are NOT implemented in &XercesCName; &XercesCVersion;.</p>
<ul>
<li>
- <code>DOMImplementationRegistry</code>, <code>DOMImplementationSource</code>
- </li>
- <li>
- <code>DOMException</code>: VALIDATION_ERR
- </li>
- <li>
- <code>DOMDocument</code>: set/getActualEncoding, set/getEncoding, set/getVersion, set/getStandalone,
- set/getDocumentURI, set/getStrictErrorChecking, renameNode, normalizeDocument
- </li>
- <li>
- <code>DOMEntity</code>: set/getActualEncoding, set/getEncoding, set/getVersion
- </li>
- <li>
- <code>DOMErrorHandler</code>, <code>DOMError</code>, <code>DOMLocator</code>
- </li>
- <li>
- <code>DOMNode</code>: set/getUserData, isSameNode, isEqualNode, compareTreePosition, lookupNamespaceURI, lookupNamespacePrefix, isDefaultNamespace, baseURI
- </li>
- <li>
- <code>DOMText</code>: getIsWhitespaceInElementContent
+ <code>DOMError</code>: setRelatedException
</li>
<li>
- <code>DOMAttr</code>: isID, getTypeInfo
+ <code>DOMImplementation</code>: createLSParser(MODE_ASYNCHRONOUS)
</li>
- <li>
- <code>DOMElement</code>: setIdAttributeNode, setIdAttributeNS, setIdAttribute, getTypeInfo
- </li>
- <li>
- <code>DOMUserDataHandler</code>
- </li>
- <li>
- <code>DOMConfiguration</code>
- </li>
-
</ul>
</s2>
@@ -85,24 +46,12 @@
<p>The following are implemented in &XercesCName; &XercesCVersion;.</p>
<ul>
<li>
- <code>DOMImplementationLS</code>
- </li>
- <li>
- <code>DOMBuilder</code>: does not provide implementation of parseWithContext() and <code>DOMBuilderFilter</code>.
- </li>
- <li>
- <code>DOMEntityResolver</code>
- </li>
- <li>
- <code>DOMInputSource</code>
- </li>
- <li>
- <code>DOMWriter</code> and <code>DOMWriterFilter</code>
+ <code>DOMLSParser</code>: parseWithContext()</code>.
</li>
</ul>
</s2>
-<s2 title='Implementation of DOM Level 3 Abstract Schemas'>
+<s2 title='Implementation of DOM Level 3 Validation'>
<p>The entire section has not been implemented in &XercesCName; &XercesCVersion;.</p>
</s2>
diff --git a/doc/domprint.xml b/doc/domprint.xml
index 7174c7e53b7fb0c6e4eca0fceeda3c1ee78272ba..215ec3e5107e08bddb592c6733490cd31f369fc7 100644
--- a/doc/domprint.xml
+++ b/doc/domprint.xml
@@ -21,7 +21,7 @@
<s2 title="DOMPrint">
<p>DOMPrint parses an XML file, constructs the DOM tree, and
- invokes DOMWriter::writeNode() to serialize the resultant
+ invokes DOMLSSerializer::write() to serialize the resultant
DOM tree back to XML stream.
</p>
@@ -29,7 +29,7 @@
<p>The DOMPrint sample parses an XML file, using either a validating
or non-validating DOM parser configuration, builds a DOM tree,
- and then invokes DOMWriter::writeNode() to serialize the
+ and then invokes DOMLSSerializer::write() to serialize the
resultant DOM tree. To run DOMPrint, enter the following:</p>
<source>DOMPrint <XML file></source>
<p>The following parameters may be set from the command line </p>
@@ -38,7 +38,7 @@ Usage:
DOMPrint [options] <XML file>
This program invokes the DOM parser, and builds the DOM tree
-It then asks the DOMWriter to serialize the DOM tree.
+It then asks the DOMLSSerializer to serialize the DOM tree.
Options:
-e create entity reference nodes. Default is no expansion.
@@ -124,7 +124,7 @@ DOMPrint -v=always personal.xml
</p>
<p>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.
diff --git a/doc/faq-parse.xml b/doc/faq-parse.xml
index 746cbf58cad2d63ff234baba5f3b064055e67647..8a56825f74f995837816416fb068c6af9093506f 100644
--- a/doc/faq-parse.xml
+++ b/doc/faq-parse.xml
@@ -433,9 +433,9 @@ void myParsingFunction()
<p>Please make sure you are using &XercesCName; &XercesCVersion; or up.</p>
<p>You can use
- the DOMWriter::writeToString, or DOMWriter::writeNode to serialize a DOM tree.
+ the DOMLSSerializer::writeToString, or DOMLSSerializer::write to serialize a DOM tree.
Please refer to the sample DOMPrint or the API documentation for more details of
- DOMWriter.</p>
+ DOMLSSerializer.</p>
</a>
</faq>
@@ -769,10 +769,10 @@ t->transcodeFrom(source_Big5, length, result_unicode, length, bytesEaten, (un
<a>
<p>The function <code>SAX2XMLReader::setProperty(const XMLCh* const name, void* value)</code>
- and <code>DOMBuilder::setProperty(const XMLCh* const name, void* value)</code>
+ and <code>DOMLSParser::getDomConfig()->setParameter(const XMLCh* name, const void* value)</code>
takes a void pointer for the property value. Application is required to initialize this void pointer
to a correct type. See <jump href="program-sax2.html#SAX2Properties">SAX2 Programming Guide</jump>
- and <jump href="program-dom.html#DOMBuilderProperties">DOM Programming Guide</jump>
+ and <jump href="program-dom.html#DOMLSParserProperties">DOM Programming Guide</jump>
to learn exactly what type of property value that each property expects for processing.
Passing a void pointer that was initialized with a wrong type will lead to unexpected result.
</p>
@@ -787,7 +787,7 @@ t->transcodeFrom(source_Big5, length, result_unicode, length, bytesEaten, (un
<a>
<p>The function <code>void* SAX2XMLReader::getProperty(const XMLCh* const name)</code>
- and <code>void* DOMBuilder::getProperty(const XMLCh* const name)</code>
+ and <code>void* DOMLSParser::getDomConfig()->getParameter(const XMLCh* name)</code>
returns a void pointer for the property value. See
<jump href="program-sax2.html#SAX2Properties">SAX2 Programming Guide</jump> and
exactly what type of object each property returns.
@@ -799,7 +799,7 @@ t->transcodeFrom(source_Big5, length, result_unicode, length, bytesEaten, (un
somewhere else; otherwise you may get unexpected result. Since the returned
pointer is a generic void pointer, see
<jump href="program-sax2.html#SAX2Properties">SAX2 Programming Guide</jump> and
- <jump href="program-dom.html#DOMBuilderProperties">DOM Programming Guide</jump> to learn
+ <jump href="program-dom.html#DOMLSParserProperties">DOM Programming Guide</jump> to learn
exactly what type of property value each property returns for replication.
</p>
@@ -855,24 +855,24 @@ t->transcodeFrom(source_Big5, length, result_unicode, length, bytesEaten, (un
</a>
</faq>
- <faq title="Why does the XML data generated by the DOMWriter does not match my original XML input?">
+ <faq title="Why does the XML data generated by the DOMLSSerializer does not match my original XML input?">
- <q>Why does the XML data generated by the DOMWriter does not match my original XML input?</q>
+ <q>Why does the XML data generated by the DOMLSSerializer does not match my original XML input?</q>
<a>
- <p>If you parse an xml document using XercesDOMParser or DOMBuilder and pass such DOMNode
- to DOMWriter for serialization, you may not get something that is exactly the same
+ <p>If you parse an xml document using XercesDOMParser or DOMLSParser and pass such DOMNode
+ to DOMLSSerializer for serialization, you may not get something that is exactly the same
as the original XML data. The parser may have done normalization, end of line conversion,
or has expanded the entity reference as per the XML 1.0 spec, 4.4 XML Processor Treatment of
- Entities and References. From DOMWriter perspective, it does not know what the original
+ Entities and References. From DOMLSSerializer perspective, it does not know what the original
string was, all it sees is a processed DOMNode generated by the parser.
- But since the DOMWriter is supposed to generate something that is parsable if sent
- back to the parser, it will not print the DOMNode node value as is. The DOMWriter
+ But since the DOMLSSerializer is supposed to generate something that is parsable if sent
+ back to the parser, it will not print the DOMNode node value as is. The DOMLSSerializer
may do some "touch up" to the output data for it to be parsable.</p>
- <p>See <jump href="program-dom.html#DOMWriterEntityRef">How does DOMWriter handle built-in entity
- Reference in node value?</jump> to understand further how DOMWriter touches up the entity reference.
+ <p>See <jump href="program-dom.html#DOMLSSerializerEntityRef">How does DOMLSSerializer handle built-in entity
+ Reference in node value?</jump> to understand further how DOMLSSerializer touches up the entity reference.
</p>
</a>
</faq>
diff --git a/doc/html/ApacheDOMC++BindingL3.html b/doc/html/ApacheDOMC++BindingL3.html
index c92b4b065606ddb399b4ac7ac445e270bf181510..39834cad3ae87bc839bac740b98aaf8320535754 100644
--- a/doc/html/ApacheDOMC++BindingL3.html
+++ b/doc/html/ApacheDOMC++BindingL3.html
@@ -2563,8 +2563,8 @@ DOMDocument
<td><font face="Courier New,Courier"><font size=-1>DOMDocumentType*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>createDocumentType(const XMLCh *qName, const XMLCh* publicId,
- const XMLCh* systemId
+<td><font face="Courier New,Courier"><font size=-1>createDocumentType(const XMLCh *qName, const XMLCh*, //publicId,
+ const XMLCh* //systemId
)
</font></font></td>
</tr>
@@ -3792,7 +3792,7 @@ DOMImplementationLS
<td><font face="Courier New,Courier"><font size=-1>DOMLSInput*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>createLSInput() = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>createLSInput(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -3802,7 +3802,7 @@ DOMImplementationLS
<td><font face="Courier New,Courier"><font size=-1>DOMLSOutput*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>createLSOutput() = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>createLSOutput(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
<td><font face="Courier New,Courier"><font size=-1>};</font></font></td>
@@ -3852,7 +3852,7 @@ DOMLSInput
<td><font face="Courier New,Courier"><font size=-1>const XMLCh*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>getCharacterStream() const = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>getStringData() const = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -3860,7 +3860,7 @@ DOMLSInput
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>BinInputStream*</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>InputSource*</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getByteStream() const = 0;</font></font></td>
</tr>
@@ -3912,7 +3912,7 @@ DOMLSInput
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>setCharacterStream(const XMLCh* data) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>setStringData(const XMLCh* data) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -3922,7 +3922,7 @@ DOMLSInput
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>setByteStream(BinInputStream* stream) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>setByteStream(InputSource* stream) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -3972,7 +3972,7 @@ DOMLSInput
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>setIssueFatalErrorIfNotFound(const bool flag) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>setIssueFatalErrorIfNotFound(bool flag) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -4040,6 +4040,16 @@ DOMLSOutput
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>XMLFormatTarget*</font></font></td>
+
+<td><font face="Courier New,Courier"><font size=-1>getByteStream() const = 0;</font></font></td>
+</tr>
+
+<tr ALIGN=LEFT VALIGN=TOP>
+<td></td>
+
+<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
+
<td><font face="Courier New,Courier"><font size=-1>const XMLCh*</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getEncoding() const = 0;</font></font></td>
@@ -4062,7 +4072,7 @@ DOMLSOutput
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>setEncoding(const XMLCh* const encodingStr) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>setByteStream(XMLFormatTarget* stream) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -4072,7 +4082,7 @@ DOMLSOutput
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>setSystemId(const XMLCh* const systemId) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>setEncoding(const XMLCh* const encodingStr) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -4080,9 +4090,9 @@ DOMLSOutput
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>BinInputStream*</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>makeStream() const = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>setSystemId(const XMLCh* const systemId) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -4192,7 +4202,7 @@ DOMLSParser
<td><font face="Courier New,Courier"><font size=-1>DOMDocument*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>parse(const DOMLSInput& source) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>parse(const DOMLSInput* source) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -4252,7 +4262,7 @@ DOMLSParser
<td><font face="Courier New,Courier"><font size=-1>Grammar*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>loadGrammar(const DOMLSInput& source, const short grammarType,
+<td><font face="Courier New,Courier"><font size=-1>loadGrammar(const DOMLSInput* source, const short grammarType,
const bool toCache = false) = 0;
</font></font></td>
</tr>
@@ -4485,6 +4495,20 @@ DOMLSResourceResolver
<td></td>
+</tr>
+
+<tr ALIGN=LEFT VALIGN=TOP>
+<td></td>
+
+<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
+
+<td><font face="Courier New,Courier"><font size=-1>DOMLSInput*</font></font></td>
+
+<td><font face="Courier New,Courier"><font size=-1>resolveResource( const XMLCh* const resourceType , const XMLCh* const namespaceUri
+ , const XMLCh* const publicId
+ , const XMLCh* const systemId
+ , const XMLCh* const baseURI) = 0;
+</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
<td><font face="Courier New,Courier"><font size=-1>};</font></font></td>
@@ -4544,16 +4568,6 @@ DOMLSSerializer
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>setEncoding(const XMLCh* const encoding) = 0;</font></font></td>
-</tr>
-
-<tr ALIGN=LEFT VALIGN=TOP>
-<td></td>
-
-<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-
-<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-
<td><font face="Courier New,Courier"><font size=-1>setNewLine(const XMLCh* const newLine) = 0;</font></font></td>
</tr>
@@ -4574,16 +4588,6 @@ DOMLSSerializer
<td><font face="Courier New,Courier"><font size=-1>const XMLCh*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>getEncoding() const = 0;</font></font></td>
-</tr>
-
-<tr ALIGN=LEFT VALIGN=TOP>
-<td></td>
-
-<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-
-<td><font face="Courier New,Courier"><font size=-1>const XMLCh*</font></font></td>
-
<td><font face="Courier New,Courier"><font size=-1>getNewLine() const = 0;</font></font></td>
</tr>
@@ -4604,7 +4608,7 @@ DOMLSSerializer
<td><font face="Courier New,Courier"><font size=-1>bool</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>write(const DOMNode* nodeToWrite, XMLFormatTarget* const destination) = 0;
+<td><font face="Courier New,Courier"><font size=-1>write(const DOMNode* nodeToWrite, DOMLSOutput* const destination) = 0;
</font></font></td>
</tr>
@@ -5299,7 +5303,7 @@ DOMXPathResult
<tr ALIGN=LEFT VALIGN=TOP>
<td ALIGN=CENTER><i><font color="#0086B2">
<font size=-1>
-Copyright © 1999-2005 The Apache Software Foundation. All Rights Reserved.
+Copyright © 1999-2006 The Apache Software Foundation. All Rights Reserved.
</font>
</font>
</i>
diff --git a/doc/program-dom.xml b/doc/program-dom.xml
index 7003242319384c202ee150706058b1f8ef3cd0e6..5b38d94fb926a69e356c690d886ca8ff5c917f07 100644
--- a/doc/program-dom.xml
+++ b/doc/program-dom.xml
@@ -100,7 +100,7 @@
<s4 title="Objects created by DOMImplementation::createXXXX">
<p>Users <em>must</em> call the release() function when finished using any objects that
- were created by the DOMImplementation::createXXXX (e.g. DOMBuilder, DOMWriter, DOMDocument,
+ were created by the DOMImplementation::createXXXX (e.g. DOMLSParser, DOMLSSerializer, DOMLSInput, DOMLSOutput, DOMDocument,
DOMDocumentType).</p>
<p>Access to a released object will lead to unexpected behaviour.</p>
@@ -792,19 +792,19 @@
</s2>
- <anchor name="DOMBuilder"/>
- <s2 title="DOMBuilder">
+ <anchor name="DOMLSParser"/>
+ <s2 title="DOMLSParser">
- <anchor name="ConstructDOMBuilder"/>
- <s3 title="Constructing a DOMBuilder">
- <p>DOMBuilder is a new interface introduced by the
- <jump href="http://www.w3.org/TR/2002/WD-DOM-Level-3-ASLS-20020409/">
- W3C DOM Level 3.0 Abstract Schemas and Load and Save Specification</jump>.
- DOMBuilder provides the "Load" interface for parsing XML documents and building the
+ <anchor name="ConstructDOMLSParser"/>
+ <s3 title="Constructing a DOMLSParser">
+ <p>DOMLSParser is a new interface introduced by the
+ <jump href="http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/">
+ W3C DOM Level 3.0 Load and Save Specification</jump>.
+ DOMLSParser provides the "Load" interface for parsing XML documents and building the
corresponding DOM document tree from various input sources.
</p>
- <p>A DOMBuilder instance is obtained from the DOMImplementationLS interface by invoking
- its createDOMBuilder method. For example:
+ <p>A DOMLSParser instance is obtained from the DOMImplementationLS interface by invoking
+ its createLSParser method. For example:
</p>
<source>
#include <xercesc/dom/DOM.hpp>
@@ -836,21 +836,21 @@
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
- DOMBuilder* parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+ DOMLSParser* parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
// optionally you can set some features on this builder
- if (parser->canSetFeature(XMLUni::fgDOMValidation, true))
- parser->setFeature(XMLUni::fgDOMValidation, true);
- if (parser->canSetFeature(XMLUni::fgDOMNamespaces, true))
- parser->setFeature(XMLUni::fgDOMNamespaces, true);
- if (parser->canSetFeature((XMLUni::fgDOMDatatypeNormalization, true))
- parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true);
+ if (parser->getDomConfig()->canSetParameter(XMLUni::fgDOMValidation, true))
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMValidation, true);
+ if (parser->getDomConfig()->canSetParameter(XMLUni::fgDOMNamespaces, true))
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMNamespaces, true);
+ if (parser->getDomConfig()->canSetParameter((XMLUni::fgDOMDatatypeNormalization, true))
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMDatatypeNormalization, true);
// optionally you can implement your DOMErrorHandler (e.g. MyDOMErrorHandler)
// and set it to the builder
MyDOMErrorHandler* errHandler = new myDOMErrorHandler();
- parser->setErrorHandler(errHandler);
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, errHandler);
char* xmlFile = "x1.xml";
DOMDocument *doc = 0;
@@ -942,13 +942,13 @@
</p>
</s3>
- <anchor name="DOMBuilderFeatures"/>
- <s3 title="DOMBuilder Supported Features">
+ <anchor name="DOMLSParserFeatures"/>
+ <s3 title="DOMLSParser Supported Features">
- <p>The behavior of the DOMBuilder is dependent on the values of the following features.
- All of the features below can be set using the function <code>DOMBuilder::setFeature(cons XMLCh* const, const bool)</code>.
- And can be queried using the function <code>bool DOMBuilder::getFeature(const XMLCh* const)</code>.
- User can also call <code>DOMBuilder::canSetFeature(const XMLCh* const, const bool)</code>
+ <p>The behavior of the DOMLSParser is dependent on the values of the following features.
+ All of the features below can be set using the function <code>DOMLSParser::getDomConfig()->setParameter(cons XMLCh* , bool)</code>.
+ And can be queried using the function <code>bool DOMLSParser::getDomConfig()->getParameter(const XMLCh* const)</code>.
+ User can also call <code>DOMLSParser::getDomConfig()->canSetParameter(const XMLCh* , bool)</code>
to query whether setting a feature to a specific value is supported
</p>
@@ -1438,8 +1438,8 @@
<tr><th><em>default:</em></th><td> false </td></tr>
<tr><th><em>XMLUni Predefined Constant:</em></th><td> fgXercesUserAdoptsDOMDocument </td></tr>
<tr><th><em>see:</em></th><td>
- <jump href="apiDocs/classDOMBuilder.html">
- DOMBuilder API Documentation</jump>, (DOMBuilder::parse and DOMBuilder::resetDocumentPool)
+ <jump href="apiDocs/classDOMLSParser.html">
+ DOMLSParser API Documentation</jump>, (DOMLSParser::parse and DOMLSParser::resetDocumentPool)
</td></tr>
</table>
@@ -1449,18 +1449,18 @@
</s3>
- <anchor name="DOMBuilderProperties"/>
- <s3 title="DOMBuilder Supported Properties">
+ <anchor name="DOMLSParserProperties"/>
+ <s3 title="DOMLSParser Supported Properties">
- <p>The behavior of the DOMBuilder is dependent on the values of the following properties.
- All of the properties below can be set using the function <code>DOMBuilder::setProperty(const XMLCh* const, void*)</code>.
+ <p>The behavior of the DOMLSParser is dependent on the values of the following properties.
+ All of the properties below can be set using the function <code>DOMLSParser::getDomConfig()->setParameter(const XMLCh* , const void*)</code>.
It takes a void pointer as the property value. Application is required to initialize this void
pointer to a correct type. Please check the column "Value Type" below
to learn exactly what type of property value each property expects for processing.
Passing a void pointer that was initialized with a wrong type will lead to unexpected result.
If the same property is set more than once, the last one takes effect.</p>
- <p>Property values can be queried using the function <code>void* DOMBuilder::getFeature(const XMLCh* const)</code>.
+ <p>Property values can be queried using the function <code>void* DOMLSParser::getDomConfig()->getParameter(const XMLCh* )</code>.
The parser owns the returned pointer, and the memory allocated for the returned pointer will
be destroyed when the parser is released. To ensure accessibility of the returned information after
the parser is released, callers need to copy and store the returned information somewhere else.
@@ -1575,19 +1575,19 @@
</s2>
- <anchor name="DOMWriter"/>
- <s2 title="DOMWriter">
+ <anchor name="DOMLSSerializer"/>
+ <s2 title="DOMLSSerializer">
- <anchor name="ConstructDOMWriter"/>
- <s3 title="Constructing a DOMWriter">
+ <anchor name="ConstructDOMLSSerializer"/>
+ <s3 title="Constructing a DOMLSSerializer">
<p>DOMWriter is a new interface introduced by the
- <jump href="http://www.w3.org/TR/2002/WD-DOM-Level-3-ASLS-20020409/">
- W3C DOM Level 3.0 Abstract Schemas and Load and Save Specification</jump>.
- DOMWriter provides the "Save" interface for serializing (writing) a DOM document into
+ <jump href="http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/">
+ W3C DOM Level 3.0 Load and Save Specification</jump>.
+ DOMLSSerializer provides the "Save" interface for serializing (writing) a DOM document into
XML data. The XML data can be written to various type of output stream.
</p>
- <p>A DOMWriter instance is obtained from the DOMImplementationLS interface by invoking
- its createDOMWriter method. For example:
+ <p>A DOMLSSerializer instance is obtained from the DOMImplementationLS interface by invoking
+ its createLSSerializer method. For example:
</p>
<source>
#include <xercesc/dom/DOM.hpp>
@@ -1606,32 +1606,34 @@
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
- DOMWriter* theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+ DOMLSSerializer* theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
// optionally you can set some features on this serializer
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
+ if (theSerializer->getDomConfig()->canSetParameter(XMLUni::fgDOMWRTDiscardDefaultContent, true))
+ theSerializer->getDomConfig()->setParameter(XMLUni::fgDOMWRTDiscardDefaultContent, true);
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
+ if (theSerializer->getDomConfig()->canSetParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true))
+ theSerializer->getDomConfig()->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true);
- // optionally you can implement your DOMWriterFilter (e.g. MyDOMWriterFilter)
+ // optionally you can implement your DOMLSSerializerFilter (e.g. MyDOMLSSerializerFilter)
// and set it to the serializer
- DOMWriterFilter* myFilter = new myDOMWriterFilter();
+ DOMLSSerializer* myFilter = new myDOMLSSerializerFilter();
theSerializer->setFilter(myFilter);
// optionally you can implement your DOMErrorHandler (e.g. MyDOMErrorHandler)
// and set it to the serializer
DOMErrorHandler* errHandler = new myDOMErrorHandler();
- theSerializer->setErrorHandler(myErrorHandler);
+ theSerializer->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, myErrorHandler);
// StdOutFormatTarget prints the resultant XML stream
// to stdout once it receives any thing from the serializer.
XMLFormatTarget *myFormTarget = new StdOutFormatTarget();
+ DOMLSOutput* theOutput = ((DOMImplementationLS*)impl)->createLSOutput();
+ theOutput->setByteStream(myFormTarget);
try {
- // do the serialization through DOMWriter::writeNode();
- theSerializer->writeNode(myFormTarget, *node);
+ // do the serialization through DOMLSSerializer::write();
+ theSerializer->write(node, theOutput);
}
catch (const XMLException& toCatch) {
char* message = XMLString::transcode(toCatch.getMessage());
@@ -1652,7 +1654,7 @@
return -1;
}
-
+ theOutput->release();
theSerializer->release();
delete myErrorHandler;
delete myFilter;
@@ -1666,10 +1668,10 @@
</p>
</s3>
- <anchor name="DOMWriterEntityRef"/>
- <s3 title="How does DOMWriter handle built-in entity Reference in node value?">
+ <anchor name="DOMLSSerializerEntityRef"/>
+ <s3 title="How does DOMLSSerializer handle built-in entity Reference in node value?">
- <p>Say for example you parse the following xml document using XercesDOMParser or DOMBuilder</p>
+ <p>Say for example you parse the following xml document using XercesDOMParser or DOMLSParser</p>
<source>
<root>
<Test attr=" > ' &lt; &gt; &amp; &quot; &apos; "></Test>
@@ -1689,19 +1691,19 @@
</root>
</source>
- <p>and pass such DOMNode to DOMWriter for serialization. From DOMWriter perspective, it
+ <p>and pass such DOMNode to DOMLSSerializer for serialization. From DOMLSSerializer perspective, it
does not know what the original string was. All it sees is above DOMNode from the
- parser. But since the DOMWriter is supposed to generate something that is parsable if sent
- back to the parser, it cannot print such string as is. Thus the DOMWriter is doing some
+ parser. But since the DOMLSSerializer is supposed to generate something that is parsable if sent
+ back to the parser, it cannot print such string as is. Thus the DOMLSSerializer is doing some
"touch up", just enough, to get the string parsable.</p>
<p>So for example since the appearance of < and & in text value will lead to
- not well-form XML error, the DOMWriter fixes them to &lt; and &amp;
- respectively; while the >, ' and " in text value are ok to the parser, so DOMWriter does not
- do anything to them. Similarly the DOMWriter fixes some of the characters for the attribute value
+ not well-form XML error, the DOMLSSerializer fixes them to &lt; and &amp;
+ respectively; while the >, ' and " in text value are ok to the parser, so DOMLSSerializer does not
+ do anything to them. Similarly the DOMLSSerializer fixes some of the characters for the attribute value
but keep everything in CDATA.</p>
- <p>So the string that is generated by DOMWriter will look like this</p>
+ <p>So the string that is generated by DOMLSSerializer will look like this</p>
<source>
<root>
<Test attr=" > ' &lt; > &amp; &quot; ' "/>
@@ -1768,13 +1770,13 @@
</table>
</s3>
- <anchor name="DOMWriterFeatures"/>
- <s3 title="DOMWriter Supported Features">
+ <anchor name="DOMLSSerializerFeatures"/>
+ <s3 title="DOMLSSerializer Supported Features">
- <p>The behavior of the DOMWriter is dependent on the values of the following features.
- All of the features below can be set using the function <code>DOMWriter::setFeature(cons XMLCh* const, bool)</code>.
- And can be queried using the function <code>bool DOMWriter::getFeature(const XMLCh* const)</code>.
- User can also call <code>DOMWriter::canSetFeature(const XMLCh* const, bool)</code>
+ <p>The behavior of the DOMLSSerializer is dependent on the values of the following features.
+ All of the features below can be set using the function <code>DOMLSSerializer::getDomConfig()->setParameter(cons XMLCh* , bool)</code>.
+ And can be queried using the function <code>bool DOMLSSerializer::getDomConfig()->getParameter(const XMLCh* const)</code>.
+ User can also call <code>DOMLSSerializer::getDomConfig()->canSetParameter(const XMLCh* , bool)</code>
to query whether setting a feature to a specific value is supported
</p>
@@ -1793,8 +1795,8 @@
default content won't be removed if an implementation does not have any information
available. </td></tr>
<tr><th><em>see:</em></th><td>
- <jump href="http://www.w3.org/TR/2002/WD-DOM-Level-3-ASLS-20020409/">
- DOM Level 3.0 Abstract Schemas and Load and Save Specification</jump>
+ <jump href="http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/">
+ DOM Level 3.0 Load and Save Specification</jump>
</td></tr>
</table>
diff --git a/doc/program-others.xml b/doc/program-others.xml
index 052dab87f7c5799029e684bc19a7f48d3d292856..2859ad2abbbec76d395ddfcc3a22d9c90557189e 100644
--- a/doc/program-others.xml
+++ b/doc/program-others.xml
@@ -891,15 +891,15 @@ parser->setFeature(XMLUni::fgXercesSchemaFullChecking, false);
</p>
<source>
-// Create a DOMBuilder parser
-DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+// Create a DOMLSParser parser
+DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
// Specify scanner name - This is optional as IGXMLScanner is the default
-parser->setProperty(XMLUni::fgXercesScannerName, (void *)XMLUni::fgIGXMLScanner);
+parser->getDomConfig()->setParameter(XMLUni::fgXercesScannerName, (void *)XMLUni::fgIGXMLScanner);
// Specify other parser features, e.g.
-parser->setFeature(XMLUni::fgDOMNamespaces, doNamespaces);
-parser->setFeature(XMLUni::fgXercesSchema, doSchema);
+parser->getDomConfig()->setParameter(XMLUni::fgDOMNamespaces, doNamespaces);
+parser->getDomConfig()->setParameter(XMLUni::fgXercesSchema, doSchema);
</source>
</s3>
diff --git a/doc/program.xml b/doc/program.xml
index 2351711e0e1be6140efc65194d71158d6f4b9d4a..08bf3bd15e3274a9d4471888da4cb91f48507f44 100644
--- a/doc/program.xml
+++ b/doc/program.xml
@@ -78,18 +78,18 @@ int main(int argc, char* argv[])
<li><jump href="program-dom.html#XercesDOMFeatures">Supported Features</jump></li>
<li><jump href="program-dom.html#XercesDOMProperties">Supported Properties</jump></li>
</ul>
- <li><jump href="program-dom.html#DOMBuilder">DOMBuilder</jump></li>
+ <li><jump href="program-dom.html#DOMLSParser">DOMLSParser</jump></li>
<ul>
- <li><jump href="program-dom.html#ConstructDOMBuilder">Constructing a DOMBuilder</jump></li>
- <li><jump href="program-dom.html#InputSourceWrapper">How to interchange DOMInputSource and SAX InputSource?</jump></li>
- <li><jump href="program-dom.html#DOMBuilderFeatures">Supported Features</jump></li>
- <li><jump href="program-dom.html#DOMBuilderProperties">Supported Properties</jump></li>
+ <li><jump href="program-dom.html#ConstructDOMLSParser">Constructing a DOMLSParser</jump></li>
+ <li><jump href="program-dom.html#InputSourceWrapper">How to interchange DOMLSInput and SAX InputSource?</jump></li>
+ <li><jump href="program-dom.html#DOMLSParserFeatures">Supported Features</jump></li>
+ <li><jump href="program-dom.html#DOMLSParserProperties">Supported Properties</jump></li>
</ul>
- <li><jump href="program-dom.html#DOMWriter">DOMWriter</jump></li>
+ <li><jump href="program-dom.html#DOMLSSerializer">DOMLSSerializer</jump></li>
<ul>
- <li><jump href="program-dom.html#ConstructDOMWriter">Constructing a DOMWriter</jump></li>
- <li><jump href="program-dom.html#DOMWriterEntityRef">How does DOMWriter handle built-in entity Reference in node value?</jump></li>
- <li><jump href="program-dom.html#DOMWriterFeatures">Supported Features</jump></li>
+ <li><jump href="program-dom.html#ConstructDOMLSSerializer">Constructing a DOMLSSerializer</jump></li>
+ <li><jump href="program-dom.html#DOMLSSerializerEntityRef">How does DOMLSSerializer handle built-in entity Reference in node value?</jump></li>
+ <li><jump href="program-dom.html#DOMLSSerializerFeatures">Supported Features</jump></li>
</ul>
<li><jump href="program-dom.html#Deprecated">Deprecated - Java-like DOM</jump></li>
</ul>