# HG changeset patch
# User andrew
# Date 1335964632 -3600
# Node ID c51876b27811ba0f6ea3409ba19d357b7400908a
# Parent  60357f0a4102a256ad2fc739b73b6c51e45ede80# Parent  7d18bccaec3781f3d4f2d71879f91e257db2f0f7
Merge

diff -r 60357f0a4102 -r c51876b27811 .hgtags
--- a/.hgtags	Wed May 02 13:39:07 2012 +0100
+++ b/.hgtags	Wed May 02 14:17:12 2012 +0100
@@ -146,6 +146,9 @@
 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
 7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
+0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
+604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
+551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
 98759b436636acf39d07cbc206737fcd831efab0 jdk7u4-b200
 26f5422f16af5f4a64157e90b61402ae979e6ffd jdk7u4-b04
 c09b58cfa2c61a945614886b82fd284389785770 jdk7u4-b02
@@ -157,3 +160,5 @@
 d3b2c77daf2cdb0aa1c50d93e49317727e2eae95 jdk7u4-b227
 72cab8feaf319bc3ba688f461fd9aa62ab73a1cb jdk7u4-b09
 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
+3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
+b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
diff -r 60357f0a4102 -r c51876b27811 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Wed May 02 13:39:07 2012 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Wed May 02 14:17:12 2012 +0100
@@ -448,7 +448,9 @@
             return;
         }
         else if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
-            _useServicesMechanism = value;
+            //in secure mode, let _useServicesMechanism be determined by the constructor
+            if (!_isSecureMode)
+                _useServicesMechanism = value;
         }
         else {
             // unknown feature
diff -r 60357f0a4102 -r c51876b27811 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Wed May 02 13:39:07 2012 +0100
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Wed May 02 14:17:12 2012 +0100
@@ -351,6 +351,10 @@
             fSecurityManager = value ? new SecurityManager() : null;
             fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
             return;
+        } else if (name.equals(Constants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
+            //in secure mode, let _useServicesMechanism be determined by the constructor
+            if (System.getSecurityManager() != null)
+                return;
         }
         try {
             fXMLSchemaLoader.setFeature(name, value);
diff -r 60357f0a4102 -r c51876b27811 src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
--- a/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java	Wed May 02 13:39:07 2012 +0100
+++ b/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java	Wed May 02 14:17:12 2012 +0100
@@ -186,7 +186,9 @@
                 return;
             }
             if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
-                _useServicesMechanism = value;
+                //in secure mode, let _useServicesMechanism be determined by the constructor
+                if (!_isSecureMode)
+                    _useServicesMechanism = value;
                 return;
             }