/hg/release/icedtea7-forest-2.5/jaxp: 2 new changesets

[andrew at icedtea.classpath.org]

changeset c903902aadd7 in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=c903902aadd7
author: aefimov
date: Tue May 13 01:18:02 2014 +0400

	8039533: Higher resolution resolvers
	Reviewed-by: joehw


changeset 1300e3d3022b in /hg/release/icedtea7-forest-2.5/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=1300e3d3022b
author: andrew
date: Tue Oct 14 21:12:22 2014 +0100

	Added tag icedtea-2.5.3 for changeset c903902aadd7


diffstat:

 .hgtags                                                                         |   1 +
 src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java |   4 +-
 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java               |  18 +++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (79 lines):

diff -r fe67f260d065 -r 1300e3d3022b .hgtags
--- a/.hgtags	Thu Oct 02 00:41:54 2014 +0100
+++ b/.hgtags	Tue Oct 14 21:12:22 2014 +0100
@@ -492,3 +492,4 @@
 d77720c6a36f0b9c995e47badb8efddd0e8f2021 icedtea-2.5.2
 771d2a0e90aef31fd70a2eda48b2d1aff8c15101 icedtea-2.5.3pre01
 a4e4e763970f6ac7f39892491cfcde2f6e182a1e icedtea-2.5.3pre02
+c903902aadd72d7fdc9bd7904c30eb3a1c6129c1 icedtea-2.5.3
diff -r fe67f260d065 -r 1300e3d3022b src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Oct 02 00:41:54 2014 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Tue Oct 14 21:12:22 2014 +0100
@@ -612,9 +612,9 @@
         //fElementStack2.clear();
         //fReplaceEntityReferences = true;
         //fSupportExternalEntities = true;
-        Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_REPLACING_ENTITY_REFERENCES);
+        Boolean bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES);
         fReplaceEntityReferences = bo.booleanValue();
-        bo = (Boolean)propertyManager.getProperty(XMLInputFactoryImpl.IS_SUPPORTING_EXTERNAL_ENTITIES);
+        bo = (Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES);
         fSupportExternalEntities = bo.booleanValue();
         Boolean cdata = (Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.STAX_REPORT_CDATA_EVENT) ;
         if(cdata != null)
diff -r fe67f260d065 -r 1300e3d3022b src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Thu Oct 02 00:41:54 2014 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Tue Oct 14 21:12:22 2014 +0100
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Stack;
 import javax.xml.XMLConstants;
+import javax.xml.stream.XMLInputFactory;
 
 
 /**
@@ -302,6 +303,11 @@
     /** Property Manager. This is used from Stax */
     protected PropertyManager fPropertyManager ;
 
+    /** StAX properties */
+    boolean fSupportDTD = true;
+    boolean fReplaceEntityReferences = true;
+    boolean fSupportExternalEntities = true;
+
     /** used to restrict external access */
     protected String fAccessExternalDTD = EXTERNAL_ACCESS_DEFAULT;
 
@@ -1133,7 +1139,8 @@
             boolean parameter = entityName.startsWith("%");
             boolean general = !parameter;
             if (unparsed || (general && !fExternalGeneralEntities) ||
-                    (parameter && !fExternalParameterEntities)) {
+                    (parameter && !fExternalParameterEntities) ||
+                    !fSupportDTD || !fSupportExternalEntities) {
 
                 if (fEntityHandler != null) {
                     fResourceIdentifier.clear();
@@ -1428,6 +1435,10 @@
             fStaxEntityResolver = null;
         }
 
+        fSupportDTD = ((Boolean)propertyManager.getProperty(XMLInputFactory.SUPPORT_DTD)).booleanValue();
+        fReplaceEntityReferences = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES)).booleanValue();
+        fSupportExternalEntities = ((Boolean)propertyManager.getProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES)).booleanValue();
+
         // Zephyr feature ignore-external-dtd is the opposite of Xerces' load-external-dtd
         fLoadExternalDTD = !((Boolean)propertyManager.getProperty(Constants.ZEPHYR_PROPERTY_PREFIX + Constants.IGNORE_EXTERNAL_DTD)).booleanValue();
 
@@ -1499,6 +1510,11 @@
         fSecurityManager = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER, null);
         entityExpansionIndex = fSecurityManager.getIndex(Constants.JDK_ENTITY_EXPANSION_LIMIT);
 
+        //StAX Property
+        fSupportDTD = true;
+        fReplaceEntityReferences = true;
+        fSupportExternalEntities = true;
+
         // JAXP 1.5 feature
         XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null);
         if (spm == null) {