changeset 5736:4cf4f35f729a

8006864: Update java.security-linux to include changes in java.security Reviewed-by: mullan, mchung
author ewendeli
date Thu, 07 Feb 2013 13:12:55 +0100
parents f77cf169e713
children 3e82e2c9b4e7
files src/share/lib/security/java.security-linux src/share/lib/security/java.security-macosx src/share/lib/security/java.security-solaris src/share/lib/security/java.security-windows
diffstat 4 files changed, 32 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/lib/security/java.security-linux	Mon Feb 04 00:24:58 2013 +0100
+++ b/src/share/lib/security/java.security-linux	Thu Feb 07 13:12:55 2013 +0100
@@ -123,7 +123,19 @@
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr.
+package.access=sun.,\
+               com.sun.xml.internal.bind.,\
+               com.sun.xml.internal.org.jvnet.staxex.,\
+               com.sun.xml.internal.ws.,\
+               com.sun.imageio.,\
+               com.sun.istack.internal.,\
+               com.sun.jmx.defaults.,\
+               com.sun.jmx.remote.util.,\
+               com.sun.org.apache.xerces.internal.utils.,\
+               com.sun.org.apache.xalan.internal.utils.,\
+               com.sun.org.glassfish.external.,\
+               com.sun.org.glassfish.gmbal.,\
+               oracle.jrockit.jfr.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -135,7 +147,19 @@
 # by default, none of the class loaders supplied with the JDK call
 # checkPackageDefinition.
 #
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,oracle.jrockit.jfr.
+package.definition=sun.,\
+                   com.sun.xml.internal.bind.,\
+                   com.sun.xml.internal.org.jvnet.staxex.,\
+                   com.sun.xml.internal.ws.,\
+                   com.sun.imageio.,\
+                   com.sun.istack.internal.,\
+                   com.sun.jmx.defaults.,\
+                   com.sun.jmx.remote.util.,\
+                   com.sun.org.apache.xerces.internal.utils.,\
+                   com.sun.org.apache.xalan.internal.utils.,\
+                   com.sun.org.glassfish.external.,\
+                   com.sun.org.glassfish.gmbal.,\
+                   oracle.jrockit.jfr.
 
 #
 # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-macosx	Mon Feb 04 00:24:58 2013 +0100
+++ b/src/share/lib/security/java.security-macosx	Thu Feb 07 13:12:55 2013 +0100
@@ -136,7 +136,7 @@
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
                com.sun.org.glassfish.gmbal.,\
-	       oracle.jrockit.jfr.,\
+               oracle.jrockit.jfr.,\
                apple.
 
 #
@@ -161,7 +161,7 @@
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
                    com.sun.org.glassfish.gmbal.,\
-		   oracle.jrockit.jfr.,\
+                   oracle.jrockit.jfr.,\
                    apple.
 
 #
--- a/src/share/lib/security/java.security-solaris	Mon Feb 04 00:24:58 2013 +0100
+++ b/src/share/lib/security/java.security-solaris	Thu Feb 07 13:12:55 2013 +0100
@@ -125,7 +125,6 @@
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-<<<<<<< variant A
 package.access=sun.,\
                com.sun.xml.internal.bind.,\
                com.sun.xml.internal.org.jvnet.staxex.,\
@@ -138,7 +137,7 @@
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
                com.sun.org.glassfish.gmbal.,\
-	       oracle.jrockit.jfr.
+               oracle.jrockit.jfr.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -162,7 +161,7 @@
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
                    com.sun.org.glassfish.gmbal.,\
-		   oracle.jrockit.jfr.
+                   oracle.jrockit.jfr.
 
 #
 # Determines whether this properties file can be appended to
--- a/src/share/lib/security/java.security-windows	Mon Feb 04 00:24:58 2013 +0100
+++ b/src/share/lib/security/java.security-windows	Thu Feb 07 13:12:55 2013 +0100
@@ -136,7 +136,7 @@
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
                com.sun.org.glassfish.gmbal.,\
-	       oracle.jrockit.jfr.
+               oracle.jrockit.jfr.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -160,7 +160,7 @@
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
                    com.sun.org.glassfish.gmbal.,\
-		   oracle.jrockit.jfr.
+                   oracle.jrockit.jfr.
 
 #
 # Determines whether this properties file can be appended to