Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jaxp

changeset 792:79ef0ddd342e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 07 Oct 2014 14:41:02 -0700
parents 8d7caa49a36d (diff) eaa469c32434 (current diff)
children 004924227c64
files .hgtags
diffstat 6 files changed, 33 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 07 08:02:02 2014 -0700
+++ b/.hgtags	Tue Oct 07 14:41:02 2014 -0700
@@ -333,3 +333,12 @@
 df68b132a471ed1e825a79bd1d8acb47d2bcc04f jdk8u25-b16
 7a721e57b38ff6c1d34af0b86f6482540a815d90 jdk8u25-b17
 fddbc00bde281d7d437b052262e921ed51de8b9a jdk8u25-b18
+3a1bba8076da4e54882123e98e219eab1c31ccef jdk8u40-b00
+f219da378d0768ff042d77221e5d20676ecc16f0 jdk8u40-b01
+16ef2134c32a4e60b5a60105b371163aa5936278 jdk8u40-b02
+d73144ee471d4d4c49db94b3cc8990479961499a jdk8u40-b03
+23c1a41d75adc6fc57f69528c2c804079f449d94 jdk8u40-b04
+8d60cebf6a0c1cf1a5669e49deb795a1445e826b jdk8u40-b05
+50a2adfa57fcbbe1587991d53f58d227070a24db jdk8u40-b06
+b2210de1587b16ca1d1d781b55e19bc70724c62b jdk8u40-b07
+641eb6543c7186d1c2c26eaf96803b1e6b411d9a jdk8u40-b08
--- a/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Tue Oct 07 08:02:02 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Tue Oct 07 14:41:02 2014 -0700
@@ -54,6 +54,7 @@
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
 import com.sun.org.apache.xerces.internal.util.XMLSymbols;
 import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
 import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
@@ -983,6 +984,18 @@
      */
     public void reset(XMLComponentManager componentManager) throws XMLConfigurationException {
 
+        XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
+        if (spm == null) {
+            spm = new XMLSecurityPropertyManager();
+            setProperty(XML_SECURITY_PROPERTY_MANAGER, spm);
+        }
+
+        XMLSecurityManager sm = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
+        if (sm == null)
+            setProperty(SECURITY_MANAGER,new XMLSecurityManager(true));
+
+        faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
+
         fGrammarBucket.reset();
 
         fSubGroupHandler.reset();
@@ -1066,9 +1079,6 @@
         // get generate-synthetic-annotations feature
         fSchemaHandler.setGenerateSyntheticAnnotations(componentManager.getFeature(GENERATE_SYNTHETIC_ANNOTATIONS, false));
         fSchemaHandler.reset(componentManager);
-
-        XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
-        faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
     }
 
     private void initGrammarBucket(){
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Tue Oct 07 08:02:02 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Tue Oct 07 14:41:02 2014 -0700
@@ -453,7 +453,8 @@
     }
 
     private void propagateFeatures(AbstractXMLSchema schema) {
-        schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, fSecurityManager != null);
+        schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+                (fSecurityManager != null && fSecurityManager.isSecureProcessing()));
         schema.setFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM, fUseServicesMechanism);
         String[] features = fXMLSchemaLoader.getRecognizedFeatures();
         for (int i = 0; i < features.length; ++i) {
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Tue Oct 07 08:02:02 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Tue Oct 07 14:41:02 2014 -0700
@@ -3145,7 +3145,11 @@
                                   m_data.elementAt(-dataIndex+1));
       }
     }
-    else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
+    else if (DTM.ELEMENT_NODE == type)
+    {
+      return getStringValueX(nodeHandle);
+    }
+    else if (DTM.DOCUMENT_FRAGMENT_NODE == type
              || DTM.DOCUMENT_NODE == type)
     {
       return null;
--- a/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java	Tue Oct 07 08:02:02 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java	Tue Oct 07 14:41:02 2014 -0700
@@ -57,7 +57,6 @@
  * <p>The selection of CatalogParsers is made on the basis of the QName
  * of the root element of the document.</p>
  *
- * <p>This class requires the <a href="http://java.sun.com/aboutJava/communityprocess/final/jsr005/index.html">Java API for XML Parsing</a>.</p>
  *
  * @see Catalog
  * @see CatalogReader
--- a/src/org/w3c/dom/package.html	Tue Oct 07 08:02:02 2014 -0700
+++ b/src/org/w3c/dom/package.html	Tue Oct 07 14:41:02 2014 -0700
@@ -3,12 +3,10 @@
 <title>org.w3c.dom package</title>
 </head>
 <body bgcolor="white">
-Provides the interfaces for the Document Object Model (DOM) which is a
-component API of the <a href="http://java.sun.com/xml">Java API for XML
-Processing</a>.  The Document Object Model Level 2 Core API allows programs
-to dynamically access and update the content and structure of documents.
-See the <a href="http://www.w3.org/TR/DOM-Level-2-Core/">specification</a>
-for more information.
+Provides the interfaces for the Document Object Model (DOM). Supports the
+<a href="http://www.w3.org/TR/DOM-Level-2-Core/">Document Object Model Level 2 Core APIi</a>, 
+<a href="http://www.w3.org/TR/DOM-Level-3-Core">Document Object Model (DOM) Level 3 Core</a>, 
+and <a href="http://www.w3.org/TR/DOM-Level-3-LS">Document Object Model (DOM) Level 3 Load and Save</a>.
 
 @since JDK1.4
 </body>