harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r793176 [3/3] - in /harmony/enhanced/classlib/trunk/modules: accessibility/ accessibility/make/ annotation/ annotation/make/ applet/ applet/make/ archive/ archive/make/ auth/ auth/make/ awt/ awt/make/ beans/ beans/make/ concurrent/ concurre...
Date Sat, 11 Jul 2009 14:54:42 GMT
Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Sat Jul 11 14:54:39 2009
@@ -23,17 +23,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.prefs.src.main.java}" />
-            <present targetdir="${hy.prefs.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -65,17 +66,17 @@
      prefs, so we check if we are on a windows platform -->
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="is.windows">
-        <make dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}" />
+        <make dir="src/main/native/prefs/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.prefs.src.main.native}/prefs">
+            <fileset dir="src/main/native/prefs">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
             <!-- Copy link exports file on z/OS -->
-            <fileset dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}">
+            <fileset dir="src/main/native/prefs/${hy.os.family}">
                 <include name="*${linklib.suffix}*" if="is.zos" />
             </fileset>
         </copy>
@@ -93,18 +94,18 @@
     <!-- Clean natives. Currently there are only windows natives for
      prefs, so we check if we are on a windows platform -->
     <target name="clean-native" if="is.windows">
-    <make dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}" target="clean" />
+    <make dir="src/main/native/prefs/${hy.os.family}" target="clean" />
     </target>
 
 
     <target name="compile-java">
         <echo message="Compiling PREFS classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.prefs.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -122,9 +123,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.prefs.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -132,7 +133,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
-             manifest="${hy.prefs}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -143,7 +144,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/prefs-src.jar">
-            <fileset dir="${hy.prefs.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -155,10 +156,10 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling PREFS tests" />
 
-        <mkdir dir="${hy.prefs.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.prefs.src.test.java}"
-               destdir="${hy.prefs.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -206,7 +207,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.prefs.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="../../build/tests" />
             <classpath location="${hy.hdk}/build/test/support.jar" />
@@ -215,7 +216,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.prefs.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -228,7 +229,7 @@
             </batchtest>
 
             <batchtest todir="${tests.output}" haltonfailure="no" unless="test.case" >
-                <fileset dir="${hy.prefs.src.test.java}">
+                <fileset dir="src/test/java">
                     <include name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java" />
                 </fileset>
             </batchtest>
@@ -249,9 +250,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.prefs.bin.test}" />
-        <copy todir="${hy.prefs.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.prefs.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Sat Jul 11 14:54:39 2009
@@ -21,20 +21,21 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.print.src.main.java.platform"
-              value="${hy.print.src.main.java}/../${hy.os.family}" />
+              value="src/main/java/common/../${hy.os.family}" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.print.src.main.java}" />
-            <present targetdir="${hy.print.src.main.java}">
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -69,8 +70,8 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}-src.jar" />
+        <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>
@@ -78,18 +79,18 @@
     </target>
 
     <target name="clean-native" if="is.windows">
-        <make dir="${hy.print.src.main.native}/print/${hy.os.family}"
+        <make dir="src/main/native/print/${hy.os.family}"
               target="clean" />
     </target>
 
     <target name="compile-java">
         <echo message="Compiling PRINT classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.print.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java/common"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -108,10 +109,10 @@
     
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="is.windows">
-        <make dir="${hy.print.src.main.native}/print/${hy.os.family}" />
+        <make dir="src/main/native/print/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.print.src.main.native}/print/">
+            <fileset dir="src/main/native/print/">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -119,16 +120,16 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.print.src.main.native}/print/${hy.os.family}">
+            <fileset dir="src/main/native/print/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.print.src.main.java}">
+        <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" />
@@ -137,11 +138,11 @@
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}.jar"
-             manifest="${hy.print}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/print.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <metainf prefix="META-INF/services"
-                dir="${hy.print.src.main.java}/org/apache/harmony/x/print"
+                dir="src/main/java/common/org/apache/harmony/x/print"
                 includes="javax.print.StreamPrintServiceFactory"/>
             <metainf prefix="META-INF/services"
                 dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
@@ -154,14 +155,14 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}-src.jar">
+        <jar destfile="${hy.jdk}/jre/lib/boot/print-src.jar">
             <metainf prefix="META-INF/services"
-                dir="${hy.print.src.main.java}/org/apache/harmony/x/print"
+                dir="src/main/java/common/org/apache/harmony/x/print"
                 includes="javax.print.StreamPrintServiceFactory"/>
             <metainf prefix="META-INF/services"
                 dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
                 includes="javax.print.PrintServiceLookup"/>
-            <fileset dir="${hy.print.src.main.java}" />
+            <fileset dir="src/main/java/common" />
             <fileset dir="${hy.print.src.main.java.platform}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -174,10 +175,10 @@
     <target name="compile-tests">
         <echo message="Compiling Print tests" />
 
-        <mkdir dir="${hy.print.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.print.src.test.java}"
-               destdir="${hy.print.bin.test}"
+        <javac srcdir="src/test/api/java/common"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -226,14 +227,14 @@
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
             <classpath>
-                <pathelement path="${hy.print.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no">
 
-                <fileset dir="${hy.print.src.test.java}">
+                <fileset dir="src/test/api/java/common">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case"/>
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Sat Jul 11 14:54:39 2009
@@ -22,17 +22,18 @@
     <description>Build for REGEX component</description>
 
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.regex.src.main.java}" />
-            <present targetdir="${hy.regex.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -72,11 +73,11 @@
     <target name="compile-java">
         <echo message="Compiling REGEX classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.regex.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -94,9 +95,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.regex.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -104,7 +105,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
-             manifest="${hy.regex}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -115,7 +116,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/regex-src.jar">
-            <fileset dir="${hy.regex.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -127,10 +128,10 @@
     <target name="compile-tests">
         <echo message="Compiling REGEX tests" />
 
-        <mkdir dir="${hy.regex.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.regex.src.test.java}"
-               destdir="${hy.regex.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -178,17 +179,17 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.regex.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
             <classpath location="../../build/tests" />
-            <classpath location="${hy.regex.src.test.resources}" />
+            <classpath location="src/test/resources" />
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.regex.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.rmi.src.main.java}" />
-            <present targetdir="${hy.rmi.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -62,8 +63,8 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}-src.jar" />
+        <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>
@@ -73,11 +74,11 @@
     <target name="compile-java">
         <echo message="Compiling RMI classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.rmi.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -95,17 +96,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.rmi.src.main.java}">
+        <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">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar"
-             manifest="${hy.rmi}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -115,8 +116,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}-src.jar">
-            <fileset dir="${hy.rmi.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/rmi-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -127,10 +128,10 @@
 
     <target name="compile-tests">
 
-        <compile-tests description="api tests" destdir="${hy.rmi.bin.test}/api">
+        <compile-tests description="api tests" destdir="bin/test/api">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.rmi.src.test}/api/java"/>
+                    <pathelement location="src/test/api/java"/>
                 </src>
 
                 <include name="**/*Test.java"/>
@@ -152,12 +153,12 @@
             <junit-elements>
 
                 <classpath>
-                    <pathelement path="${hy.rmi.bin.test}/api"/>
+                    <pathelement path="bin/test/api"/>
                     <pathelement path="../../build/tests"/>
                 </classpath>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.rmi.src.test}/api/java">
+                    <fileset dir="src/test/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -246,7 +247,7 @@
                 <junit-elements />
 
                 <classpath>
-                    <pathelement path="${hy.rmi.src.test.resources}"/>
+                    <pathelement path="src/test/resources"/>
                     <pathelement location="${hy.hdk}/build/test/support.jar"/>
                 </classpath>
 

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Sat Jul 11 14:54:39 2009
@@ -21,23 +21,24 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.security.src.main.java.platform"
-              value="${hy.security.src.main.java}/../${hy.os.family}" />
+              value="src/main/java/common/../${hy.os.family}" />
 
     <property name="hy.security.src.test.java.platform"
               value="${hy.security.src.test.java}/../${hy.os.family}" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.security.src.main.java}" />
-            <present targetdir="${hy.security.src.main.java}">
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -51,18 +52,18 @@
         </or>
     </fileset>
 
-    <fileset id="tests.api" dir="${hy.security.bin.test}/api"/>
-    <fileset id="tests.api.in" dir="${hy.security.bin.test}/api.injected"/>
-    <fileset id="tests.impl" dir="${hy.security.bin.test}/impl"/>
-    <fileset id="tests.impl.in" dir="${hy.security.bin.test}/impl.injected"/>
-    <fileset id="tests.support" dir="${hy.security.bin.test}/support"/>
-    <fileset id="resources" dir="${hy.security}/src/test/resources"/>
+    <fileset id="tests.api" dir="bin/test/api"/>
+    <fileset id="tests.api.in" dir="bin/test/api.injected"/>
+    <fileset id="tests.impl" dir="bin/test/impl"/>
+    <fileset id="tests.impl.in" dir="bin/test/impl.injected"/>
+    <fileset id="tests.support" dir="bin/test/support"/>
+    <fileset id="resources" dir="./src/test/resources"/>
 
     <property file="../../make/depends.properties" />
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/security" />
     <property name="tests.resources.dir"
-              value="${tests.hdk.dir}/resources/${hy.security.packaging.jarname}" />
+              value="${tests.hdk.dir}/resources/security" />
     <property name="security.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
@@ -83,22 +84,22 @@
     <target name="-test-module" depends="build, compile-tests, test-jar, copy-tests-resources, prepare-exclude, run-tests" />
 
     <!-- Build native code -->
-    <available file="${hy.security.src.main.native}/security/${hy.os.family}" property="native.present" />
+    <available file="src/main/native/security/${hy.os.family}" property="native.present" />
 
 
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="native.present" >
-        <make dir="${hy.security.src.main.native}/security/${hy.os.family}" />
+        <make dir="src/main/native/security/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.security.src.main.native}/security">
+            <fileset dir="src/main/native/security">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
             <!-- Copy link exports file on z/OS -->
-            <fileset dir="${hy.security.src.main.native}/security/${hy.os.family}">
+            <fileset dir="src/main/native/security/${hy.os.family}">
                 <include name="*${linklib.suffix}*" if="is.zos" />
             </fileset>
         </copy>
@@ -106,17 +107,17 @@
     
     <!-- Clean natives -->
     <target name="clean-native" if="native.present" >
-        <make dir="${hy.security.src.main.native}/security/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/security/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}-src.jar" />
-        <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api.jar" />
-        <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar" />
-        <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl.jar" />
-        <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar" />
-        <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/security-src.jar" />
+        <delete file="${tests.hdk.dir}/security_tests_api.jar" />
+        <delete file="${tests.hdk.dir}/security_tests_api_in.jar" />
+        <delete file="${tests.hdk.dir}/security_tests_impl.jar" />
+        <delete file="${tests.hdk.dir}/security_tests_impl_in.jar" />
+        <delete file="${tests.hdk.dir}/security_tests_support.jar" />
         <delete dir="${tests.resources.dir}" />
         <delete failonerror="false">
             <fileset refid="classes" />
@@ -127,10 +128,10 @@
     <target name="compile-java">
         <echo message="Compiling SECURITY classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               destdir="${hy.build}"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -140,7 +141,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.security.src.main.java}"/>
+                <pathelement location="src/main/java/common"/>
                 <pathelement location="${hy.security.src.main.java.platform}" />
             </src>
 
@@ -153,17 +154,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.security.src.main.java}">
+        <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">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
-             manifest="${hy.security}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/security.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -173,8 +174,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}-src.jar">
-            <fileset dir="${hy.security.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/security-src.jar">
+            <fileset dir="src/main/java/common" />
             <fileset dir="${hy.security.src.main.java.platform}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -186,31 +187,31 @@
 
     <target name="test-jar" depends="svn-info, compile-tests">
 	<mkdir dir="${tests.hdk.dir}"/>
-        <jar destfile="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api.jar">
+        <jar destfile="${tests.hdk.dir}/security_tests_api.jar">
             <fileset refid="tests.api" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
         </jar>
-        <jar destfile="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar">
+        <jar destfile="${tests.hdk.dir}/security_tests_api_in.jar">
             <fileset refid="tests.api.in" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
         </jar>
-        <jar destfile="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl.jar">
+        <jar destfile="${tests.hdk.dir}/security_tests_impl.jar">
             <fileset refid="tests.impl" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
         </jar>
-        <jar destfile="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar">
+        <jar destfile="${tests.hdk.dir}/security_tests_impl_in.jar">
             <fileset refid="tests.impl.in" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
         </jar>
-        <jar destfile="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar">
+        <jar destfile="${tests.hdk.dir}/security_tests_support.jar">
             <fileset refid="tests.support" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -229,47 +230,47 @@
 
     <target name="compile-tests">
 
-        <compile-tests description="test support files" destdir="${hy.security.bin.test}/support">
+        <compile-tests description="test support files" destdir="bin/test/support">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.security.src.test}/support/common/java"/>
+                    <pathelement location="src/test/support/common/java"/>
                 </src>
                 <include name="**/*.java" />
             </javac-elements>
         </compile-tests>
 
 
-        <compile-tests description="api tests" destdir="${hy.security.bin.test}/api">
+        <compile-tests description="api tests" destdir="bin/test/api">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.security.src.test}/api/java"/>
+                    <pathelement location="src/test/api/java"/>
                 </src>
 
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="api injected tests" destdir="${hy.security.bin.test}/api.injected">
+        <compile-tests description="api injected tests" destdir="bin/test/api.injected">
             <javac-elements>
-                <src path="${hy.security.src.test}/api/java.injected"/>
+                <src path="src/test/api/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl injected tests" destdir="${hy.security.bin.test}/impl.injected">
+        <compile-tests description="impl injected tests" destdir="bin/test/impl.injected">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.security.src.test}/impl/java.injected"/>
+                    <pathelement location="src/test/impl/java.injected"/>
                 </src>
 
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl tests" destdir="${hy.security.bin.test}/impl">
+        <compile-tests description="impl tests" destdir="bin/test/impl">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.security.src.test}/impl/java"/>
+                    <pathelement location="src/test/impl/java"/>
                 </src>
 
                 <include name="**/*Test.java" />
@@ -290,14 +291,14 @@
         <run-tests description="api tests">
             <junit-elements>
                 <classpath>
-                    <pathelement path="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api.jar"/>
-                    <pathelement path="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
+                    <pathelement path="${tests.hdk.dir}/security_tests_api.jar"/>
+                    <pathelement path="${tests.hdk.dir}/security_tests_support.jar"/>
                     <pathelement path="${tests.resources.dir}"/>
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.security.src.test}/api/java">
+                    <fileset dir="src/test/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -312,10 +313,10 @@
         <run-tests description="api.injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar${path.separator}../junit.jar${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/security_tests_api_in.jar${path.separator}../junit.jar${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/security_tests_support.jar"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.security.src.test}/api/java.injected">
+                    <fileset dir="src/test/api/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -335,13 +336,13 @@
         <run-tests description="impl tests">
             <junit-elements>
                 <classpath>
-                    <pathelement path="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl.jar"/>
-                    <pathelement path="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
+                    <pathelement path="${tests.hdk.dir}/security_tests_impl.jar"/>
+                    <pathelement path="${tests.hdk.dir}/security_tests_support.jar"/>
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.security.src.test}/impl/java">
+                    <fileset dir="src/test/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -356,10 +357,10 @@
         <run-tests description="impl injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar${path.separator}../junit.jar${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/security_tests_impl_in.jar${path.separator}../junit.jar${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/security_tests_support.jar"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.security.src.test}/impl/java.injected">
+                    <fileset dir="src/test/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -410,7 +411,7 @@
                         <include name="**/*.jar" />
                     </fileset>
                 </bootclasspath>
-                <classpath location="${hy.security.bin.test}/support" />
+                <classpath location="bin/test/support" />
                 <classpath location="${hy.hdk}/build/test/support.jar" />
             </javac>
         </sequential>

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.sound.src.main.java}" />
-            <present targetdir="${hy.sound.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -39,7 +40,7 @@
         </or>
     </fileset>
 
-    <fileset id="resources" dir="${hy.sound}/src/test/resources"/>
+    <fileset id="resources" dir="./src/test/resources"/>
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/sound" />
     <property name="sound.exclude.file"
@@ -62,11 +63,11 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, copy-tests-resources, run-tests" />
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test" />
-    <property name="tests.resources.dir" value="${tests.hdk.dir}/resources/${hy.sound.packaging.jarname}" />
+    <property name="tests.resources.dir" value="${tests.hdk.dir}/resources/sound" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}-src.jar" />
+        <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>
@@ -76,11 +77,11 @@
     <target name="compile-java">
         <echo message="Compiling SOUND classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.sound.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -98,17 +99,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.sound.src.main.java}">
+        <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">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}.jar"
-             manifest="${hy.sound}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/sound.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -118,8 +119,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}-src.jar">
-            <fileset dir="${hy.sound.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/sound-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -138,10 +139,10 @@
     <target name="compile-tests">
         <echo message="Compiling SOUND tests" />
 
-        <mkdir dir="${hy.sound.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.sound.src.test.java}"
-               destdir="${hy.sound.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -188,7 +189,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.sound.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
             <classpath location="${hy.hdk}/build/test/resources/sound/org/apache/harmony/sound/tests/javax/sound/sampled/soundProvider.jar" />
@@ -196,7 +197,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.sound.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.sql.src.main.java}" />
-            <present targetdir="${hy.sql.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -73,8 +74,8 @@
         <echo message="Compiling SQL classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.sql.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -92,9 +93,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.sql.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -102,7 +103,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
-             manifest="${hy.sql}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -113,7 +114,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/sql-src.jar">
-            <fileset dir="${hy.sql.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -125,10 +126,10 @@
     <target name="compile-tests">
         <echo message="Compiling SQL tests" />
 
-        <mkdir dir="${hy.sql.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.sql.src.test.java}"
-               destdir="${hy.sql.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -175,8 +176,8 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.sql.bin.test}"/>
-                <pathelement path="${hy.sql.src.test.resources}"/>
+                <pathelement path="bin/test"/>
+                <pathelement path="src/test/resources"/>
                 <pathelement path="${hy.hdk}/build/test/support.jar"/>
                 <pathelement path="${hy.hdk}/build/test/derby.jar"/>
             </classpath>
@@ -186,7 +187,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.sql.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.suncompat.src.main.java}" />
-            <present targetdir="${hy.suncompat.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -72,8 +73,8 @@
         <echo message="Compiling Sun Compat classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.suncompat.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -91,9 +92,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.suncompat.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -101,7 +102,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
-             manifest="${hy.suncompat}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -112,7 +113,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat-src.jar">
-            <fileset dir="${hy.suncompat.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -124,10 +125,10 @@
     <target name="compile-tests">
         <echo message="Compiling SUNCOMPAT tests" />
 
-        <mkdir dir="${hy.suncompat.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.suncompat.src.test.java}"
-               destdir="${hy.suncompat.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -174,7 +175,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.suncompat.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="../../build/tests" />
 
@@ -182,7 +183,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.suncompat.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Sat Jul 11 14:54:39 2009
@@ -21,23 +21,24 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.swing.src.main.java.platform"
-              value="${hy.swing.src.main.java}/../${hy.os.family}" />
+              value="src/main/java/common/../${hy.os.family}" />
 
     <property name="hy.swing.src.test.java.platform"
               value="${hy.swing.src.test.java}/../${hy.os.family}" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.swing.src.main.java}" />
-            <present targetdir="${hy.swing.src.main.java}">
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -52,7 +53,7 @@
     </fileset>
 
     <!-- List of private classes that cannot be mapped by above mappers -->
-    <fileset id="hidden.classes" dir="${hy.build}">
+    <fileset id="hidden.classes" dir="../../build/classes">
         <include name="javax/swing/text/html/parser/ModelElement.class"/>
         <include name="javax/swing/text/html/parser/Asn1ModelElement.class"/>
         <include name="javax/swing/text/html/parser/Asn1ModelElement$1.class"/>
@@ -82,8 +83,8 @@
     <target name="-test-module" depends="build, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}-src.jar" />
+        <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"/>
@@ -94,10 +95,10 @@
     <target name="compile-java">
         <echo message="Compiling SWING classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               destdir="${hy.build}"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -107,7 +108,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.swing.src.main.java}"/>
+                <pathelement location="src/main/java/common"/>
                 <pathelement location="${hy.swing.src.main.java.platform}" />
             </src>
 
@@ -120,17 +121,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.swing.src.main.java}">
+        <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">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}.jar"
-             manifest="${hy.swing}/META-INF/MANIFEST.MF"
+        <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" />
@@ -141,8 +142,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}-src.jar">
-            <fileset dir="${hy.swing.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/swing-src.jar">
+            <fileset dir="src/main/java/common" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -154,10 +155,10 @@
     <target name="compile-tests">
         <echo message="Compiling SWING tests" />
 
-        <mkdir dir="${hy.swing.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.swing.src.test.api}/java.injected"
-               destdir="${hy.swing.bin.test}"
+        <javac srcdir="src/test/api/java.injected"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -206,12 +207,12 @@
 
             <formatter type="xml" />
 
-            <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:bin/test${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 <!--            <jvmarg value="-Djava2d.opengl=true"/> -->
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.swing.src.test.api}/java.injected">
+                <fileset dir="src/test/api/java.injected">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -235,9 +236,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.swing.bin.test}" />
-        <copy todir="${hy.swing.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.swing.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.text.src.main.java}" />
-            <present targetdir="${hy.text.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -71,11 +72,11 @@
     <target name="compile-java">
         <echo message="Compiling TEXT classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-            srcdir="${hy.text.src.main.java}"
-            destdir="${hy.build}"
+            srcdir="src/main/java"
+            destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -93,9 +94,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.text.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -103,7 +104,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
-             manifest="${hy.text}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -114,7 +115,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/text-src.jar">
-            <fileset dir="${hy.text.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -126,10 +127,10 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling TEXT tests" />
 
-        <mkdir dir="${hy.text.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.text.src.test.java}"
-            destdir="${hy.text.bin.test}"
+        <javac srcdir="src/test/java"
+            destdir="bin/test"
             sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -176,7 +177,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.text.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
 
@@ -184,7 +185,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.text.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -208,9 +209,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.text.bin.test}" />
-        <copy todir="${hy.text.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.text.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

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=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.x-net.src.main.java}" />
-            <present targetdir="${hy.x-net.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -62,8 +63,8 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}-src.jar" />
+        <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>
@@ -73,11 +74,11 @@
     <target name="compile-java">
         <echo message="Compiling X-NET classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.x-net.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -95,17 +96,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.x-net.src.main.java}">
+        <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">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar"
-             manifest="${hy.x-net}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -115,8 +116,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}-src.jar">
-            <fileset dir="${hy.x-net.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/x-net-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -130,31 +131,31 @@
         <compile-tests description="test support files" destdir="../../build/tests">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.x-net.src.test}/support/common/java" />
+                    <pathelement location="src/test/support/common/java" />
                 </src>
 
                 <include name="**/*.java" />
             </javac-elements>
         </compile-tests>
         
-        <compile-tests description="api tests" destdir="${hy.x-net.bin.test}/api">
+        <compile-tests description="api tests" destdir="bin/test/api">
             <javac-elements>
-                <src path="${hy.x-net.src.test}/api/java"/>
-                <src path="${hy.x-net.src.test}/java"/>
+                <src path="src/test/api/java"/>
+                <src path="src/test/java"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl injected tests" destdir="${hy.x-net.bin.test}/impl.injected">
+        <compile-tests description="impl injected tests" destdir="bin/test/impl.injected">
             <javac-elements>
-                <src path="${hy.x-net.src.test}/impl/java.injected"/>
+                <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
         
-        <compile-tests description="impl tests" destdir="${hy.x-net.bin.test}/impl">
+        <compile-tests description="impl tests" destdir="bin/test/impl">
             <javac-elements>
-                <src path="${hy.x-net.src.test}/impl/java"/>
+                <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
@@ -173,13 +174,13 @@
             <junit-elements>
 
                 <classpath>
-                    <pathelement path="${hy.x-net.bin.test}/api"/>
+                    <pathelement path="bin/test/api"/>
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                     <pathelement path="../../build/tests" />
                 </classpath>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.x-net.src.test}/api/java">
+                    <fileset dir="src/test/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -199,12 +200,12 @@
         <run-tests description="impl tests">
             <junit-elements>
                 <classpath>
-                    <pathelement path="${hy.x-net.bin.test}/impl"/>
+                    <pathelement path="bin/test/impl"/>
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.x-net.src.test}/impl/java">
+                    <fileset dir="src/test/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -218,10 +219,10 @@
         <run-tests description="impl injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.x-net.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:bin/test/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.x-net.src.test}/impl/java.injected">
+                    <fileset dir="src/test/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -307,7 +308,7 @@
                 <junit-elements />
 
                 <classpath>
-                    <pathelement path="${hy.x-net.src.test.resources}"/>
+                    <pathelement path="src/test/resources"/>
                     <pathelement path="../../build/tests" />
                 </classpath>
 



Mime
View raw message