1.1 --- a/build.xml	Mon Jun 22 17:40:22 2009 +0200
     1.2 +++ b/build.xml	Mon Jun 22 18:07:11 2009 +0200
     1.3 @@ -7,6 +7,7 @@
     1.4          <antcall target="client"/>
     1.5          <antcall target="applet"/>
     1.6          <antcall target="corba"/>
     1.7 +        <antcall target="tools"/>
     1.8          <antcall target="deprecated7"/>
     1.9      </target>
    1.10  
    1.11 @@ -118,10 +119,12 @@
    1.12                  <filename name="sun/rmi/rmic/iiop/**"/>
    1.13              </or>
    1.14              <none>
    1.15 +                <selector refid="tools"/>
    1.16                  <selector refid="deprecated7"/>
    1.17              </none>
    1.18          </and>
    1.19      </selector>
    1.20 +    <!--
    1.21      <selector id="beans">
    1.22          <and>
    1.23              <or>
    1.24 @@ -135,7 +138,8 @@
    1.25              </none>
    1.26          </and>
    1.27      </selector>
    1.28 -
    1.29 +    -->
    1.30 +    
    1.31      <selector id="client">
    1.32          <and>
    1.33              <or>
    1.34 @@ -203,11 +207,23 @@
    1.35                  <!-- remove classes from other modules -->
    1.36                  <selector refid="applet"/>
    1.37                  <selector refid="corba"/>
    1.38 +                <selector refid="tools"/>
    1.39                  <selector refid="deprecated7"/>
    1.40              </none>
    1.41          </and>
    1.42      </selector>
    1.43  
    1.44 +    <selector id="tools">
    1.45 +        <or>
    1.46 +            <filename name="sun/security/tools/**"/>
    1.47 +            <filename name="com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl*"/>
    1.48 +            <filename name="com/sun/tools/**"/>
    1.49 +            <filename name="com/sun/jdi/**"/>
    1.50 +            <filename name="sun/tools/**"/>
    1.51 +            <filename name="sun/rmi/rmic/**"/>
    1.52 +        </or>
    1.53 +    </selector>
    1.54 +
    1.55      <selector id="deprecated7">
    1.56          <or>
    1.57              <!-- deprecated as it contains one method
    1.58 @@ -218,14 +234,6 @@
    1.59              that references Applet
    1.60              -->
    1.61              <filename name="javax/swing/RepaintManager*"/>
    1.62 -
    1.63 -            <!-- tools -->
    1.64 -            <filename name="sun/security/tools/**"/>
    1.65 -            <filename name="com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl*"/>
    1.66 -            <filename name="com/sun/tools/**"/>
    1.67 -            <filename name="com/sun/jdi/**"/>
    1.68 -            <filename name="sun/tools/**"/>
    1.69 -            <filename name="sun/rmi/rmic/**"/>
    1.70          </or>
    1.71      </selector>
    1.72  
    1.73 @@ -235,6 +243,7 @@
    1.74              <selector refid="corba"/>
    1.75              <selector refid="applet"/>
    1.76              <selector refid="client"/>
    1.77 +            <selector refid="tools"/>
    1.78              <selector refid="deprecated7"/>
    1.79          <!--
    1.80              <selector refid="client"/>
    1.81 @@ -263,7 +272,7 @@
    1.82      <target name="deprecated7">
    1.83          <antcall target="-compile-one-module">
    1.84              <param name="module" value="deprecated7"/>
    1.85 -            <param name="depends" value="base:applet:client:corba"/>
    1.86 +            <param name="depends" value="base:applet:client"/>
    1.87          </antcall>
    1.88      </target>
    1.89      <target name="applet">
    1.90 @@ -272,11 +281,13 @@
    1.91              <param name="depends" value="base:client"/>
    1.92          </antcall>
    1.93      </target>
    1.94 +    <!--
    1.95      <target name="beans">
    1.96          <antcall target="-compile-one-module">
    1.97              <param name="module" value="beans"/>
    1.98          </antcall>
    1.99      </target>
   1.100 +    -->
   1.101      <target name="client">
   1.102          <antcall target="-compile-one-module">
   1.103              <param name="module" value="client"/>
   1.104 @@ -289,8 +300,12 @@
   1.105              <param name="depends" value="base:client:applet"/>
   1.106          </antcall>
   1.107      </target>
   1.108 -
   1.109 -
   1.110 +    <target name="tools">
   1.111 +        <antcall target="-compile-one-module">
   1.112 +            <param name="module" value="tools"/>
   1.113 +            <param name="depends" value="base:client:applet:corba"/>
   1.114 +        </antcall>
   1.115 +    </target>
   1.116      <target name="base">
   1.117          <antcall target="-compile-one-module">
   1.118              <param name="module" value="base"/>