# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1245685116 -7200
# Node ID a4d32dc556eba39fe0cb9b69822f8f8745dda1f8
# Parent  29da1ab1c5bb215963be32be4929615830814891
All parts of the code compile after the 'client' separation

diff -r 29da1ab1c5bb -r a4d32dc556eb build.xml
--- a/build.xml	Mon Jun 22 16:46:50 2009 +0200
+++ b/build.xml	Mon Jun 22 17:38:36 2009 +0200
@@ -4,6 +4,7 @@
 
     <target name="all">
         <antcall target="base"/>
+        <antcall target="client"/>
         <antcall target="applet"/>
         <antcall target="corba"/>
         <antcall target="deprecated7"/>
@@ -81,43 +82,45 @@
         </and>
     </selector>
     <selector id="corba">
-        <or>
-            <filename name="org/omg/**"/>
-            <filename name="com/sun/corba/**"/>
-            <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
-            <filename name="com/sun/jndi/cosnaming/**"/>
-            <filename name="com/sun/jndi/toolkit/corba/**"/>
-            <filename name="com/sun/jndi/url/iiop/**"/>
-            <filename name="com/sun/jndi/url/iiopname/**"/>
-            <filename name="com/sun/jndi/url/corbaname/**"/>
-            <filename name="javax/management/remote/rmi/RMIConnector.java"/>
-            <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
-            <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
-            <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
-            <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
-            <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
-            <filename name="javax/rmi/PortableRemoteObject.java"/>
-            <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
-            <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
-            <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
-            <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
-            <filename name="sun/rmi/rmic/RMIGenerator.java"/>
-            <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
-            <filename name="sun/management/Agent.java"/>
-            <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
-            <filename name="javax/rmi/CORBA/**"/>
-            <filename name="com/sun/org/omg/**"/>
-            <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
-            <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
-            <filename name="sun/rmi/rmic/iiop/**"/>
-
-            <!-- now there are just two references in jconsole -->
-            <filename name="sun/tools/jconsole/**"/>
-        </or>
+        <and>
+            <or>
+                <filename name="org/omg/**"/>
+                <filename name="com/sun/corba/**"/>
+                <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
+                <filename name="com/sun/jndi/cosnaming/**"/>
+                <filename name="com/sun/jndi/toolkit/corba/**"/>
+                <filename name="com/sun/jndi/url/iiop/**"/>
+                <filename name="com/sun/jndi/url/iiopname/**"/>
+                <filename name="com/sun/jndi/url/corbaname/**"/>
+                <filename name="javax/management/remote/rmi/RMIConnector.java"/>
+                <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
+                <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
+                <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
+                <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
+                <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
+                <filename name="javax/rmi/PortableRemoteObject.java"/>
+                <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
+                <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
+                <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
+                <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
+                <filename name="sun/rmi/rmic/RMIGenerator.java"/>
+                <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
+                <filename name="sun/management/Agent.java"/>
+                <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
+                <filename name="javax/rmi/CORBA/**"/>
+                <filename name="com/sun/org/omg/**"/>
+                <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
+                <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
+                <filename name="sun/rmi/rmic/iiop/**"/>
+            </or>
+            <none>
+                <selector refid="deprecated7"/>
+            </none>
+        </and>
     </selector>
     <selector id="beans">
         <and>
@@ -133,7 +136,7 @@
         </and>
     </selector>
 
-    <selector id="swing">
+    <selector id="client">
         <and>
             <or>
                 <filename name="java/awt/**"/>
@@ -158,9 +161,9 @@
                 <filename name="com/sun/xml/internal/bind/**"/>
                 
                 <filename name="com/sun/xml/internal/messaging/saaj/**"/>
-                <filename name="com/sun/xml/internal/ws/**"/>
                 <filename name="com/sun/xml/internal/org/jvnet/staxex/**"/>
                 <filename name="com/sun/xml/internal/stream/buffer/stax/**"/>
+                <filename name="com/sun/xml/internal/ws/**"/>
                 <filename name="com/sun/istack/internal/**"/>
                 <filename name="com/sun/xml/internal/stream/buffer/**"/>
 <!--                <filename name="com/sun/xml/internal/stream/**"/>-->
@@ -196,6 +199,11 @@
                 <filename name="java/beans/IndexedPropertyChangeEvent*"/>
                 <filename name="java/beans/PropertyChangeSupport*"/>
                 <filename name="java/beans/ChangeListenerMap*"/>
+
+                <!-- remove classes from other modules -->
+                <selector refid="applet"/>
+                <selector refid="corba"/>
+                <selector refid="deprecated7"/>
             </none>
         </and>
     </selector>
@@ -213,7 +221,9 @@
 
             <!-- tools -->
             <filename name="sun/security/tools/**"/>
+            <filename name="com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl*"/>
             <filename name="com/sun/tools/**"/>
+            <filename name="com/sun/jdi/**"/>
             <filename name="sun/tools/**"/>
             <filename name="sun/rmi/rmic/**"/>
         </or>
@@ -224,7 +234,7 @@
             <!-- exclude classes from other modules -->
             <selector refid="corba"/>
             <selector refid="applet"/>
-            <selector refid="swing"/>
+            <selector refid="client"/>
             <selector refid="deprecated7"/>
         <!--
             <selector refid="client"/>
@@ -253,13 +263,13 @@
     <target name="deprecated7">
         <antcall target="-compile-one-module">
             <param name="module" value="deprecated7"/>
-            <param name="depends" value="base:applet"/>
+            <param name="depends" value="base:applet:client:corba"/>
         </antcall>
     </target>
     <target name="applet">
         <antcall target="-compile-one-module">
             <param name="module" value="applet"/>
-            <param name="depends" value="base"/>
+            <param name="depends" value="base:client"/>
         </antcall>
     </target>
     <target name="beans">
@@ -267,16 +277,16 @@
             <param name="module" value="beans"/>
         </antcall>
     </target>
-    <target name="swing">
+    <target name="client">
         <antcall target="-compile-one-module">
-            <param name="module" value="swing"/>
+            <param name="module" value="client"/>
             <param name="depends" value="base"/>
         </antcall>
     </target>
     <target name="corba">
         <antcall target="-compile-one-module">
             <param name="module" value="corba"/>
-            <param name="depends" value="base:applet"/>
+            <param name="depends" value="base:client:applet"/>
         </antcall>
     </target>
 
diff -r 29da1ab1c5bb -r a4d32dc556eb src/share/classes/sun/applet/AppletViewerPanel.java
--- a/src/share/classes/sun/applet/AppletViewerPanel.java	Mon Jun 22 16:46:50 2009 +0200
+++ b/src/share/classes/sun/applet/AppletViewerPanel.java	Mon Jun 22 17:38:36 2009 +0200
@@ -26,12 +26,9 @@
 package sun.applet;
 
 import java.util.*;
-import java.io.*;
 import java.net.URL;
 import java.net.MalformedURLException;
-import java.awt.*;
 import java.applet.*;
-import sun.tools.jar.*;
 
 
 /**