# HG changeset patch
# User mchung
# Date 1359417209 28800
# Node ID e5fcdadc69b2280d6b059a5919f33d017d8b4950
# Parent  110e24f9ad05b0acdd85e9d1e080c28ac9bd9728
8006882: Proxy generated classes in sun.proxy package breaks JMockit
Reviewed-by: alanb, ahgross

diff -r 110e24f9ad05 -r e5fcdadc69b2 jdk/src/share/classes/java/lang/reflect/Proxy.java
--- a/jdk/src/share/classes/java/lang/reflect/Proxy.java	Tue Feb 05 15:35:35 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Proxy.java	Mon Jan 28 15:53:29 2013 -0800
@@ -609,7 +609,7 @@
             }
 
             if (proxyPkg == null) {
-                // if no non-public proxy interfaces, use sun.proxy package
+                // if no non-public proxy interfaces, use com.sun.proxy package
                 proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
             }
 
diff -r 110e24f9ad05 -r e5fcdadc69b2 jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
--- a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java	Tue Feb 05 15:35:35 2013 +0100
+++ b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java	Mon Jan 28 15:53:29 2013 -0800
@@ -202,5 +202,7 @@
         }
     }
 
-    public static final String PROXY_PACKAGE = "sun.proxy";
+    // Note that bytecode instrumentation tools may exclude 'sun.*'
+    // classes but not generated proxy classes and so keep it in com.sun.*
+    public static final String PROXY_PACKAGE = "com.sun.proxy";
 }
diff -r 110e24f9ad05 -r e5fcdadc69b2 jdk/src/share/lib/security/java.security-linux
--- a/jdk/src/share/lib/security/java.security-linux	Tue Feb 05 15:35:35 2013 +0100
+++ b/jdk/src/share/lib/security/java.security-linux	Mon Jan 28 15:53:29 2013 -0800
@@ -153,6 +153,7 @@
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -177,6 +178,7 @@
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff -r 110e24f9ad05 -r e5fcdadc69b2 jdk/src/share/lib/security/java.security-macosx
--- a/jdk/src/share/lib/security/java.security-macosx	Tue Feb 05 15:35:35 2013 +0100
+++ b/jdk/src/share/lib/security/java.security-macosx	Mon Jan 28 15:53:29 2013 -0800
@@ -154,6 +154,7 @@
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -179,6 +180,7 @@
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff -r 110e24f9ad05 -r e5fcdadc69b2 jdk/src/share/lib/security/java.security-solaris
--- a/jdk/src/share/lib/security/java.security-solaris	Tue Feb 05 15:35:35 2013 +0100
+++ b/jdk/src/share/lib/security/java.security-solaris	Mon Jan 28 15:53:29 2013 -0800
@@ -155,6 +155,7 @@
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -179,6 +180,7 @@
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff -r 110e24f9ad05 -r e5fcdadc69b2 jdk/src/share/lib/security/java.security-windows
--- a/jdk/src/share/lib/security/java.security-windows	Tue Feb 05 15:35:35 2013 +0100
+++ b/jdk/src/share/lib/security/java.security-windows	Mon Jan 28 15:53:29 2013 -0800
@@ -154,6 +154,7 @@
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -178,6 +179,7 @@
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\