Return-Path: 
 <commits-return-59909-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 34284 invoked from network); 19 Aug 2009 12:40:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Aug 2009 12:40:07 -0000
Received: (qmail 89063 invoked by uid 500); 19 Aug 2009 12:40:26 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 89005 invoked by uid 500); 19 Aug 2009 12:40:25 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 88996 invoked by uid 99); 19 Aug 2009 12:40:25 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2009 12:40:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Aug 2009 12:40:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8155523888D0; Wed, 19 Aug 2009 12:39:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r805777 - in /harmony/enhanced/classlib/trunk: make/
 modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/
 modules/auth/ modules/awt/ modules/beans/ modules/concurrent/
 modules/crypto/ modules/imageio/ modules/instrume...
Date: Wed, 19 Aug 2009 12:39:53 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090819123955.8155523888D0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Wed Aug 19 12:39:52 2009
New Revision: 805777

URL: http://svn.apache.org/viewvc?rev=805777&view=rev
Log:
Replace slow "clever" patternsets with (generated) file-based patternsets.
Avoid copying module resources to build/classes by just putting them straight
into the module jar.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    harmony/enhanced/classlib/trunk/modules/applet/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/beans/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/regex/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/build.xml
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Aug 19 12:39:52 2009
@@ -325,38 +325,17 @@
 
     <!-- fileset to represent classes built by a module. -->
     <fileset id="classes" dir="../../build/classes">
-        <or>
-            <!-- only common code case -->
-            <present targetdir="src/main/java" />
-            <present targetdir="src/main/java">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-
-            <!-- java5 common code case -->
-            <present targetdir="src/main/java5" />
-            <present targetdir="src/main/java5">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-
-            <!-- all common and platform code case -->
-            <present targetdir="src/main/java/common" />
-            <present targetdir="src/main/java/common">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-            <present targetdir="src/main/java/${hy.os.family}" />
-            <present targetdir="src/main/java/${hy.os.family}">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-        </or>
+        <includesfile name="${hy.hdk}/build/ant/patternsets/${hy.module}.txt" />
+    </fileset>
+
+    <!-- fileset for resources of a module. -->
+    <fileset id="resources" dir="src/main/java">
+        <exclude name="**/*.java" />
+    </fileset>
 
+    <!-- fileset for resources of a module with platform-dependent code. -->
+    <fileset id="common.resources" dir="src/main/java/common">
+        <exclude name="**/*.java" />
     </fileset>
 
     <!-- test properties -->
@@ -887,20 +866,23 @@
     </macrodef>
 
     <macrodef name="make-patternset">
-        <attribute name="source" default="${basedir}/src/main" />
+        <attribute name="source" default="src/main" />
+        <attribute name="module" />
         <attribute name="file"
-                   default="${hy.hdk}/build/ant/patternsets/${hy.module}.txt" />
+                   default="${hy.hdk}/build/ant/patternsets/@{module}.txt" />
         <sequential>
             <dirname file="@{file}" property="@{file}.dir" />
             <mkdir dir="${@{file}.dir}" />
+            <property name="@{source}.loc" location="@{source}"/>
+
             <pathconvert targetos="unix" property="@{file}.content"
                          pathsep="${line.separator}">
-                <fileset dir="@{source}" includes="java*/**/*.java" />
-                <map from="@{source}/java/unix/" to="" />
-                <map from="@{source}/java/windows/" to="" />
-                <map from="@{source}/java/common/" to="" />
-                <map from="@{source}/java5/" to="" />
-                <map from="@{source}/java/" to="" />
+                <fileset dir="${@{source}.loc}" includes="java*/**/*.java" />
+                <map from="${@{source}.loc}/java/unix/" to="" />
+                <map from="${@{source}.loc}/java/windows/" to="" />
+                <map from="${@{source}.loc}/java/common/" to="" />
+                <map from="${@{source}.loc}/java5/" to="" />
+                <map from="${@{source}.loc}/java/" to="" />
                 <compositemapper>
                     <mapper type="regexp" from="^(.*)\.java$$" to="\1.*"/>
                     <mapper type="regexp" from="^(.*)\.java$$" to="\1$*.*"/>
@@ -912,10 +894,9 @@
     </macrodef>
 
     <macrodef name="delete-patternset">
-        <attribute name="file"
-                   default="${hy.hdk}/build/ant/patternsets/${hy.module}.txt" />
+        <attribute name="module" />
         <sequential>
-            <delete file="@{file}" />
+            <delete file="${hy.hdk}/build/ant/patternsets/@{module}.txt" />
         </sequential>
     </macrodef>
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/accessibility.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/accessibility-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling ACCESSIBILITY classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,21 +81,13 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <mkdir dir="${hy.jdk}/jre/lib/boot"/>
         <jar destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -154,4 +147,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/annotation.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/annotation-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling ANNOTATION classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/annotation.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -152,4 +145,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/applet.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling APPLET classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/applet.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -153,4 +146,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Wed Aug 19 12:39:52 2009
@@ -27,7 +27,7 @@
 
     <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
     
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -158,12 +158,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -172,7 +173,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling ARCHIVE classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -195,20 +196,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/archive.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -283,4 +276,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Wed Aug 19 12:39:52 2009
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -65,12 +65,13 @@
         </copy>
     </target>
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/auth-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -83,7 +84,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling AUTH classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -110,20 +111,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/auth.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -188,4 +181,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Wed Aug 19 12:39:52 2009
@@ -28,7 +28,7 @@
     <property file="../../make/depends.properties" />
 
     <target name="build"
-            depends="check-depends,compile-java, copy-resources, build-jar" />
+            depends="check-depends,compile-java,copy-resources,build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -148,7 +148,7 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />    
         <delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
@@ -156,6 +156,7 @@
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -164,7 +165,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling AWT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -192,13 +193,6 @@
     </target>
 
     <target name="copy-resources" depends="-copy-win-resources">
-        <mkdir dir="../../build/classes" />
-
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
 
         <mkdir dir="${hy.jdk}/jre/lib/cmm" />
         <copy todir="${hy.jdk}/jre/lib/cmm">
@@ -223,11 +217,12 @@
               tofile="${hy.jdk}/jre/lib/font.properties"/>
     </target>
 
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/awt.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -498,4 +493,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/beans.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling BEANS classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/beans.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -195,4 +188,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Wed Aug 19 12:39:52 2009
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/concurrent.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/concurrent-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling CONCURRENT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,7 +81,7 @@
         </javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/concurrent.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
@@ -143,4 +144,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/crypto.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/crypto-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling CRYPTO classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/crypto.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -234,4 +227,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Wed Aug 19 12:39:52 2009
@@ -27,8 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build"
-            depends="check-depends,compile-java,copy-resources,build-jar" />
+    <target name="build" depends="check-depends,compile-java,build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -105,12 +104,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
 	<delete file="${hy.jdk}/jre/lib/boot/imageio-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -190,20 +190,12 @@
         </copy>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/imageio.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -265,4 +257,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -64,12 +64,13 @@
         </copy>
     </target>
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/instrument.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/instrument-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -82,7 +83,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling INSTRUMENT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -105,20 +106,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -183,4 +176,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/jndi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/jndi-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling JNDI classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -158,4 +151,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Wed Aug 19 12:39:52 2009
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/lang-management.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/lang-management-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling LANG-MANAGEMENT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,7 +81,7 @@
         </javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/lang-management.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
@@ -158,4 +159,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-jar-resources, build-jar, copy-resources" />
+    <target name="build" depends="compile-java, build-jar, copy-properties" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling LOGGING classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,11 +81,15 @@
         </javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset dir="src/main/java">
+                <exclude name="**/*.java" />
+                <exclude name="**/logging.properties" />
+            </fileset>
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -102,17 +107,7 @@
         </jar>
     </target>
 
-    <target name="copy-jar-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-                <exclude name="**/logging.properties" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="copy-resources">
+    <target name="copy-properties">
         <copy todir="${hy.jdk}/jre/lib" flatten="yes">
             <fileset dir="src/main/java">
                 <include name="**/logging.properties" />
@@ -186,4 +181,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Wed Aug 19 12:39:52 2009
@@ -37,7 +37,7 @@
         </fail>
     </target>
 
-    <target name="build" depends="svn-info">
+    <target name="build" depends="svn-info,class-patternset">
         <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <manifest>
@@ -50,11 +50,16 @@
 
     <target name="clean" depends="clean-java" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
+    </target>
+
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Aug 19 12:39:52 2009
@@ -27,7 +27,7 @@
 
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -172,12 +172,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, test-jar, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native"
@@ -222,7 +223,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling LUNI classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -245,11 +246,12 @@
         </javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/>
             </manifest>
@@ -350,13 +352,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/math.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling MATH classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/math.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -152,4 +145,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -41,18 +41,27 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/misc.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/misc-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/accessors/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling MISC classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -75,20 +84,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/misc.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -126,12 +127,6 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native">
-        <make dir="src/main/native/accessors/${hy.os.family}"
-              target="clean" />
-    </target>
-
     <target name="test-jar" depends="svn-info,compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
         
@@ -173,4 +168,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -64,12 +64,13 @@
         </copy>
     </target>
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -82,7 +83,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling NIO classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -109,20 +110,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}" />
             </manifest>
@@ -186,4 +179,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -57,12 +57,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -75,7 +76,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling NIO_CHAR classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -101,21 +102,13 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <service type="java.nio.charset.spi.CharsetProvider" provider="org.apache.harmony.niochar.CharsetProviderImpl" />
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -182,4 +175,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Wed Aug 19 12:39:52 2009
@@ -27,8 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build"
-            depends="check-depends, compile-java, copy-resources, build-jar" />
+    <target name="build" depends="check-depends, compile-java, build-jar" />
 
     <target name="check-depends">
         <check-one-file src="${asm.url}" dest="${asm.jar}" />
@@ -63,12 +62,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -77,7 +77,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling PACK200 classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -119,20 +119,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -184,7 +176,7 @@
     <target name="compile-tests"> 
         <mkdir dir="bin/test" />
 
-        <echo message="Compiling PACK200 tests" />
+        <echo message="Compiling ${hy.module} tests" />
         <javac srcdir="src/test/java"
                destdir="bin/test"
                sourcepath=""
@@ -208,4 +200,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Wed Aug 19 12:39:52 2009
@@ -34,7 +34,7 @@
         </and>
     </condition>
 
-    <target name="build" /> <!-- depends="compile-java, copy-resources, build-jar" -->
+    <target name="build" />
 
     <target name="clean" depends="clean-native,clean-test" />
 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Wed Aug 19 12:39:52 2009
@@ -27,7 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -65,12 +65,13 @@
         </copy>
     </target>
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <!-- Clean natives. Currently there are only windows natives for
@@ -85,7 +86,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling PREFS classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -108,20 +109,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -184,4 +177,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -43,12 +43,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/print.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/print-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native" if="is.windows">
@@ -61,7 +62,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling PRINT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -103,18 +104,7 @@
         </copy>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-                <exclude name="**/javax.print.StreamPrintServiceFactory" />
-                <exclude name="**/javax.print.PrintServiceLookup" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/print.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
@@ -125,6 +115,11 @@
                 dir="src/main/java/${hy.os.family}/org/apache/harmony/x/print"
                 includes="javax.print.PrintServiceLookup"/>
             <fileset refid="classes" />
+            <fileset dir="src/main/java/common">
+                <exclude name="**/*.java" />
+                <exclude name="**/javax.print.StreamPrintServiceFactory" />
+                <exclude name="**/javax.print.PrintServiceLookup" />
+            </fileset>
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -190,4 +185,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/regex-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling REGEX classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -156,4 +149,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/rmi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/rmi-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling RMI classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -159,4 +152,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Wed Aug 19 12:39:52 2009
@@ -37,7 +37,7 @@
         </fail>
     </target>
 
-    <target name="build" depends="svn-info">
+    <target name="build" depends="svn-info,class-patternset">
         <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <manifest>
@@ -50,11 +50,16 @@
 
     <target name="clean" depends="clean-java" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
+    </target>
+
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -65,12 +65,13 @@
         </copy>
     </target>
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/security-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native" if="native.present" >
@@ -83,7 +84,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SECURITY classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -110,20 +111,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/security.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -262,4 +255,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/sound.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sound-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SOUND classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/sound.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -159,4 +152,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Wed Aug 19 12:39:52 2009
@@ -28,8 +28,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build"
-            depends="check-depends, compile-java, copy-resources, build-jar" />
+    <target name="build" depends="check-depends, compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-test" />
 
@@ -57,12 +56,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -72,7 +72,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SQL classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -95,20 +95,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -176,4 +168,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Wed Aug 19 12:39:52 2009
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/suncompat.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/suncompat-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -56,7 +57,7 @@
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java" depends="copy-resources">
+    <target name="compile-java">
         <echo message="Compiling Sun Compat classes" />
 
         <mkdir dir="../../build/classes" />
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -152,4 +145,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Wed Aug 19 12:39:52 2009
@@ -33,7 +33,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-test" />
 
@@ -51,13 +51,14 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/swing.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/swing-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset refid="hidden.classes"/>
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -66,7 +67,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SWING classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -93,21 +94,13 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/swing.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <fileset refid="hidden.classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -171,4 +164,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
     
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/text.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/text-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling TEXT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -156,4 +149,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=805777&r1=805776&r2=805777&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Wed Aug 19 12:39:52 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/x-net.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/x-net-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling X-NET classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -208,4 +201,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>