diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2022-05-03 14:45:03 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2022-05-03 16:33:38 +0000 |
| commit | a59d0660f26066a932e646bd61274316ae86f47f (patch) | |
| tree | 8ebae66e94e7a5a1fd9013c0e8ef6668533aef2c /docs | |
| parent | 33c3b275f8315edb6df8903a2e1121879d7d923d (diff) | |
2.12.2-1 (patches unapplied)HEADimport/2.12.2-1ubuntu/resolute-develubuntu/resoluteubuntu/questing-develubuntu/questingubuntu/plucky-develubuntu/pluckyubuntu/oracular-develubuntu/oracularubuntu/noble-develubuntu/nobleubuntu/mantic-develubuntu/manticubuntu/lunar-develubuntu/lunarubuntu/kinetic-proposedubuntu/kinetic-develubuntu/kineticubuntu/develdebian/siddebian/bookworm
Imported using git-ubuntu import.
Notes
Notes:
* Team upload.
* New upstream release
- Refreshed the patches
* Standards-Version updated to 4.6.0.1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/docs-book.xml | 2 | ||||
| -rw-r--r-- | docs/dtd/entities.ent | 2 | ||||
| -rw-r--r-- | docs/faq-grammars.xml | 12 | ||||
| -rw-r--r-- | docs/faq-xcatalogs.xml | 2 | ||||
| -rw-r--r-- | docs/faq-xs.xml | 21 | ||||
| -rw-r--r-- | docs/install.xml | 10 | ||||
| -rw-r--r-- | docs/readme.xml | 18 | ||||
| -rw-r--r-- | docs/releases.xml | 97 | ||||
| -rw-r--r-- | docs/samples-jaxp.xml | 21 | ||||
| -rw-r--r-- | docs/source-repository.xml | 11 | ||||
| -rw-r--r-- | docs/style/stylesheets/document2html.xsl | 15 |
11 files changed, 171 insertions, 40 deletions
diff --git a/docs/docs-book.xml b/docs/docs-book.xml index b057612..84f23a0 100644 --- a/docs/docs-book.xml +++ b/docs/docs-book.xml @@ -17,7 +17,7 @@ -->
<!DOCTYPE book SYSTEM 'dtd/book.dtd'>
<book title='&ParserName; Documentation'
- copyright='1999-2020 The Apache Software Foundation'>
+ copyright='1999-2022 The Apache Software Foundation'>
<external label='Home' href='http://xerces.apache.org/'/>
<separator/>
<document label='Readme' title='&ParserNameLong; Readme'
diff --git a/docs/dtd/entities.ent b/docs/dtd/entities.ent index 75394e3..621aea4 100644 --- a/docs/dtd/entities.ent +++ b/docs/dtd/entities.ent @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?>
<!-- upper case versions of names and versions -->
-<!ENTITY ParserNameLong 'Xerces2 Java Parser'>
+<!ENTITY ParserNameLong 'Xerces2 Java XML Parser'>
<!ENTITY ParserName 'Xerces-J'>
<!ENTITY ParserVersion '@@VERSION@@'>
diff --git a/docs/faq-grammars.xml b/docs/faq-grammars.xml index ed4c3fd..9d9352f 100644 --- a/docs/faq-grammars.xml +++ b/docs/faq-grammars.xml @@ -35,7 +35,7 @@ <code>org.apache.xerces.xni.grammars.Grammar</code>
interface; simply differentiates objects that are Xerces
grammars from other objects, as well as providing a means
- to get at the location information (<code>XMLGrammarDescription</code>) for the grammar represented..</li>
+ to get at the location information (<code>XMLGrammarDescription</code>) for the grammar represented.</li>
<li><code>XMLGrammarDescription</code>: defined by the
<code>org.apache.xerces.xni.grammars.XMLGrammarDescription</code>
interface, holds some basic location information common to all grammars.
@@ -184,11 +184,11 @@ are instances of
<code>org.apache.xerces.impl.dtd.XMLDTDDescription</code>.</li>
<li>If their publicId or expandedSystemId fields are
- non-null they must be identical;</li>
+ non-null they must be identical.</li>
<li>If one of the descriptions has a root element
defined, it must be the same as the root element defined
in the other description, or be in the list of global
- elements stored in that description;</li>
+ elements stored in that description.</li>
<li>If neither has a root element defined, then they must
share at least one global element declaration in
common.</li>
@@ -369,15 +369,15 @@ DocumentBuilder builder = // JAXP factory invocation <link idref="api" anchor="xml-schema-api-documentation">API</link> docs for
the <code>org.apache.xerces.xs</code>
package. Assuming you have produced a Grammar object from an XML Schema
- document by some means, to turn that object
+ document by some means. To turn that object
into an object usable in this API, do the following:
</p>
<ol>
<li>
- Cast the Grammar object to <code>org.apache.xerces.xni.grammars.XSGrammar</code>;
+ Cast the Grammar object to <code>org.apache.xerces.xni.grammars.XSGrammar</code>.
</li>
<li>
- Call the <code>toXSModel()</code> method on the casted object;
+ Call the <code>toXSModel()</code> method on the casted object.
</li>
<li>
Use the methods in the <code>org.apache.xerces.xs.XSModel</code>
diff --git a/docs/faq-xcatalogs.xml b/docs/faq-xcatalogs.xml index da7fa50..36eafcb 100644 --- a/docs/faq-xcatalogs.xml +++ b/docs/faq-xcatalogs.xml @@ -40,7 +40,7 @@ XNI entity resolver, the (<code>org.xml.sax.EntityResolver</code>) SAX entity resolver
and the (<code>org.w3c.dom.ls.LSResourceResolver</code>) DOM resource resolver
interfaces. In <code>XMLCatalogResolver</code> the resolveEntity methods only query the
- catalog for a mapping of the given identifier. These methods may be overrided if
+ catalog for a mapping of the given identifier. These methods may be overridden if
other behaviour is required.
</p>
<p>
diff --git a/docs/faq-xs.xml b/docs/faq-xs.xml index 1ba6100..2c94857 100644 --- a/docs/faq-xs.xml +++ b/docs/faq-xs.xml @@ -75,7 +75,12 @@ v.validate(instanceDocument); </document></source>
<p>Review the sample file, 'data/personal.xsd' for an example of an XML
Schema grammar.</p>
-
+ We've also deployed an XML Schema validator service on a public web
+ site at <jump href="https://www.softwarebytes.org/xmlvalidation/">Online XML Schema validator service</jump>.
+ This online XML Schema validator service uses Xerces-J as backend, and supports both 1.0 and 1.1 versions
+ of the XML Schema language. Users may use this service, to test their XML Schema validation examples,
+ either with a goal to integrate XML schemas to their production applications or may be to learn the
+ XML Schema language.
</a>
</faq>
<faq title="Using Entities and CDATA Sections">
@@ -99,22 +104,22 @@ v.validate(instanceDocument); <q>How an XPath 2.0 engine is used for XML Schema 1.1 assertions and CTAs?</q>
<a>
<p>XML Schema 1.1 assertions and CTAs require an XPath processor during evaluation. For XSD 1.1 assertions,
- full <jump href="http://www.w3.org/TR/xpath20/">XPath 2.0</jump> support is required. For XSD 1.1 CTAs the XSD schema engines can
+ full <jump href="http://www.w3.org/TR/xpath20">XPath 2.0</jump> support is required. For XSD 1.1 CTAs the XSD schema engines can
provide full XPath 2.0 support, or they can implement a <jump href="http://www.w3.org/TR/xmlschema11-1/#coss-ta">smaller XPath subset</jump>
- as defined by the XSD 1.1 language. For CTAs Xerces uses the XSD 1.1 CTA XPath subset language by default, but can be made to use the full XPath 2.0 support by
- setting the value of Xerces feature <code>http://apache.org/xml/features/validation/cta-full-xpath-checking</code> to 'true'.
+ as defined by the XSD 1.1 language. For CTAs Xerces uses the XSD 1.1 CTA XPath subset language by default, but can be made to use the
+ full XPath 2.0 support by setting the value of Xerces feature <code>http://apache.org/xml/features/validation/cta-full-xpath-checking</code> to 'true'.
The native CTA XPath processor in Xerces-J was written for efficiency, so you will likely get better performance if your
XPath expressions fall within the minimum subset defined by the XML Schema 1.1 specification. For full XPath 2.0 evaluation
- (for XSD 1.1 assertions, and optionally for CTAs), Xerces-J uses the <jump href="http://wiki.eclipse.org/PsychoPathXPathProcessor">Eclipse/PsychoPath XPath 2.0 engine</jump>.
- Xerces-J does bundle along a PsychoPath XPath 2.0 jar (which requires JDK 1.4 or later).
+ (for XSD 1.1 assertions, and optionally for CTAs), Xerces-J uses an <jump href="https://www.eclipse.org/webtools">XPath 2.0 engine</jump>.
+ Xerces-J does bundle along an XPath 2.0 engine jar for these features (that requires JDK 1.4 or later).
</p>
<p>
We would like to acknowledge, work of following people for the XPath 2.0 support that comes with Xerces's
XML Schema 1.1 processor: Andrea Bittau (responsible for the original design and implementation, of XPath 2.0
processor that's been used by Xerces. Andrea donated his XPath 2.0 processor to the Eclipse Foundation, that
- Xerces uses.), Dave Carver (Dave helped to set up software infrastructure at Eclipse Foundation's Web Tools Platform project,
+ Xerces uses), Dave Carver (Dave helped to set up software infrastructure at Eclipse Foundation's Web Tools Platform project,
for testing the XPath 2.0 processor as per W3C XPath 2.0 test suite. He also helped to improve compliance of
- XPath 2.0 processor, to the W3C XPath 2.0 test suite by providing numerous bug fixes and implementation.),
+ XPath 2.0 processor, to the W3C XPath 2.0 test suite by providing numerous bug fixes and implementation),
Jesper Steen Moeller (Jesper as an Eclipse's Web Tools Platform committer, helped to improve the implementation
of the XPath 2.0 processor).
</p>
diff --git a/docs/install.xml b/docs/install.xml index 87498fd..fcdaed1 100644 --- a/docs/install.xml +++ b/docs/install.xml @@ -84,7 +84,7 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <tr>
<td>serializer.jar</td>
<td>Jar file containing the Apache Xalan serializer. Currently
- the serializer included in Xalan 2.7.1 is distributed with &ParserName;.</td>
+ the serializer included in Xalan 2.7.2 is distributed with &ParserName;.</td>
</tr>
<tr>
<td>xercesImpl.jar</td>
@@ -260,7 +260,7 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> <tr>
<td>serializer.jar</td>
<td>Jar file containing the Apache Xalan serializer. Currently
- the serializer included in Xalan 2.7.1 is distributed with &ParserName;.</td>
+ the serializer included in Xalan 2.7.2 is distributed with &ParserName;.</td>
</tr>
<tr>
<td>serializer.LICENSE.txt</td>
@@ -281,16 +281,16 @@ jar xf &ParserName;-tools.&parserversion;.zip</source> </tr>
<tr>
<td>xalan.jar</td>
- <td>Jar file containing Apache Xalan 2.7.1 (required by
+ <td>Jar file containing Apache Xalan 2.7.2 (required by
the Apache Stylebook for building the Xerces-J documentation)</td>
</tr>
<tr>
<td>xalan.LICENSE.txt</td>
- <td>License for Apache Xalan 2.7.1</td>
+ <td>License for Apache Xalan 2.7.2</td>
</tr>
<tr>
<td>xalan.NOTICE.txt</td>
- <td>NOTICE file for Apache Xalan 2.7.1</td>
+ <td>NOTICE file for Apache Xalan 2.7.2</td>
</tr>
<tr>
<td>xercesImpl.jar</td>
diff --git a/docs/readme.xml b/docs/readme.xml index 85fa095..18f9677 100644 --- a/docs/readme.xml +++ b/docs/readme.xml @@ -34,8 +34,8 @@ </p>
<p>
Xerces2 provides fully conforming XML Schema 1.0 and 1.1 processors. An experimental implementation of the
- <jump href='http://www.w3.org/TR/2010/CR-xmlschema-ref-20100119/'>XML Schema Definition
- Language (XSD): Component Designators</jump> (SCD) Candidate Recommendation (January 2010)
+ "<jump href='http://www.w3.org/TR/2010/CR-xmlschema-ref-20100119/'>XML Schema Definition
+ Language (XSD): Component Designators</jump> (SCD) Candidate Recommendation (January 2010)"
is also provided for evaluation. For more information, refer to the <link idref='xml-schema'>
XML Schema</link> page.
</p>
@@ -64,8 +64,7 @@ </s2>
<s2 title='Features of This Release'>
<p>
- The &ParserNameLong; &ParserVersion; supports the
- following standards and APIs:
+ The &ParserNameLong; &ParserVersion; supports the following standards and APIs:
</p>
<ul>
<li>
@@ -137,6 +136,17 @@ (XSD): Component Designators</jump> (SCD) Candidate Recommendation (January 2010)
</li>
</ul>
+ From the above mentioned features, all the features mentioned except the last two (i.e XML Schema 1.1 and SCD
+ implementations), are available with both the following Xerces2 Java packages:
+ <ul>
+ <li>Xerces2 Java 2.12.2 - tar.gz / Xerces2 Java 2.12.2 - zip</li>
+ <li>Xerces2 Java 2.12.2 (XML Schema 1.1) - tar.gz / Xerces2 Java 2.12.2 (XML Schema 1.1) - zip</li>
+ </ul>
+ Whereas, the feature implementations for 'XML Schema 1.1' and 'XML Schema Definition Language (XSD):
+ Component Designators (SCD)', are available only within the Xerces2 Java package 'Xerces2 Java 2.12.2
+ (XML Schema 1.1) - tar.gz / Xerces2 Java 2.12.2 (XML Schema 1.1) - zip'. Please visit the page
+ <jump href='http://xerces.apache.org/mirrors.cgi'>Xerces downloads</jump>, to download the Xerces2
+ Java package that is needed.
</s2>
<s2 title='Backwards compatibility'>
diff --git a/docs/releases.xml b/docs/releases.xml index 6b86f57..df144c9 100644 --- a/docs/releases.xml +++ b/docs/releases.xml @@ -15,9 +15,86 @@ * See the License for the specific language governing permissions and
* limitations under the License.
-->
-<!-- $Id: releases.xml 1872100 2019-12-30 08:33:21Z mukulg $ -->
+<!-- $Id: releases.xml 1897227 2022-01-20 04:44:56Z mukulg $ -->
<!DOCTYPE releases SYSTEM 'dtd/releases.dtd'>
<releases>
+ <release version='&ParserName; 2.12.2'>
+ <desc>
+ <p>
+ This release is a bug fix release. It fixes few bugs which were present in Xerces-J 2.12.1
+ and also includes a few other minor enhancements.
+ </p>
+ </desc>
+ <changes>
+ <fix>
+ <note>
+ Implemented a fix, that solves rarely occurring XML parsing performance issue.
+ </note>
+ <submitter name='Michael Glavassevich'/>
+ </fix>
+ <fix>
+ <note>
+ Improved compliance, of XPath 2.0 processor's regex implementation (that's used
+ within XML Schema 1.1 implementation).
+ </note>
+ <submitter name='Mukul Gandhi'/>
+ </fix>
+ <fix>
+ <note>
+ XML Schema validation error message improvements, when XML attributes are validated.
+ </note>
+ <submitter name='Mukul Gandhi'/>
+ </fix>
+ <fix>
+ <note>
+ Improved the JAXP SourceValidator sample, related to XML Schema 1.1 assertion evaluations
+ on list types.
+ </note>
+ <submitter name='Mukul Gandhi'/>
+ </fix>
+ <fix>
+ <note>
+ Solved an XML Schema implementation issue, where combination of restrictions 'length'
+ and 'minLength' was leading to error.
+ </note>
+ <submitter name='Mukul Gandhi'/>
+ </fix>
+ <fix>
+ <note>
+ Made minor, improvements to few XML Schema 1.1 validation error messages.
+ </note>
+ <submitter name='Mukul Gandhi'/>
+ </fix>
+ <fix>
+ <note>
+ Fixed a rarely occurring issue during XML Schema 1.1 xs:assert evaluation, where adjacent text
+ values within XML instance document, were resulting in more than one adjacent XPath 2.0 text
+ nodes.
+ </note>
+ <submitter name='Mukul Gandhi, John Morris'/>
+ </fix>
+ <add>
+ <note>
+ Upgraded the minimum, Java requirement to use XercesJ to Java version 1.7.
+ </note>
+ <submitter name='XercesJ team'/>
+ </add>
+ <add>
+ <note>
+ Upgraded XalanJ serializer dependency to version 2.7.2 from 2.7.1, which is
+ required by XercesJ.
+ </note>
+ <submitter name='XercesJ team'/>
+ </add>
+ <add>
+ <note>
+ Re-built, "XML Commons External" and "XML Commons Resolver" codebases
+ (which are dependencies for XercesJ) using Java 1.7.
+ </note>
+ <submitter name='XercesJ team'/>
+ </add>
+ </changes>
+ </release>
<release version='&ParserName; 2.12.1'>
<desc>
<p>
@@ -51,19 +128,19 @@ </fix>
<fix>
<note>
- For certain cases, while doing XML Schema 1.1 xs:assert validations, error messages appeared
- like following 'FOAR0001 - Division by zero'. Modified such error messages, to now contain
- the character ':' instead of '-' (since, the character '-' can be confused with a negation symbol).
+ When XML Schema 1.1 documents having xs:assert are used for XML document validation, for certain use cases
+ error messages appeared like following 'FOAR0001 - Division by zero'. Modified such error messages, to now
+ contain the character ':' instead of '-' (since, the character '-' may be confused with a negation symbol).
</note>
<submitter name='Mukul Gandhi'/>
</fix>
<fix>
<note>
- The 'XML Schema 1.1 structures' REC in the section, "3.2.3 Constraints on XML Representations of
- Attribute Declarations (Schema Representation Constraint: Attribute Declaration
- Representation)" mentions, '5 If fixed and use are both present, use must not have the actual value
- prohibited'. This functionality is newly introduced in XML Schema 1.1. Fixed a runtime validation issue
- for this XSD clause, when XSD 1.1 implementation is invoked in XSD 1.0 mode.
+ The 'XML Schema 1.1 structures' Recommendation in the section, "3.2.3 Constraints on XML Representations
+ of Attribute Declarations (Schema Representation Constraint: Attribute Declaration Representation)"
+ mentions, '5 If fixed and use are both present, use must not have the actual value prohibited'. This
+ functionality is newly introduced in XML Schema 1.1. Fixed a runtime validation issue for this XSD clause,
+ when XSD 1.1 implementation is invoked in XSD 1.0 mode.
</note>
<submitter name='Mukul Gandhi'/>
</fix>
@@ -86,7 +163,7 @@ <note>
Fixed minor bugs and made various improvements.
</note>
- <submitter name='Michael Glavassevich, Mukul Gandhi, Octavian Nadolu'/>
+ <submitter name='Mukul Gandhi, Michael Glavassevich, Octavian Nadolu'/>
</fix>
<add>
<note>
diff --git a/docs/samples-jaxp.xml b/docs/samples-jaxp.xml index 9bb44f6..186e7f8 100644 --- a/docs/samples-jaxp.xml +++ b/docs/samples-jaxp.xml @@ -119,6 +119,27 @@ </td>
</tr>
<tr><td>-m | -M</td><td>Turn on/off memory usage report.</td></tr>
+ <tr>
+ <td>-xsd11</td>
+ <td>
+ Turn on/off XSD 1.1 support.<br/>
+ <strong>NOTE:</strong> Only available with Xerces-J XSD 1.1 distribution.
+ </td>
+ </tr>
+ <tr>
+ <td>-fx</td>
+ <td>
+ Turn on/off full XPath 2.0 checks with CTA when working with XSD 1.1.<br/>
+ <strong>NOTE:</strong> Only available with Xerces-J XSD 1.1 distribution.
+ </td>
+ </tr>
+ <tr>
+ <td>-acp</td>
+ <td>
+ Turn on/off assert comments and PI processing when working with XSD 1.1.<br/>
+ <strong>NOTE:</strong> Only available with Xerces-J XSD 1.1 distribution.
+ </td>
+ </tr>
<tr><td>-h</td><td>Display help screen.</td></tr>
</table>
</s3>
diff --git a/docs/source-repository.xml b/docs/source-repository.xml index dbad3c2..b299e11 100644 --- a/docs/source-repository.xml +++ b/docs/source-repository.xml @@ -51,8 +51,15 @@ svn co <jump href="https://svn.apache.org/repos/asf/xerces/java/branches/stax-de svn co <jump href="https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_6_2">https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_6_2</jump>
</source>
- <p>You can also browse the repository and examine individual
+ <p>You may also browse above cited Xerces2 repository and examine individual
files using the <jump href="http://svn.apache.org/viewcvs.cgi/xerces/java/trunk/">Web
- interface</jump>.</p>
+ interface</jump>.</p>
+ <p>
+ Xerces2 also includes an XML Schema 1.1 processor. For some of its implementation, an XML Schema 1.1
+ processor requires an XPath 2.0 engine. Apache Xerces in collaboration with <jump href="https://www.eclipse.org/webtools">Eclipse Foundation's Web
+ Tools Platform (WTP) project</jump>, has contributed to the development of an XPath 2.0 engine that is
+ used within XercesJ's XML Schema 1.1 processor. The XercesJ specific source code of this
+ XPath 2.0 engine, is located on following GitHub repository : <jump href="https://github.com/xercesj/xpath20">https://github.com/xercesj/xpath20</jump>.
+ </p>
</s2>
</s1>
\ No newline at end of file diff --git a/docs/style/stylesheets/document2html.xsl b/docs/style/stylesheets/document2html.xsl index 4f59995..fd618e1 100644 --- a/docs/style/stylesheets/document2html.xsl +++ b/docs/style/stylesheets/document2html.xsl @@ -31,8 +31,19 @@ <img width="29" height="60" src="resources/right.gif" hspace="0" vspace="0" border="0"/></td>
</tr>
<tr>
- <td width="456" height="35" valign="top" align="left" colspan="4" bgcolor="#0086b2">
- <img src="graphics/{$id}-header.jpg" width="456" height="35" hspace="0" vspace="0" border="0" alt="{s1/@title}"/></td>
+ <xsl:choose>
+ <xsl:when test="$id = 'index'">
+ <!-- revisit : get the value 'Xerces2 Java XML Parser' from file entities.ent -->
+ <td align="center" bgcolor="#0086b2" colspan="4" height="35" valign="middle" width="456">
+ <font color="#f8fefd" face="arial,helvetica,sanserif" size="+2">Xerces2 Java XML Parser Readme</font>
+ </td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td width="456" height="35" valign="top" align="left" colspan="4" bgcolor="#0086b2">
+ <img src="graphics/{$id}-header.jpg" width="456" height="35" hspace="0" vspace="0" border="0" alt="{s1/@title}"/>
+ </td>
+ </xsl:otherwise>
+ </xsl:choose>
</tr>
<tr>
<td width="168" height="20" valign="top" align="left">
|