Mercurial > hg > release > icedtea7-forest-2.4 > jaxp

changeset 762:5a54c747be64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 12 Aug 2013 12:38:34 -0700
parents 04abe5fcf0fa (current diff) 6ea57bdf6030 (diff)
children abb39bc40bcc
files .hgtags src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
diffstat 4 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Aug 08 23:24:10 2013 -0700
+++ b/.hgtags	Mon Aug 12 12:38:34 2013 -0700
@@ -353,6 +353,7 @@
 07024f18376ce9597ec8679ebcb9f2efdc5afab0 jdk7u40-b36
 f40f45bd95d4140f691c03132f2ab2c8a0233a8f jdk7u40-b37
 680bf140cdd58e7878318ecafc41c9db47ebfacd jdk7u40-b38
+322af0a5cdce6cad8421a73c1b9af345361dfba0 jdk7u40-b39
 1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
 72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02
 399c58bf22ad35a3527a286123497615100746b2 jdk7u45-b03
--- a/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java	Thu Aug 08 23:24:10 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java	Mon Aug 12 12:38:34 2013 -0700
@@ -38,6 +38,7 @@
 import com.sun.org.apache.xerces.internal.util.PropertyState;
 import com.sun.org.apache.xerces.internal.util.Status;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.XMLLocator;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -184,6 +185,10 @@
     protected static final String LOCALE =
         Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
 
+    /** Property identifier: Security property manager. */
+    protected static final String XML_SECURITY_PROPERTY_MANAGER =
+            Constants.XML_SECURITY_PROPERTY_MANAGER;
+
     // debugging
 
     /** Set to true and recompile to print exception stack trace. */
@@ -328,7 +333,8 @@
             VALIDATION_MANAGER,
             JAXP_SCHEMA_SOURCE,
             JAXP_SCHEMA_LANGUAGE,
-            LOCALE
+            LOCALE,
+            XML_SECURITY_PROPERTY_MANAGER
         };
         addRecognizedProperties(recognizedProperties);
 
@@ -406,6 +412,7 @@
             // REVISIT: What is the right thing to do? -Ac
         }
 
+        setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
     } // <init>(SymbolTable,XMLGrammarPool)
 
     //
--- a/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java	Thu Aug 08 23:24:10 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java	Mon Aug 12 12:38:34 2013 -0700
@@ -36,6 +36,7 @@
 import com.sun.org.apache.xerces.internal.util.PropertyState;
 import com.sun.org.apache.xerces.internal.util.Status;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.XMLLocator;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -157,6 +158,10 @@
     protected static final String LOCALE =
         Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
 
+    /** Property identifier: Security property manager. */
+    protected static final String XML_SECURITY_PROPERTY_MANAGER =
+            Constants.XML_SECURITY_PROPERTY_MANAGER;
+
     // debugging
 
     /** Set to true and recompile to print exception stack trace. */
@@ -310,7 +315,8 @@
             XMLGRAMMAR_POOL,
             DATATYPE_VALIDATOR_FACTORY,
             VALIDATION_MANAGER,
-            LOCALE
+            LOCALE,
+            XML_SECURITY_PROPERTY_MANAGER
         };
         addRecognizedProperties(recognizedProperties);
 
@@ -367,6 +373,7 @@
             // REVISIT: What is the right thing to do? -Ac
         }
 
+        setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
     } // <init>(SymbolTable,XMLGrammarPool)
 
     //
--- a/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java	Thu Aug 08 23:24:10 2013 -0700
+++ b/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java	Mon Aug 12 12:38:34 2013 -0700
@@ -136,6 +136,7 @@
             securityPropertyManager = new XMLSecurityPropertyManager();
         }
         int index = securityPropertyManager.getIndex(name);
+
         if (index > -1) {
             /**
              * this is a direct call to this parser, not a subclass since