1.1 --- a/build.xml Mon Jun 22 16:46:50 2009 +0200
1.2 +++ b/build.xml Mon Jun 22 17:38:36 2009 +0200
1.3 @@ -4,6 +4,7 @@
1.4
1.5 <target name="all">
1.6 <antcall target="base"/>
1.7 + <antcall target="client"/>
1.8 <antcall target="applet"/>
1.9 <antcall target="corba"/>
1.10 <antcall target="deprecated7"/>
1.11 @@ -81,43 +82,45 @@
1.12 </and>
1.13 </selector>
1.14 <selector id="corba">
1.15 - <or>
1.16 - <filename name="org/omg/**"/>
1.17 - <filename name="com/sun/corba/**"/>
1.18 - <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
1.19 - <filename name="com/sun/jndi/cosnaming/**"/>
1.20 - <filename name="com/sun/jndi/toolkit/corba/**"/>
1.21 - <filename name="com/sun/jndi/url/iiop/**"/>
1.22 - <filename name="com/sun/jndi/url/iiopname/**"/>
1.23 - <filename name="com/sun/jndi/url/corbaname/**"/>
1.24 - <filename name="javax/management/remote/rmi/RMIConnector.java"/>
1.25 - <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
1.26 - <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
1.27 - <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
1.28 - <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
1.29 - <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
1.30 - <filename name="javax/rmi/PortableRemoteObject.java"/>
1.31 - <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
1.32 - <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
1.33 - <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
1.34 - <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
1.35 - <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
1.36 - <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
1.37 - <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
1.38 - <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
1.39 - <filename name="sun/rmi/rmic/RMIGenerator.java"/>
1.40 - <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
1.41 - <filename name="sun/management/Agent.java"/>
1.42 - <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
1.43 - <filename name="javax/rmi/CORBA/**"/>
1.44 - <filename name="com/sun/org/omg/**"/>
1.45 - <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
1.46 - <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
1.47 - <filename name="sun/rmi/rmic/iiop/**"/>
1.48 -
1.49 - <!-- now there are just two references in jconsole -->
1.50 - <filename name="sun/tools/jconsole/**"/>
1.51 - </or>
1.52 + <and>
1.53 + <or>
1.54 + <filename name="org/omg/**"/>
1.55 + <filename name="com/sun/corba/**"/>
1.56 + <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
1.57 + <filename name="com/sun/jndi/cosnaming/**"/>
1.58 + <filename name="com/sun/jndi/toolkit/corba/**"/>
1.59 + <filename name="com/sun/jndi/url/iiop/**"/>
1.60 + <filename name="com/sun/jndi/url/iiopname/**"/>
1.61 + <filename name="com/sun/jndi/url/corbaname/**"/>
1.62 + <filename name="javax/management/remote/rmi/RMIConnector.java"/>
1.63 + <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
1.64 + <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
1.65 + <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
1.66 + <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
1.67 + <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
1.68 + <filename name="javax/rmi/PortableRemoteObject.java"/>
1.69 + <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
1.70 + <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
1.71 + <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
1.72 + <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
1.73 + <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
1.74 + <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
1.75 + <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
1.76 + <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
1.77 + <filename name="sun/rmi/rmic/RMIGenerator.java"/>
1.78 + <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
1.79 + <filename name="sun/management/Agent.java"/>
1.80 + <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
1.81 + <filename name="javax/rmi/CORBA/**"/>
1.82 + <filename name="com/sun/org/omg/**"/>
1.83 + <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
1.84 + <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
1.85 + <filename name="sun/rmi/rmic/iiop/**"/>
1.86 + </or>
1.87 + <none>
1.88 + <selector refid="deprecated7"/>
1.89 + </none>
1.90 + </and>
1.91 </selector>
1.92 <selector id="beans">
1.93 <and>
1.94 @@ -133,7 +136,7 @@
1.95 </and>
1.96 </selector>
1.97
1.98 - <selector id="swing">
1.99 + <selector id="client">
1.100 <and>
1.101 <or>
1.102 <filename name="java/awt/**"/>
1.103 @@ -158,9 +161,9 @@
1.104 <filename name="com/sun/xml/internal/bind/**"/>
1.105
1.106 <filename name="com/sun/xml/internal/messaging/saaj/**"/>
1.107 - <filename name="com/sun/xml/internal/ws/**"/>
1.108 <filename name="com/sun/xml/internal/org/jvnet/staxex/**"/>
1.109 <filename name="com/sun/xml/internal/stream/buffer/stax/**"/>
1.110 + <filename name="com/sun/xml/internal/ws/**"/>
1.111 <filename name="com/sun/istack/internal/**"/>
1.112 <filename name="com/sun/xml/internal/stream/buffer/**"/>
1.113 <!-- <filename name="com/sun/xml/internal/stream/**"/>-->
1.114 @@ -196,6 +199,11 @@
1.115 <filename name="java/beans/IndexedPropertyChangeEvent*"/>
1.116 <filename name="java/beans/PropertyChangeSupport*"/>
1.117 <filename name="java/beans/ChangeListenerMap*"/>
1.118 +
1.119 + <!-- remove classes from other modules -->
1.120 + <selector refid="applet"/>
1.121 + <selector refid="corba"/>
1.122 + <selector refid="deprecated7"/>
1.123 </none>
1.124 </and>
1.125 </selector>
1.126 @@ -213,7 +221,9 @@
1.127
1.128 <!-- tools -->
1.129 <filename name="sun/security/tools/**"/>
1.130 + <filename name="com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl*"/>
1.131 <filename name="com/sun/tools/**"/>
1.132 + <filename name="com/sun/jdi/**"/>
1.133 <filename name="sun/tools/**"/>
1.134 <filename name="sun/rmi/rmic/**"/>
1.135 </or>
1.136 @@ -224,7 +234,7 @@
1.137 <!-- exclude classes from other modules -->
1.138 <selector refid="corba"/>
1.139 <selector refid="applet"/>
1.140 - <selector refid="swing"/>
1.141 + <selector refid="client"/>
1.142 <selector refid="deprecated7"/>
1.143 <!--
1.144 <selector refid="client"/>
1.145 @@ -253,13 +263,13 @@
1.146 <target name="deprecated7">
1.147 <antcall target="-compile-one-module">
1.148 <param name="module" value="deprecated7"/>
1.149 - <param name="depends" value="base:applet"/>
1.150 + <param name="depends" value="base:applet:client:corba"/>
1.151 </antcall>
1.152 </target>
1.153 <target name="applet">
1.154 <antcall target="-compile-one-module">
1.155 <param name="module" value="applet"/>
1.156 - <param name="depends" value="base"/>
1.157 + <param name="depends" value="base:client"/>
1.158 </antcall>
1.159 </target>
1.160 <target name="beans">
1.161 @@ -267,16 +277,16 @@
1.162 <param name="module" value="beans"/>
1.163 </antcall>
1.164 </target>
1.165 - <target name="swing">
1.166 + <target name="client">
1.167 <antcall target="-compile-one-module">
1.168 - <param name="module" value="swing"/>
1.169 + <param name="module" value="client"/>
1.170 <param name="depends" value="base"/>
1.171 </antcall>
1.172 </target>
1.173 <target name="corba">
1.174 <antcall target="-compile-one-module">
1.175 <param name="module" value="corba"/>
1.176 - <param name="depends" value="base:applet"/>
1.177 + <param name="depends" value="base:client:applet"/>
1.178 </antcall>
1.179 </target>
1.180
2.1 --- a/src/share/classes/sun/applet/AppletViewerPanel.java Mon Jun 22 16:46:50 2009 +0200
2.2 +++ b/src/share/classes/sun/applet/AppletViewerPanel.java Mon Jun 22 17:38:36 2009 +0200
2.3 @@ -26,12 +26,9 @@
2.4 package sun.applet;
2.5
2.6 import java.util.*;
2.7 -import java.io.*;
2.8 import java.net.URL;
2.9 import java.net.MalformedURLException;
2.10 -import java.awt.*;
2.11 import java.applet.*;
2.12 -import sun.tools.jar.*;
2.13
2.14
2.15 /**