[Git][java-team/libxerces2-java][master] 5 commits: New upstream version 2.12.2
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue May 3 13:45:33 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libxerces2-java
Commits:
26687376 by Emmanuel Bourg at 2022-05-03T14:40:02+02:00
New upstream version 2.12.2
- - - - -
e74bd7a4 by Emmanuel Bourg at 2022-05-03T14:40:07+02:00
Update upstream source from tag 'upstream/2.12.2'
Update to upstream version '2.12.2'
with Debian dir 9bd25f1a095a02d9489df18e7200f2d4a0381aac
- - - - -
6b90720d by Emmanuel Bourg at 2022-05-03T14:44:29+02:00
Refreshed the patches
- - - - -
7c264d3b by Emmanuel Bourg at 2022-05-03T14:44:38+02:00
Standards-Version updated to 4.6.0.1
- - - - -
d10aca75 by Emmanuel Bourg at 2022-05-03T14:45:11+02:00
Upload to unstable
- - - - -
25 changed files:
- NOTICE
- NOTICE.serializer.txt
- build.xml
- debian/changelog
- debian/control
- debian/patches/01_xjavac_taskdef.patch
- debian/patches/02_build_dont_unzip.patch
- debian/patches/03_bootclasspath.patch
- debian/patches/java10.patch
- docs/docs-book.xml
- docs/dtd/entities.ent
- docs/faq-grammars.xml
- docs/faq-xcatalogs.xml
- docs/faq-xs.xml
- docs/install.xml
- docs/readme.xml
- docs/releases.xml
- docs/samples-jaxp.xml
- docs/source-repository.xml
- docs/style/stylesheets/document2html.xsl
- src/org/apache/xerces/impl/XML11EntityScanner.java
- src/org/apache/xerces/impl/XMLEntityScanner.java
- src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
- src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
- src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Changes:
=====================================
NOTICE
=====================================
@@ -4,7 +4,7 @@
=========================================================================
Apache Xerces Java
- Copyright 1999-2020 The Apache Software Foundation
+ Copyright 1999-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
=====================================
NOTICE.serializer.txt
=====================================
@@ -4,7 +4,7 @@
=========================================================================
Apache Xalan (Xalan serializer)
- Copyright 1999-2006 The Apache Software Foundation
+ Copyright 1999-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
=====================================
build.xml
=====================================
@@ -24,7 +24,7 @@ Authors:
Anupam Bagchi <abagchi at apache.org>
Andy Clark, IBM
- $Id: build.xml 1871489 2019-12-14 12:42:17Z mukulg $
+ $Id: build.xml 1897201 2022-01-19 12:23:24Z mukulg $
==================================================================== -->
<project default="usage" basedir=".">
@@ -57,9 +57,9 @@ Authors:
<property name='parser.Name' value='Xerces-J'/>
<property name='parser.name' value='xerces-j'/>
<property name='parser.shortname' value='xerces'/>
- <property name='parser.Version' value='2.12.1'/>
- <property name='parser.version' value='2.12.1'/>
- <property name='parser_version' value='2_12_1'/>
+ <property name='parser.Version' value='2.12.2'/>
+ <property name='parser.version' value='2.12.2'/>
+ <property name='parser_version' value='2_12_2'/>
<property name='deprecatedjar.parser' value='xerces.jar'/>
<property name='jar.apis' value='xml-apis.jar'/>
@@ -76,7 +76,7 @@ Authors:
<property name='default.parser.config.name' value='XIncludeAwareParserConfiguration'/>
<property name='default.parser.config.qualified' value='org.apache.xerces.parsers.XIncludeAwareParserConfiguration'/>
- <property name="year" value="1999-2020"/>
+ <property name="year" value="1999-2022"/>
<property name="copyright" value="Copyright © ${year} The Apache Software Foundation. All Rights Reserved."/>
<echo message= "---------------- ${parser.Name} ${parser.Version} [${year}] ---------------"/>
@@ -87,8 +87,11 @@ Authors:
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
- <property name="javac.source" value="${ant.java.version}"/>
- <property name="javac.target" value="${ant.java.version}"/>
+ <!--<property name="javac.source" value="${ant.java.version}"/>
+ <property name="javac.target" value="${ant.java.version}"/>-->
+
+ <property name="javac.source" value="1.7"/>
+ <property name="javac.target" value="1.7"/>
<property name="docs.book" value="${docs.dir}/docs-book.xml"/>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libxerces2-java (2.12.2-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+ * Standards-Version updated to 4.6.0.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 03 May 2022 14:45:03 +0200
+
libxerces2-java (2.12.1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
libxml-commons-external-java (>= 1.4.01-2),
libxml-commons-resolver1.1-java,
maven-repo-helper
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0.1
Vcs-Git: https://salsa.debian.org/java-team/libxerces2-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libxerces2-java
Homepage: http://xerces.apache.org/xerces2-j/
=====================================
debian/patches/01_xjavac_taskdef.patch
=====================================
@@ -1,5 +1,3 @@
-Index: b/build.xml
-===================================================================
--- a/build.xml
+++ b/build.xml
@@ -39,7 +39,7 @@
@@ -11,7 +9,7 @@ Index: b/build.xml
<classpath>
<pathelement location="${tools.dir}/bin/xjavac.jar"/>
</classpath>
-@@ -291,7 +291,7 @@
+@@ -294,7 +294,7 @@
source="${javac.source}"
target="${javac.target}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
@@ -20,7 +18,7 @@ Index: b/build.xml
debuglevel="${debuglevel}"
deprecation="${deprecation}"
optimize="${optimize}"
-@@ -359,7 +359,7 @@
+@@ -362,7 +362,7 @@
source="${javac.source}"
target="${javac.target}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
@@ -29,7 +27,7 @@ Index: b/build.xml
debuglevel="${debuglevel}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
-@@ -379,7 +379,7 @@
+@@ -382,7 +382,7 @@
source="${javac.source}"
target="${javac.target}"
classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
=====================================
debian/patches/02_build_dont_unzip.patch
=====================================
@@ -1,6 +1,6 @@
--- a/build.xml
+++ b/build.xml
-@@ -247,7 +247,7 @@
+@@ -250,7 +250,7 @@
<copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
@@ -9,7 +9,7 @@
<unzip src="${src.apis.zip}" dest="${build.src}">
<patternset
includes="org/xml/sax/**
-@@ -270,6 +270,7 @@
+@@ -273,6 +273,7 @@
org/w3c/dom/xpath/**"
/>
</unzip>
@@ -17,7 +17,7 @@
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
-@@ -1239,7 +1240,7 @@
+@@ -1242,7 +1243,7 @@
<replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
@@ -26,7 +26,7 @@
<unzip src="${src.apis.zip}" dest="${build.src}">
<patternset
includes="org/xml/sax/**
-@@ -1262,7 +1263,7 @@
+@@ -1265,7 +1266,7 @@
org/w3c/dom/xpath/**"
/>
</unzip>
=====================================
debian/patches/03_bootclasspath.patch
=====================================
@@ -1,6 +1,6 @@
--- a/build.xml
+++ b/build.xml
-@@ -291,13 +291,14 @@
+@@ -294,13 +294,14 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
@@ -17,7 +17,7 @@
excludes="org/xml/sax/**
javax/xml/**
org/w3c/dom/*
-@@ -359,7 +360,7 @@
+@@ -362,7 +363,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
@@ -26,7 +26,7 @@
debug="${debug}" nowarn="true"
debuglevel="${debuglevel}"
includeAntRuntime="false"
-@@ -1308,7 +1309,7 @@
+@@ -1311,7 +1312,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
=====================================
debian/patches/java10.patch
=====================================
@@ -13,7 +13,7 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -298,7 +298,6 @@
+@@ -301,7 +301,6 @@
optimize="${optimize}"
includeAntRuntime="false"
includeJavaRuntime="true"
@@ -21,7 +21,7 @@ Forwarded: no
excludes="org/xml/sax/**
javax/xml/**
org/w3c/dom/*
-@@ -754,35 +753,35 @@
+@@ -757,35 +756,35 @@
<java fork="yes"
classname="sax.Counter"
failOnError="yes">
@@ -62,7 +62,7 @@ Forwarded: no
<arg value="-dom"/>
<arg value="-threads"/>
<arg value="20"/>
-@@ -794,7 +793,7 @@
+@@ -797,7 +796,7 @@
<java fork="yes"
classname="thread.Test"
failOnError="yes">
@@ -71,7 +71,7 @@ Forwarded: no
<arg value="-threads"/>
<arg value="20"/>
<arg value="-time"/>
-@@ -835,19 +834,19 @@
+@@ -838,19 +837,19 @@
<java fork="yes"
classname="dom.DTest"
failOnError="yes">
@@ -94,7 +94,7 @@ Forwarded: no
<arg value="all"/>
</java>
-@@ -855,13 +854,13 @@
+@@ -858,13 +857,13 @@
<java fork="yes"
classname="dom.ids.Test"
failOnError="yes">
@@ -110,7 +110,7 @@ Forwarded: no
<arg value="${data.dir}/personal-schema.xml"/>
<arg value="out.xml"/>
</java>
-@@ -869,37 +868,37 @@
+@@ -872,37 +871,37 @@
<java fork="yes"
classname="dom.traversal.AllTests"
failOnError="yes">
@@ -154,7 +154,7 @@ Forwarded: no
<arg value="testSchemaLanguageSAX"/>
<arg value="testSchemaSourceSAX"/>
<arg value="testSchemaLanguageDOM"/>
-@@ -909,25 +908,25 @@
+@@ -912,25 +911,25 @@
<java fork="yes"
classname="xinclude.Test"
failOnError="yes">
=====================================
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'
=====================================
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@@'>
=====================================
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>
=====================================
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>
=====================================
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>
=====================================
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>
=====================================
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'>
=====================================
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>
=====================================
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>
=====================================
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
=====================================
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">
=====================================
src/org/apache/xerces/impl/XML11EntityScanner.java
=====================================
@@ -35,7 +35,7 @@ import org.apache.xerces.xni.XMLString;
*
* @author Michael Glavassevich, IBM
* @author Neil Graham, IBM
- * @version $Id: XML11EntityScanner.java 1707341 2015-10-07 17:34:01Z mrglavas $
+ * @version $Id: XML11EntityScanner.java 1897159 2022-01-17 20:48:22Z mrglavas $
*/
public class XML11EntityScanner
extends XMLEntityScanner {
@@ -108,9 +108,11 @@ public class XML11EntityScanner
load(1, false);
}
if (c == '\r' && external) {
- int cc = fCurrentEntity.ch[fCurrentEntity.position++];
- if (cc != '\n' && cc != 0x85) {
- fCurrentEntity.position--;
+ if (fCurrentEntity.position < fCurrentEntity.count) {
+ int cc = fCurrentEntity.ch[fCurrentEntity.position++];
+ if (cc != '\n' && cc != 0x85) {
+ fCurrentEntity.position--;
+ }
}
}
c = '\n';
@@ -968,7 +970,7 @@ public class XML11EntityScanner
c = fCurrentEntity.ch[fCurrentEntity.position++];
// In internal entities control characters are allowed to appear unescaped.
if ((c == quote && !fCurrentEntity.literal)
- || c == '%' || !XML11Char.isXML11InternalEntityContent(c)) {
+ || c == '%' || !(XML11Char.isXML11InternalEntityContent(c) || c == '\r' )) {
fCurrentEntity.position--;
break;
}
=====================================
src/org/apache/xerces/impl/XMLEntityScanner.java
=====================================
@@ -37,7 +37,7 @@ import org.apache.xerces.xni.XMLString;
*
* @author Andy Clark, IBM
* @author Neil Graham, IBM
- * @version $Id: XMLEntityScanner.java 1707346 2015-10-07 17:46:10Z mrglavas $
+ * @version $Id: XMLEntityScanner.java 1897159 2022-01-17 20:48:22Z mrglavas $
*/
public class XMLEntityScanner implements XMLLocator {
@@ -257,8 +257,10 @@ public class XMLEntityScanner implements XMLLocator {
load(1, false);
}
if (c == '\r' && external) {
- if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
- fCurrentEntity.position--;
+ if (fCurrentEntity.position < fCurrentEntity.count) {
+ if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
+ fCurrentEntity.position--;
+ }
}
c = '\n';
}
@@ -904,7 +906,7 @@ public class XMLEntityScanner implements XMLLocator {
c = fCurrentEntity.ch[fCurrentEntity.position++];
if ((c == quote &&
(!fCurrentEntity.literal || external))
- || c == '%' || !XMLChar.isContent(c)) {
+ || c == '%' || !(XMLChar.isContent(c) || c == '\r' && !external)) {
fCurrentEntity.position--;
break;
}
=====================================
src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
=====================================
@@ -59,7 +59,7 @@ import org.w3c.dom.TypeInfo;
* @author Sandy Gao, IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
*
- * @version $Id: XSSimpleTypeDecl.java 1026362 2010-10-22 15:15:18Z sandygao $
+ * @version $Id: XSSimpleTypeDecl.java 1891772 2021-07-24 11:51:11Z mukulg $
*/
public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
@@ -1164,10 +1164,12 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
// check 4.3.1.c1 error: fBase.length & (maxLength | minLength)
if((fBase.fFacetsDefined & FACET_LENGTH) != 0 || (fFacetsDefined & FACET_LENGTH) != 0){
if ((fFacetsDefined & FACET_MINLENGTH) != 0){
- if (fBase.fLength < fMinLength) {
- // fBase.length, minLength and maxLength defined
+ if ((fBase.fFacetsDefined & FACET_LENGTH) != 0 && fBase.fLength < fMinLength) {
reportError("length-minLength-maxLength.1.1", new Object[]{fTypeName, Integer.toString(fBase.fLength), Integer.toString(fMinLength)});
}
+ if ((fFacetsDefined & FACET_LENGTH) != 0 && fLength < fMinLength) {
+ reportError("length-minLength-maxLength.1.1", new Object[]{fTypeName, Integer.toString(fLength), Integer.toString(fMinLength)});
+ }
if ((fBase.fFacetsDefined & FACET_MINLENGTH) == 0){
reportError("length-minLength-maxLength.1.2.a", new Object[]{fTypeName});
}
@@ -1176,10 +1178,12 @@ public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
}
}
if ((fFacetsDefined & FACET_MAXLENGTH) != 0){
- if (fBase.fLength > fMaxLength) {
- // fBase.length, minLength and maxLength defined
+ if ((fBase.fFacetsDefined & FACET_LENGTH) != 0 && fBase.fLength > fMaxLength) {
reportError("length-minLength-maxLength.2.1", new Object[]{fTypeName, Integer.toString(fBase.fLength), Integer.toString(fMaxLength)});
}
+ if ((fFacetsDefined & FACET_LENGTH) != 0 && fLength > fMaxLength) {
+ reportError("length-minLength-maxLength.2.1", new Object[]{fTypeName, Integer.toString(fLength), Integer.toString(fMaxLength)});
+ }
if ((fBase.fFacetsDefined & FACET_MAXLENGTH) == 0){
reportError("length-minLength-maxLength.2.2.a", new Object[]{fTypeName});
}
=====================================
src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
=====================================
@@ -18,7 +18,7 @@
# This file contains error and warning messages related to XML Schema
# The messages are arranged in key and value tuples in a ListResourceBundle.
#
-# @version $Id: XMLSchemaMessages.properties 1869198 2019-10-31 05:21:00Z mukulg $
+# @version $Id: XMLSchemaMessages.properties 1894472 2021-10-22 10:17:43Z mukulg $
BadMessageKey = The error message corresponding to the message key can not be found.
FormatFailed = An internal error occurred while formatting the following message:\n
@@ -69,6 +69,7 @@
cvc-complex-type.3.2.1 = cvc-complex-type.3.2.1: Element ''{0}'' does not have an attribute wildcard for attribute ''{1}''.
cvc-complex-type.3.2.2 = cvc-complex-type.3.2.2: Attribute ''{1}'' is not allowed to appear in element ''{0}''.
cvc-complex-type.4 = cvc-complex-type.4: Attribute ''{1}'' must appear on element ''{0}''.
+ cvc-complex-type.4_ns = cvc-complex-type.4: Attribute ''{1}'' belonging to namespace ''{2}'', must appear on element ''{0}''.
cvc-complex-type.5.1 = cvc-complex-type.5.1: In element ''{0}'', attribute ''{1}'' is a Wild ID. But there is already a Wild ID ''{2}''. There can be only one.
cvc-complex-type.5.2 = cvc-complex-type.5.2: In element ''{0}'', attribute ''{1}'' is a Wild ID. But there is already an attribute ''{2}'' derived from ID among the '{'attribute uses'}'.
cvc-datatype-valid.1.2.1 = cvc-datatype-valid.1.2.1: ''{0}'' is not a valid value for ''{1}''.
=====================================
src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
=====================================
@@ -107,7 +107,7 @@ import org.apache.xerces.xs.XSTypeDefinition;
* @author Elena Litani IBM
* @author Andy Clark IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
- * @version $Id: XMLSchemaValidator.java 1871903 2019-12-22 06:45:03Z mukulg $
+ * @version $Id: XMLSchemaValidator.java 1894472 2021-10-22 10:17:43Z mukulg $
*/
public class XMLSchemaValidator
implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XSElementDeclHelper {
@@ -3224,10 +3224,18 @@ public class XMLSchemaValidator
// {required} is true matches one of the attribute information items in the element
// information item's [attributes] as per clause 3.1 above.
if (currUse.fUse == SchemaSymbols.USE_REQUIRED) {
- if (!isSpecified)
- reportSchemaError(
- "cvc-complex-type.4",
- new Object[] { element.rawname, currDecl.fName });
+ if (!isSpecified) {
+ if (currDecl.fTargetNamespace != null) {
+ reportSchemaError(
+ "cvc-complex-type.4_ns",
+ new Object[] { element.rawname, currDecl.fName, currDecl.fTargetNamespace });
+ }
+ else {
+ reportSchemaError(
+ "cvc-complex-type.4",
+ new Object[] { element.rawname, currDecl.fName });
+ }
+ }
}
// if the attribute is not specified, then apply the value constraint
if (!isSpecified && constType != XSConstants.VC_NONE) {
View it on GitLab: https://salsa.debian.org/java-team/libxerces2-java/-/compare/f90fceebe6b00b92c356c2e9735b297686de5b30...d10aca7598466cebaca8d18b210ef6c88d2c5cad
--
View it on GitLab: https://salsa.debian.org/java-team/libxerces2-java/-/compare/f90fceebe6b00b92c356c2e9735b297686de5b30...d10aca7598466cebaca8d18b210ef6c88d2c5cad
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220503/7d0215f7/attachment.htm>
More information about the pkg-java-commits
mailing list