--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/XalanConstants.java Mon Dec 07 14:21:05 2015 -0800
@@ -221,27 +221,4 @@
public static final String FEATURE_TRUE = "true";
public static final String FEATURE_FALSE = "false";
- /**
- * Check if we're in jdk8 or above
- */
- public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
-
- /*
- * Check the major version of the current JDK against that specified
- * in the parameter
- *
- * In JDK9 the java version string was changed to comply with JEP-223
- * so this method was modified to handle that new format as well
- *
- * @param compareTo a JDK major version to be compared to
- * @return true if the current major version is the same or above
- * that represented by the parameter
- */
- public static boolean isJavaVersionAtLeast(int compareTo) {
- String javaVersion = SecuritySupport.getSystemProperty("java.version");
- javaVersion = (javaVersion.matches("[1-9][0-9]*(\\.(0|[1-9][0-9]*))*\\-.*")) ?
- javaVersion.split("-|\\.")[0] :
- javaVersion.split("\\.", 3)[1];
- return Integer.parseInt(javaVersion) >= compareTo;
- }
} // class Constants
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Mon Dec 07 14:21:05 2015 -0800
@@ -524,7 +524,7 @@
_xmlSecurityManager.setSecureProcessing(value);
// set external access restriction when FSP is explicitly set
- if (value && XalanConstants.IS_JDK8_OR_ABOVE) {
+ if (value) {
_xmlSecurityPropertyMgr.setValue(Property.ACCESS_EXTERNAL_DTD,
State.FSP, XalanConstants.EXTERNAL_ACCESS_DEFAULT_FSP);
_xmlSecurityPropertyMgr.setValue(Property.ACCESS_EXTERNAL_STYLESHEET,
@@ -539,7 +539,6 @@
_featureManager.setValue(FeatureManager.Feature.ORACLE_ENABLE_EXTENSION_FUNCTION,
FeaturePropertyBase.State.FSP, XalanConstants.FEATURE_FALSE);
}
- return;
}
else if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
//in secure mode, let _useServicesMechanism be determined by the constructor
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java Mon Dec 07 14:21:05 2015 -0800
@@ -203,11 +203,6 @@
*/
public static final String EXTERNAL_ACCESS_DEFAULT = ACCESS_EXTERNAL_ALL;
- /**
- * Check if we're in jdk8 or above
- */
- public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8);
-
//
// Implementation limits: corresponding System Properties of the above
// API properties
@@ -856,25 +851,6 @@
? new ArrayEnumeration(fgXercesProperties) : fgEmptyEnumeration;
} // getXercesProperties():Enumeration
- /*
- * Check the major version of the current JDK against that specified
- * in the parameter
- *
- * In JDK9 the java version string was changed to comply with JEP-223
- * so this method was modified to handle that new format as well
- *
- * @param compareTo a JDK major version to be compared to
- * @return true if the current major version is the same or above
- * that represented by the parameter
- */
- public static boolean isJavaVersionAtLeast(int compareTo) {
- String javaVersion = SecuritySupport.getSystemProperty("java.version");
- javaVersion = (javaVersion.matches("[1-9][0-9]*(\\.(0|[1-9][0-9]*))*\\-.*")) ?
- javaVersion.split("-|\\.")[0] :
- javaVersion.split("\\.", 3)[1];
- return Integer.parseInt(javaVersion) >= compareTo;
- }
-
//
// Classes
//
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Mon Dec 07 14:21:05 2015 -0800
@@ -136,6 +136,7 @@
* positions in the second dimension of the transition table.
*/
private int fTransTable[][] = null;
+
/**
* Array containing occurence information for looping states
* which use counters to check minOccurs/maxOccurs.
@@ -211,6 +212,7 @@
// Store away our index and pools in members
fLeafCount = leafCount;
+ fIsCompactedForUPA = syntaxTree.isCompactedForUPA();
//
// Create some string pool indexes that represent the names of some
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java Mon Dec 07 14:21:05 2015 -0800
@@ -184,13 +184,11 @@
*/
if (features != null) {
Boolean temp = features.get(XMLConstants.FEATURE_SECURE_PROCESSING);
- if (temp != null) {
- if (temp && Constants.IS_JDK8_OR_ABOVE) {
- fSecurityPropertyMgr.setValue(Property.ACCESS_EXTERNAL_DTD,
- State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- fSecurityPropertyMgr.setValue(Property.ACCESS_EXTERNAL_SCHEMA,
- State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- }
+ if (temp != null && temp) {
+ fSecurityPropertyMgr.setValue(Property.ACCESS_EXTERNAL_DTD,
+ State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+ fSecurityPropertyMgr.setValue(Property.ACCESS_EXTERNAL_SCHEMA,
+ State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
}
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Mon Dec 07 14:21:05 2015 -0800
@@ -164,14 +164,11 @@
if (features != null) {
Boolean temp = features.get(XMLConstants.FEATURE_SECURE_PROCESSING);
- if (temp != null) {
- if (temp && Constants.IS_JDK8_OR_ABOVE) {
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
-
- }
+ if (temp != null && temp) {
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
}
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Mon Dec 07 14:21:05 2015 -0800
@@ -427,12 +427,10 @@
fSecurityManager.setSecureProcessing(value);
if (value) {
- if (Constants.IS_JDK8_OR_ABOVE) {
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
- XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
- }
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
+ fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
+ XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
}
fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java Wed Dec 02 15:55:45 2015 -0800
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java Mon Dec 07 14:21:05 2015 -0800
@@ -364,7 +364,7 @@
fInitSecurityManager.setSecureProcessing(value);
setProperty(SECURITY_MANAGER, fInitSecurityManager);
- if (value && Constants.IS_JDK8_OR_ABOVE) {
+ if (value) {
fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD,
XMLSecurityPropertyManager.State.FSP, Constants.EXTERNAL_ACCESS_DEFAULT_FSP);
fSecurityPropertyMgr.setValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java Mon Dec 07 14:21:05 2015 -0800
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package validation.tck;
+
+import java.io.IOException;
+import javax.xml.XMLConstants;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import org.testng.annotations.Test;
+import org.xml.sax.SAXException;
+
+
+/*
+ * @bug 8142463
+ * @summary Tests that verify bug fixes for Particles (http://www.w3.org/TR/xmlschema11-1/#cParticles)
+
+ * @author Joe Wang (huizhe.wang@oracle.com)
+ */
+public class ParticleTest {
+ static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+ static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
+
+ /*
+ @bug 8142463
+ This test verifies the fix for a missing flag that indicates the DFA
+ is compacted for UPA. Without the fix, the 2nd foo:foo element was
+ rejected.
+ */
+ @Test
+ public void test() throws SAXException, IOException {
+ SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = schemaFactory.newSchema(new StreamSource(ParticleTest.class.getResourceAsStream("upa01.xsd")));
+ Validator validator = schema.newValidator();
+
+ validator.validate(new StreamSource(ParticleTest.class.getResourceAsStream("upa01.xml")));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/upa01.xml Mon Dec 07 14:21:05 2015 -0800
@@ -0,0 +1,6 @@
+<foo:root xmlns:foo="foo">
+ <foo:foo>true</foo:foo>
+ <foo>123</foo >
+ <foo:foo>true</foo:foo>
+ <foo>123</foo >
+</foo:root>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/upa01.xsd Mon Dec 07 14:21:05 2015 -0800
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="foo"
+ xmlns="foo"
+ >
+ <xsd:element name="e1" type="xsd:boolean" />
+ <xsd:element name="foo" substitutionGroup="e1" type="xsd:boolean" />
+
+ <xsd:element name="root" type="B" />
+
+ <xsd:complexType name="B">
+ <xsd:choice maxOccurs="1000">
+ <xsd:element ref="e1" />
+ <xsd:element name="foo" type="xsd:int" form="unqualified"/>
+ </xsd:choice>
+ </xsd:complexType>
+
+</xsd:schema>