changeset 5588:4154345656dc

Merge
author ewendeli
date Thu, 06 Dec 2012 16:28:48 +0100
parents e1db218ef2e4 4e2e7b1b2476
children ee61b528b3f8
files
diffstat 4 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/lib/security/java.security	Tue Dec 04 10:39:44 2012 -0800
+++ b/src/share/lib/security/java.security	Thu Dec 06 16:28:48 2012 +0100
@@ -127,7 +127,7 @@
                com.sun.xml.internal.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
-               com.sun.jmx.default.,\
+               com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
@@ -148,7 +148,7 @@
                    com.sun.xml.internal.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
-                   com.sun.jmx.default.,\
+                   com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
--- a/src/share/lib/security/java.security-macosx	Tue Dec 04 10:39:44 2012 -0800
+++ b/src/share/lib/security/java.security-macosx	Thu Dec 06 16:28:48 2012 +0100
@@ -127,6 +127,9 @@
 package.access=sun.,\
                com.sun.xml.internal.,\
                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.,\
@@ -146,6 +149,9 @@
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    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.,\
--- a/src/share/lib/security/java.security-solaris	Tue Dec 04 10:39:44 2012 -0800
+++ b/src/share/lib/security/java.security-solaris	Thu Dec 06 16:28:48 2012 +0100
@@ -128,6 +128,9 @@
 package.access=sun.,\
                com.sun.xml.internal.,\
                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.,\
@@ -146,6 +149,9 @@
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    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.,\
--- a/src/share/lib/security/java.security-windows	Tue Dec 04 10:39:44 2012 -0800
+++ b/src/share/lib/security/java.security-windows	Thu Dec 06 16:28:48 2012 +0100
@@ -127,6 +127,9 @@
 package.access=sun.,\
                com.sun.xml.internal.,\
                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.,\
@@ -145,6 +148,9 @@
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    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.,\