diff -r 3021779e58a1 -r 57914fd9382f build.xml
--- a/build.xml	Tue Jun 16 15:37:17 2009 +0200
+++ b/build.xml	Tue Jun 16 17:53:32 2009 +0200
@@ -3,7 +3,7 @@
     <description>Scripts to build JDK Java sources in modularized way</description>
 
     <target name="all">
-        <antcall target="extract-base"/>
+        <antcall target="base"/>
         <antcall target="beans"/>
         <antcall target="applet"/>
     </target>
@@ -20,16 +20,23 @@
     -->
     <selector id="applet">
         <or>
+            <filename name="java/beans/AppletInitializer*"/>
             <filename name="java/applet/**"/>
             <filename name="sun/applet/**"/>
+            <filename name="META-INF/services/sun.beans.AppletProxy"/>
         </or>
     </selector>
     <selector id="beans">
-        <or>
-            <filename name="java/beans/**"/>
-            <filename name="sun/beans/**"/>
-            <filename name="com/sun/beans/**"/>
-        </or>
+        <and>
+            <or>
+                <filename name="java/beans/**"/>
+                <filename name="sun/beans/**"/>
+                <filename name="com/sun/beans/**"/>
+            </or>
+            <none>
+                <selector refid="applet"/>
+            </none>
+        </and>
     </selector>
 
     <selector id="corba">
@@ -52,6 +59,7 @@
     <target name="applet">
         <antcall target="-compile-one-module">
             <param name="module" value="applet"/>
+            <param name="depends" value="beans"/>
         </antcall>
     </target>
     <target name="beans">
@@ -65,7 +73,7 @@
       the modularization by extracting the base module from an existing
       classes
     -->
-    <target name="extract-base">
+    <target name="base">
         <property name="rt.jar" location="${java.home}/lib/rt.jar"/>
         <fail message="Cannot find rt.jar, specify with -Drt.jar=...">
             <condition><not><available file="${rt.jar}"/></not></condition>
@@ -73,7 +81,7 @@
 
         <mkdir dir="${build.dir}/rt"/>
         <unzip src="${rt.jar}" dest="${build.dir}/rt"/>
-        <jar file="${build.dir}/base.jar">
+        <jar file="${build.dir}/base.jar" compress="false">
             <fileset dir="${build.dir}/rt">
                 <selector refid="base"/>
             </fileset>
@@ -83,11 +91,37 @@
     <!-- shared routine to compile one of the modules -->
     <target name="-compile-one-module">
         <mkdir dir="${build.dir}/classes/${module}"/>
-        <javac bootclasspath="${build.dir}/base.jar" sourcepath="" destdir="${build.dir}/classes/${module}">
+        <pathconvert pathsep="," property="module.cp">
+            <path path="${depends}"/>
+            <mapper type="regexp" from=".*[/\\]([^/\\]*)" to="${build.dir}/\1.jar"/>
+        </pathconvert>
+        <javac
+            bootclasspath="${build.dir}/base.jar"
+            sourcepath=""
+            destdir="${build.dir}/classes/${module}"
+            classpath="${module.cp}"
+            includejavaruntime="false"
+            includeantruntime="false"
+        >
             <src refid="src.path"/>
             <selector refid="${module}"/>
         </javac>
-        <jar basedir="${build.dir}/classes/${module}" destfile="${build.dir}/${module}.jar"/>
+        <copy todir="${build.dir}/classes/${module}">
+            <fileset dir="src/share/classes">
+                <and>
+                    <selector refid="${module}"/>
+                    <not>
+                        <filename name="**/*.java"/>
+                    </not>
+                </and>
+            </fileset>
+        </copy>
+
+        <jar 
+            basedir="${build.dir}/classes/${module}"
+            destfile="${build.dir}/${module}.jar"
+            compress="false"
+        />
     </target>
 
     <!-- clean everything -->