Mercurial > hg > openjdk > jdk6 > jdk

changeset 1759:478885d1d686

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8186080: Transform XML interfaces 8188880: A JAXB JCK test failure found after 8186080 Reviewed-by: joehw, lancea, dfuchs
author aefimov
date Thu, 19 Oct 2017 17:04:03 +0100
parents 2f33be2c6b6a
children fce9d3983439
files src/share/lib/security/java.security-linux src/share/lib/security/java.security-solaris src/share/lib/security/java.security-windows test/java/lang/SecurityManager/CheckPackageAccess.java
diffstat 4 files changed, 29 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/lib/security/java.security-linux	Tue Oct 03 14:25:31 2017 -0700
+++ b/src/share/lib/security/java.security-linux	Thu Oct 19 17:04:03 2017 +0100
@@ -132,6 +132,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.corba.se.,\
                com.sun.script.,\
@@ -151,12 +152,12 @@
                com.sun.org.apache.xml.internal.res.,\
                com.sun.org.apache.xml.internal.resolver.helpers.,\
                com.sun.org.apache.xml.internal.resolver.readers.,\
+               com.sun.org.apache.xml.internal.security.,\
                com.sun.org.apache.xml.internal.serializer.utils.,\
                com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.apache.xml.internal.security.,\
                com.sun.org.glassfish.,\
-               com.sun.naming.internal.,\
-               org.jcp.xml.dsig.internal.
+               org.jcp.xml.dsig.internal.,\
+               jdk.xml.internal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -173,6 +174,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.corba.se.,\
                    com.sun.script.,\
@@ -192,12 +194,12 @@
                    com.sun.org.apache.xml.internal.res.,\
                    com.sun.org.apache.xml.internal.resolver.helpers.,\
                    com.sun.org.apache.xml.internal.resolver.readers.,\
+                   com.sun.org.apache.xml.internal.security.,\
                    com.sun.org.apache.xml.internal.serializer.utils.,\
                    com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.apache.xml.internal.security.,\
                    com.sun.org.glassfish.,\
-                   com.sun.naming.internal.,\
-                   org.jcp.xml.dsig.internal.
+                   org.jcp.xml.dsig.internal.,\
+                   jdk.xml.internal.
 
 #
 # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-solaris	Tue Oct 03 14:25:31 2017 -0700
+++ b/src/share/lib/security/java.security-solaris	Thu Oct 19 17:04:03 2017 +0100
@@ -133,6 +133,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.corba.se.,\
                com.sun.script.,\
@@ -153,12 +154,12 @@
                com.sun.org.apache.xml.internal.res.,\
                com.sun.org.apache.xml.internal.resolver.helpers.,\
                com.sun.org.apache.xml.internal.resolver.readers.,\
+               com.sun.org.apache.xml.internal.security.,\
                com.sun.org.apache.xml.internal.serializer.utils.,\
                com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.apache.xml.internal.security.,\
                com.sun.org.glassfish.,\
-               com.sun.naming.internal.,\
-               org.jcp.xml.dsig.internal.
+               org.jcp.xml.dsig.internal.,\
+               jdk.xml.internal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -175,6 +176,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.corba.se.,\
                    com.sun.script.,\
@@ -194,12 +196,12 @@
                    com.sun.org.apache.xml.internal.res.,\
                    com.sun.org.apache.xml.internal.resolver.helpers.,\
                    com.sun.org.apache.xml.internal.resolver.readers.,\
+                   com.sun.org.apache.xml.internal.security.,\
                    com.sun.org.apache.xml.internal.serializer.utils.,\
                    com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.apache.xml.internal.security.,\
                    com.sun.org.glassfish.,\
-                   com.sun.naming.internal.,\
-                   org.jcp.xml.dsig.internal.
+                   org.jcp.xml.dsig.internal.,\
+                   jdk.xml.internal.
 
 #
 # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-windows	Tue Oct 03 14:25:31 2017 -0700
+++ b/src/share/lib/security/java.security-windows	Thu Oct 19 17:04:03 2017 +0100
@@ -133,6 +133,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.corba.se.,\
                com.sun.script.,\
@@ -153,13 +154,13 @@
                com.sun.org.apache.xml.internal.res.,\
                com.sun.org.apache.xml.internal.resolver.helpers.,\
                com.sun.org.apache.xml.internal.resolver.readers.,\
+               com.sun.org.apache.xml.internal.security.,\
                com.sun.org.apache.xml.internal.serializer.utils.,\
                com.sun.org.apache.xml.internal.utils.,\
-               com.sun.org.apache.xml.internal.security.,\
                com.sun.org.glassfish.,\
-               com.sun.naming.internal.,\
-               org.jcp.xml.dsig.internal.\
-               com.sun.java.accessibility.
+               org.jcp.xml.dsig.internal.,\
+               com.sun.java.accessibility.,\
+               jdk.xml.internal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -176,6 +177,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.corba.se.,\
                    com.sun.script.,\
@@ -195,13 +197,13 @@
                    com.sun.org.apache.xml.internal.res.,\
                    com.sun.org.apache.xml.internal.resolver.helpers.,\
                    com.sun.org.apache.xml.internal.resolver.readers.,\
+                   com.sun.org.apache.xml.internal.security.,\
                    com.sun.org.apache.xml.internal.serializer.utils.,\
                    com.sun.org.apache.xml.internal.utils.,\
-                   com.sun.org.apache.xml.internal.security.,\
                    com.sun.org.glassfish.,\
-                   com.sun.naming.internal.,\
-                   org.jcp.xml.dsig.internal.\
-                   com.sun.java.accessibility.
+                   org.jcp.xml.dsig.internal.,\
+                   com.sun.java.accessibility.,\
+                   jdk.xml.internal.
 
 #
 # Determines whether this properties file can be appended to
--- a/test/java/lang/SecurityManager/CheckPackageAccess.java	Tue Oct 03 14:25:31 2017 -0700
+++ b/test/java/lang/SecurityManager/CheckPackageAccess.java	Thu Oct 19 17:04:03 2017 +0100
@@ -81,10 +81,11 @@
         "com.sun.script.",
         "oracle.jrockit.jfr.",
         "org.jcp.xml.dsig.internal.",
+        "jdk.xml.internal."
     };
 
     public static void main(String[] args) throws Exception {
-        List<String> pkgs = new ArrayList<>(Arrays.asList(packages));
+        List<String> pkgs = new ArrayList<String>(Arrays.asList(packages));
         String osName = System.getProperty("os.name");
         if (osName.contains("OS X")) {
             pkgs.add("apple.");  // add apple package for OS X
@@ -140,7 +141,7 @@
     }
 
     private static List<String> getPackages(String p) {
-        List<String> packages = new ArrayList<>();
+        List<String> packages = new ArrayList<String>();
         if (p != null && !p.equals("")) {
             StringTokenizer tok = new StringTokenizer(p, ",");
             while (tok.hasMoreElements()) {