1.1 --- a/build.xml	Fri Jun 19 15:50:04 2009 +0200
     1.2 +++ b/build.xml	Fri Jun 19 17:10:53 2009 +0200
     1.3 @@ -4,9 +4,7 @@
     1.4  
     1.5      <target name="all">
     1.6          <antcall target="base"/>
     1.7 -        <antcall target="beans"/>
     1.8 -        <antcall target="applet"/>
     1.9 -        <antcall target="deprecated7"/>
    1.10 +        <antcall target="corba"/>
    1.11      </target>
    1.12  
    1.13      <!-- basic parameters -->
    1.14 @@ -62,6 +60,48 @@
    1.15              <filename name="META-INF/services/sun.beans.AppletProxy"/>
    1.16          </or>
    1.17      </selector>
    1.18 +    <selector id="corba">
    1.19 +        <or>
    1.20 +            <filename name="org/omg/**"/>
    1.21 +            <filename name="com/sun/corba/**"/>
    1.22 +            <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
    1.23 +            <filename name="com/sun/jndi/cosnaming/**"/>
    1.24 +            <filename name="com/sun/jndi/toolkit/corba/**"/>
    1.25 +            <filename name="com/sun/jndi/url/iiop/**"/>
    1.26 +            <filename name="com/sun/jndi/url/iiopname/**"/>
    1.27 +            <filename name="com/sun/jndi/url/corbaname/**"/>
    1.28 +            <filename name="javax/management/remote/rmi/RMIConnector.java"/>
    1.29 +            <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
    1.30 +            <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
    1.31 +            <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
    1.32 +            <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
    1.33 +            <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
    1.34 +            <filename name="javax/rmi/PortableRemoteObject.java"/>
    1.35 +            <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
    1.36 +            <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
    1.37 +            <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
    1.38 +            <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
    1.39 +            <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
    1.40 +            <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
    1.41 +            <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
    1.42 +            <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
    1.43 +            <filename name="sun/rmi/rmic/RMIGenerator.java"/>
    1.44 +            <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
    1.45 +            <filename name="sun/management/Agent.java"/>
    1.46 +            <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
    1.47 +            <filename name="javax/rmi/CORBA/**"/>
    1.48 +            <filename name="com/sun/org/omg/**"/>
    1.49 +            <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
    1.50 +            <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
    1.51 +            <filename name="sun/rmi/rmic/iiop/**"/>
    1.52 +
    1.53 +            <!-- this actually does not depend on corba, but probably
    1.54 +              does not belong to base either -->
    1.55 +            <filename name="com/sun/tools/corba/**"/>
    1.56 +            <!-- now there are just two references in jconsole -->
    1.57 +            <filename name="sun/tools/jconsole/**"/>
    1.58 +        </or>
    1.59 +    </selector>
    1.60      <selector id="beans">
    1.61          <and>
    1.62              <or>
    1.63 @@ -83,18 +123,20 @@
    1.64      </selector>
    1.65  
    1.66      <selector id="base">
    1.67 +        <none>
    1.68 +            <!-- exclude classes from other modules -->
    1.69 +            <selector refid="corba"/>
    1.70          <!--
    1.71 -            <selector refid="applet"/>
    1.72              <selector refid="beans"/>
    1.73              <selector refid="client"/>
    1.74              <selector refid="enterprise"/>
    1.75              <selector refid="deprecated7"/>
    1.76              -->
    1.77 -            <!-- exclude files that need pre-processing like
    1.78 -                java/nio/ByteBufferAs-X-Buffer.java
    1.79 +
    1.80 +
    1.81 +            <!-- non-important non-API things
    1.82 +                which cannot be compiled easily
    1.83              -->
    1.84 -
    1.85 -        <none>
    1.86              <filename name="**/*-*"/>
    1.87              <filename name="java/dyn/**"/>
    1.88              <filename name="sun/dyn/**"/>
    1.89 @@ -126,6 +168,12 @@
    1.90              <param name="module" value="beans"/>
    1.91          </antcall>
    1.92      </target>
    1.93 +    <target name="corba">
    1.94 +        <antcall target="-compile-one-module">
    1.95 +            <param name="module" value="corba"/>
    1.96 +            <param name="depends" value="base"/>
    1.97 +        </antcall>
    1.98 +    </target>
    1.99  
   1.100  
   1.101      <target name="base">
   1.102 @@ -157,7 +205,10 @@
   1.103              classpath="${module.cp}:${plugs}/jre/lib/rt-closed.jar"
   1.104          >
   1.105              <src refid="src.path"/>
   1.106 -            <selector refid="${module}"/>
   1.107 +            <and>
   1.108 +                <selector refid="${module}"/>
   1.109 +                <not><filename name="**/*-template.java"/></not>
   1.110 +            </and>
   1.111          </javac>
   1.112          <copy todir="${build.dir}/classes/${module}">
   1.113              <fileset dir="src/share/classes">