Details
-
Bug
-
Resolution: Fixed
-
P3
-
9
-
None
Backports
Issue | Fix Version | Assignee | Priority | Status | Resolution | Resolved In Build |
---|---|---|---|---|---|---|
JDK-8083919 | emb-9 | Joe Wang | P3 | Resolved | Fixed | team |
Description
Update JDK/JAXP from Xerces:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?view=log
Include Revisions:
This class only: 1343961(XERCESJ-1564), 1333217(XERCESJ-1559), 1328735, 1129328(XERCESJ-1515), 1094489
(changed below), 1040377(XERCESJ-1486), 915059, 911694, 907433(XERCESJ-1085), 883990, 883581(XERCESJ-1406),
785294(XERCESJ-1378), 724199, 717982 (XERCESJ-1337), 591460, 548089, 450169, 449473, 426369, 425602, 418433,
392309, 381165, 381004(XERCESJ-1141, Major), 369542(XERCESJ-1128)
Cleanup: 520559, 520553
Changes deviate from the original patches:
1094489:
Change the error message to:
cvc-complex-type.2.4.f: Element '<element name>' is the 4th in a sequence that limits maximum occurance to 3.
instead of:
cvc-complex-type.2.4.f: 'WC[##any]' can occur a maximum of '3' times in the current sequence. This limit was
exceeded. No child element is expected at this point.
Multiple classes:
1428379
impl/xs/XMLSchemaValidator.java
impl/xs/util/XS10TypeHelper.java
1380445 (XERCESJ-1581)
impl/dtd/XMLDTDValidator.java
impl/validation/ConfigurableValidationState.java
impl/validation/ValidationState.java
impl/xs/XMLSchemaValidator.java
1024038 (XERCESJ-1469)
dom/PSVIAttrNSImpl.java
dom/PSVIElementNSImpl.java
impl/dv/ValidatedInfo.java
impl/dv/util/ByteListImpl.java
impl/dv/xs/XSSimpleTypeDecl.java
impl/dv/xs/XSSimpleTypeDelegate.java
impl/xs/AttributePSVImpl.java
impl/xs/ElementPSVImpl.java
impl/xs/SchemaGrammar.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSAttributeDecl.java
impl/xs/XSAttributeUseImpl.java
impl/xs/XSElementDecl.java
impl/xs/XSModelImpl.java
xs/ItemPSVI.java
xs/XSAttributeDeclaration.java
xs/XSAttributeUse.java
xs/XSElementDeclaration.java
xs/XSFacet.java
xs/XSModel.java
xs/XSMultiValueFacet.java
xs/XSNamespaceItem.java
xs/XSSimpleTypeDefinition.java
xs/datatypes/ByteList.java
982466(XERCESJ-1463)
impl/xs/SubstitutionGroupHandler.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSElementDeclHelper.java
955053 (XERCESJ-809)
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
937816
impl/xs/XMLSchemaValidator.java
util/XMLAttributesImpl.java
911823
impl/xs/XMLSchemaValidator.java
impl/xs/models/CMNodeFactory.java
806363 (XERCESJ-1452)
impl/msg/XMLSchemaMessages.properties
impl/xs/XMLSchemaValidator.java
impl/xs/models/XSAllCM.java
impl/xs/models/XSCMValidator.java
impl/xs/models/XSDFACM.java
impl/xs/models/XSEmptyCM.java
805582
dom/AttrNSImpl.java
dom/DOMConfigurationImpl.java
dom/ElementNSImpl.java
impl/Constants.java
impl/dv/xs/BaseSchemaDVFactory.java
impl/dv/xs/XSSimpleTypeDecl.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSDeclarationPool.java
impl/xs/traversers/XSDComplexTypeTraverser.java
impl/xs/traversers/XSDHandler.java
impl/xs/traversers/XSDSimpleTypeTraverser.java
parsers/StandardParserConfiguration.java
parsers/XML11Configuration.java
784915
dom/DOMConfigurationImpl.java
impl/Constants.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/traversers/XSDAttributeGroupTraverser.java
impl/xs/traversers/XSDAttributeTraverser.java
impl/xs/traversers/XSDComplexTypeTraverser.java
impl/xs/traversers/XSDElementTraverser.java
impl/xs/traversers/XSDGroupTraverser.java
impl/xs/traversers/XSDHandler.java
impl/xs/traversers/XSDKeyrefTraverser.java
impl/xs/traversers/XSDNotationTraverser.java
impl/xs/traversers/XSDSimpleTypeTraverser.java
impl/xs/traversers/XSDUniqueOrKeyTraverser.java
parsers/DOMParserImpl.java
parsers/StandardParserConfiguration.java
parsers/XML11Configuration.java
779298
dom/DOMConfigurationImpl.java
impl/Constants.java
impl/xs/SchemaGrammar.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSGrammarBucket.java
impl/xs/XSModelImpl.java
impl/xs/traversers/XSDAttributeGroupTraverser.java
impl/xs/traversers/XSDAttributeTraverser.java
impl/xs/traversers/XSDComplexTypeTraverser.java
impl/xs/traversers/XSDElementTraverser.java
impl/xs/traversers/XSDGroupTraverser.java
impl/xs/traversers/XSDHandler.java
impl/xs/traversers/XSDKeyrefTraverser.java
impl/xs/traversers/XSDNotationTraverser.java
impl/xs/traversers/XSDSimpleTypeTraverser.java
impl/xs/traversers/XSDUniqueOrKeyTraverser.java
parsers/DOMParserImpl.java
parsers/StandardParserConfiguration.java
parsers/XML11Configuration.java
724223 (XMLSchemaValidator, XMLSchemaMessages.properties)
718856 (XERCESJ-1339, XMLSchemaValidator, PSVIAttrNSImpl.java, PSVIElementNSImpl.java, XMLErrorReporter.java,
AttributePSVImpl.java, ElementPSVImpl.java, PSVIErrorList.java, ItemPSVI.java)
718172 (XERCESJ-1338, XMLSchemaValidator, Constants, StandardParserConfiguration, XML11Configuration)
704619 (XMLSchemaValidator, XSAttributeChecker)
520039 (XMLSchemaValidator, Field, FieldActivator, ValueStore)
393314
impl/xs/XMLSchemaValidator.java
Directoryxerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java
371617 (XERCESJ-1131) (done, refer toJDK-8037819)
impl/Constants.java
impl/dv/ValidatedInfo.java
impl/msg/XMLSchemaMessages.properties
impl/xs/XMLSchemaValidator.java
jaxp/validation/XMLSchema.java
jaxp/validation/XMLSchemaFactory.java
jaxp/validation/XMLSchemaValidatorComponentManager.java modified , text changed
parsers/StandardParserConfiguration.javachanged
parsers/XML11Configuration.java
Fixed bugs:
XERCESJ-1141 Major root-type-definition property not read by XMLSchemaValidator during reset()
XERCESJ-1128 Major Incorrect values for {validation attempted} property in PSVI
XERCESJ-1337 Minor Support XSTypeDefinition as a value of the "root-type-definition" property.
Exclude Revisions:
Reason to exclude:
Revisions already in JAXP sources:
Verified that the following revisions are in JDK/JAXP already:
469584
367212 (XERCESJ-1092 Major)
345572 (XERCESJ-682 Blocker)
320551 (XERCESJ-1090 Minor)
320526 (XERCESJ-1083 Major)
Bug fixes already in JAXP sources:
XERCESJ-682 Blocker Comination of fields in <xsd:unique> acts as <xsd:key>
XERCESJ-1092 Better error reporting for identity constraint errors (change to XMLSchemaMessages.properties was missed)
XERCESJ-1083 Major Error reporting when schema can't be found throws null pointer exception
XERCESJ-1090 Minor comments not ignored in schema validation
-----------------------------------------------------------------------------------------------------------
Related Classes:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java?view=log
Update along with XMLSchemaLoader.java since they share most of the revisions, that are:
982466(XERCESJ-1463), 955053 (XERCESJ-809), 805582, 784915, 779298
Revisions that change this class only:
906117, 817494, 810536, 693488, 521495, 462925, 454605
Revisions that change multiple classes, except those shared by XMLSchemaLoader.java:
810237
impl/dv/xs/XSSimpleTypeDecl.java
impl/xs/XMLSchemaLoader.java
656090
impl/xs/XMLSchemaLoader.java
impl/xs/XSLoaderImpl.java
impl/xs/util/XSGrammarPool.java
641940
impl/xs/FilePathToURI.java
impl/xs/XMLSchemaLoader.java
462861
impl/msg/XMLSchemaMessages.properties
impl/xs/XMLSchemaLoader.java
Minor changes that have no inter-class dependencies (may apply changes to this class only)
603454, 449487, 388860 (XERCESJ-1148, Vector to ArrayList)
Different approach in JAXP:
454599 (no need)
Revisions already in JAXP sources:
Verified that the following revisions are in JDK/JAXP already:
713638(XERCESJ-1336 Minor), 320586(XERCESJ-1101 Critical)
Bug fixes already in JAXP sources:
XERCESJ-1101 Critical Validating DocumentBuilder instance fails to parse more than one XML document.
XERCESJ-1336 Minor Add a new property for setting the locale used for reporting error messages.
------------------------------------------------------------------------------------------------------------
Other related classes:
Need to evaluate, many classes in the above revisions contain changes that involve no other classes than the two
above, in which case, they may be updated completely. For the ones that do have more complicated changes, consider
bringing in related revisions only. Please document each class in the comment section.
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?view=log
Include Revisions:
This class only: 1343961(XERCESJ-1564), 1333217(XERCESJ-1559), 1328735, 1129328(XERCESJ-1515), 1094489
(changed below), 1040377(XERCESJ-1486), 915059, 911694, 907433(XERCESJ-1085), 883990, 883581(XERCESJ-1406),
785294(XERCESJ-1378), 724199, 717982 (XERCESJ-1337), 591460, 548089, 450169, 449473, 426369, 425602, 418433,
392309, 381165, 381004(XERCESJ-1141, Major), 369542(XERCESJ-1128)
Cleanup: 520559, 520553
Changes deviate from the original patches:
1094489:
Change the error message to:
cvc-complex-type.2.4.f: Element '<element name>' is the 4th in a sequence that limits maximum occurance to 3.
instead of:
cvc-complex-type.2.4.f: 'WC[##any]' can occur a maximum of '3' times in the current sequence. This limit was
exceeded. No child element is expected at this point.
Multiple classes:
1428379
impl/xs/XMLSchemaValidator.java
impl/xs/util/XS10TypeHelper.java
1380445 (XERCESJ-1581)
impl/dtd/XMLDTDValidator.java
impl/validation/ConfigurableValidationState.java
impl/validation/ValidationState.java
impl/xs/XMLSchemaValidator.java
1024038 (XERCESJ-1469)
dom/PSVIAttrNSImpl.java
dom/PSVIElementNSImpl.java
impl/dv/ValidatedInfo.java
impl/dv/util/ByteListImpl.java
impl/dv/xs/XSSimpleTypeDecl.java
impl/dv/xs/XSSimpleTypeDelegate.java
impl/xs/AttributePSVImpl.java
impl/xs/ElementPSVImpl.java
impl/xs/SchemaGrammar.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSAttributeDecl.java
impl/xs/XSAttributeUseImpl.java
impl/xs/XSElementDecl.java
impl/xs/XSModelImpl.java
xs/ItemPSVI.java
xs/XSAttributeDeclaration.java
xs/XSAttributeUse.java
xs/XSElementDeclaration.java
xs/XSFacet.java
xs/XSModel.java
xs/XSMultiValueFacet.java
xs/XSNamespaceItem.java
xs/XSSimpleTypeDefinition.java
xs/datatypes/ByteList.java
982466(XERCESJ-1463)
impl/xs/SubstitutionGroupHandler.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSElementDeclHelper.java
955053 (XERCESJ-809)
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
937816
impl/xs/XMLSchemaValidator.java
util/XMLAttributesImpl.java
911823
impl/xs/XMLSchemaValidator.java
impl/xs/models/CMNodeFactory.java
806363 (XERCESJ-1452)
impl/msg/XMLSchemaMessages.properties
impl/xs/XMLSchemaValidator.java
impl/xs/models/XSAllCM.java
impl/xs/models/XSCMValidator.java
impl/xs/models/XSDFACM.java
impl/xs/models/XSEmptyCM.java
805582
dom/AttrNSImpl.java
dom/DOMConfigurationImpl.java
dom/ElementNSImpl.java
impl/Constants.java
impl/dv/xs/BaseSchemaDVFactory.java
impl/dv/xs/XSSimpleTypeDecl.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSDeclarationPool.java
impl/xs/traversers/XSDComplexTypeTraverser.java
impl/xs/traversers/XSDHandler.java
impl/xs/traversers/XSDSimpleTypeTraverser.java
parsers/StandardParserConfiguration.java
parsers/XML11Configuration.java
784915
dom/DOMConfigurationImpl.java
impl/Constants.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/traversers/XSDAttributeGroupTraverser.java
impl/xs/traversers/XSDAttributeTraverser.java
impl/xs/traversers/XSDComplexTypeTraverser.java
impl/xs/traversers/XSDElementTraverser.java
impl/xs/traversers/XSDGroupTraverser.java
impl/xs/traversers/XSDHandler.java
impl/xs/traversers/XSDKeyrefTraverser.java
impl/xs/traversers/XSDNotationTraverser.java
impl/xs/traversers/XSDSimpleTypeTraverser.java
impl/xs/traversers/XSDUniqueOrKeyTraverser.java
parsers/DOMParserImpl.java
parsers/StandardParserConfiguration.java
parsers/XML11Configuration.java
779298
dom/DOMConfigurationImpl.java
impl/Constants.java
impl/xs/SchemaGrammar.java
impl/xs/XMLSchemaLoader.java
impl/xs/XMLSchemaValidator.java
impl/xs/XSGrammarBucket.java
impl/xs/XSModelImpl.java
impl/xs/traversers/XSDAttributeGroupTraverser.java
impl/xs/traversers/XSDAttributeTraverser.java
impl/xs/traversers/XSDComplexTypeTraverser.java
impl/xs/traversers/XSDElementTraverser.java
impl/xs/traversers/XSDGroupTraverser.java
impl/xs/traversers/XSDHandler.java
impl/xs/traversers/XSDKeyrefTraverser.java
impl/xs/traversers/XSDNotationTraverser.java
impl/xs/traversers/XSDSimpleTypeTraverser.java
impl/xs/traversers/XSDUniqueOrKeyTraverser.java
parsers/DOMParserImpl.java
parsers/StandardParserConfiguration.java
parsers/XML11Configuration.java
724223 (XMLSchemaValidator, XMLSchemaMessages.properties)
718856 (XERCESJ-1339, XMLSchemaValidator, PSVIAttrNSImpl.java, PSVIElementNSImpl.java, XMLErrorReporter.java,
AttributePSVImpl.java, ElementPSVImpl.java, PSVIErrorList.java, ItemPSVI.java)
718172 (XERCESJ-1338, XMLSchemaValidator, Constants, StandardParserConfiguration, XML11Configuration)
704619 (XMLSchemaValidator, XSAttributeChecker)
520039 (XMLSchemaValidator, Field, FieldActivator, ValueStore)
393314
impl/xs/XMLSchemaValidator.java
Directoryxerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java
371617 (XERCESJ-1131) (done, refer to
impl/Constants.java
impl/dv/ValidatedInfo.java
impl/msg/XMLSchemaMessages.properties
impl/xs/XMLSchemaValidator.java
jaxp/validation/XMLSchema.java
jaxp/validation/XMLSchemaFactory.java
jaxp/validation/XMLSchemaValidatorComponentManager.java modified , text changed
parsers/StandardParserConfiguration.javachanged
parsers/XML11Configuration.java
Fixed bugs:
XERCESJ-1141 Major root-type-definition property not read by XMLSchemaValidator during reset()
XERCESJ-1128 Major Incorrect values for {validation attempted} property in PSVI
XERCESJ-1337 Minor Support XSTypeDefinition as a value of the "root-type-definition" property.
Exclude Revisions:
Reason to exclude:
Revisions already in JAXP sources:
Verified that the following revisions are in JDK/JAXP already:
469584
367212 (XERCESJ-1092 Major)
345572 (XERCESJ-682 Blocker)
320551 (XERCESJ-1090 Minor)
320526 (XERCESJ-1083 Major)
Bug fixes already in JAXP sources:
XERCESJ-682 Blocker Comination of fields in <xsd:unique> acts as <xsd:key>
XERCESJ-1092 Better error reporting for identity constraint errors (change to XMLSchemaMessages.properties was missed)
XERCESJ-1083 Major Error reporting when schema can't be found throws null pointer exception
XERCESJ-1090 Minor comments not ignored in schema validation
-----------------------------------------------------------------------------------------------------------
Related Classes:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java?view=log
Update along with XMLSchemaLoader.java since they share most of the revisions, that are:
982466(XERCESJ-1463), 955053 (XERCESJ-809), 805582, 784915, 779298
Revisions that change this class only:
906117, 817494, 810536, 693488, 521495, 462925, 454605
Revisions that change multiple classes, except those shared by XMLSchemaLoader.java:
810237
impl/dv/xs/XSSimpleTypeDecl.java
impl/xs/XMLSchemaLoader.java
656090
impl/xs/XMLSchemaLoader.java
impl/xs/XSLoaderImpl.java
impl/xs/util/XSGrammarPool.java
641940
impl/xs/FilePathToURI.java
impl/xs/XMLSchemaLoader.java
462861
impl/msg/XMLSchemaMessages.properties
impl/xs/XMLSchemaLoader.java
Minor changes that have no inter-class dependencies (may apply changes to this class only)
603454, 449487, 388860 (XERCESJ-1148, Vector to ArrayList)
Different approach in JAXP:
454599 (no need)
Revisions already in JAXP sources:
Verified that the following revisions are in JDK/JAXP already:
713638(XERCESJ-1336 Minor), 320586(XERCESJ-1101 Critical)
Bug fixes already in JAXP sources:
XERCESJ-1101 Critical Validating DocumentBuilder instance fails to parse more than one XML document.
XERCESJ-1336 Minor Add a new property for setting the locale used for reporting error messages.
------------------------------------------------------------------------------------------------------------
Other related classes:
Need to evaluate, many classes in the above revisions contain changes that involve no other classes than the two
above, in which case, they may be updated completely. For the ones that do have more complicated changes, consider
bringing in related revisions only. Please document each class in the comment section.
Attachments
Issue Links
- backported by
-
JDK-8083919 Xerces Update: XMLSchemaValidator.java and XMLSchemaLoader.java
- Resolved
- relates to
-
JDK-8037819 Xerces Update: jaxp/validation/XMLSchemaFactory
- Resolved
-
JDK-8142463 Xml schema validation failing after Xerces update; maxOccurs ignored
- Resolved
-
JDK-8238164 Update Xerces2 Java to version 2.12.0
- Resolved