Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormullan
Tue, 27 Aug 2013 12:27:31 -0400
changeset 19601 6c107cbbb434
parent 19600 fce5c0729a1c (diff)
parent 19599 f9fd8afd9335 (current diff)
child 19602 b772e77c27c9
Merge
hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/windows_x86/vm/windows_x86_32.ad file | annotate | diff | comparison | revisions
hotspot/src/os_cpu/windows_x86/vm/windows_x86_64.ad file | annotate | diff | comparison | revisions
jdk/src/share/classes/com/sun/security/auth/PolicyParser.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/com/sun/security/auth/SubjectCodeSource.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/misc/Compare.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/misc/Sort.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/lib/security/java.security-linux	Tue Aug 27 10:46:03 2013 -0400
+++ b/jdk/src/share/lib/security/java.security-linux	Tue Aug 27 12:27:31 2013 -0400
@@ -181,6 +181,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.media.sound.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -225,6 +226,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.media.sound.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/lib/security/java.security-macosx	Tue Aug 27 10:46:03 2013 -0400
+++ b/jdk/src/share/lib/security/java.security-macosx	Tue Aug 27 12:27:31 2013 -0400
@@ -182,6 +182,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.media.sound.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.media.sound.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/lib/security/java.security-solaris	Tue Aug 27 10:46:03 2013 -0400
+++ b/jdk/src/share/lib/security/java.security-solaris	Tue Aug 27 12:27:31 2013 -0400
@@ -183,6 +183,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.media.sound.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.media.sound.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
--- a/jdk/src/share/lib/security/java.security-windows	Tue Aug 27 10:46:03 2013 -0400
+++ b/jdk/src/share/lib/security/java.security-windows	Tue Aug 27 12:27:31 2013 -0400
@@ -182,6 +182,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.media.sound.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.media.sound.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
--- a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java	Tue Aug 27 10:46:03 2013 -0400
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java	Tue Aug 27 12:27:31 2013 -0400
@@ -23,7 +23,7 @@
 
 /*
  *  @test
- *  @bug 6741606 7146431 8000450
+ *  @bug 6741606 7146431 8000450 8019830
  *  @summary Make sure all restricted packages listed in the package.access
  *           property in the java.security file are blocked
  *  @run main/othervm CheckPackageAccess
@@ -54,6 +54,7 @@
         "com.sun.imageio.",
         "com.sun.istack.internal.",
         "com.sun.jmx.",
+        "com.sun.media.sound.",
         "com.sun.proxy.",
         "com.sun.org.apache.bcel.internal.",
         "com.sun.org.apache.regexp.internal.",
jdk-sandbox