harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r441996 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/instrument/ mod...
Date Sun, 10 Sep 2006 19:59:49 GMT
Author: ndbeyer
Date: Sun Sep 10 12:59:48 2006
New Revision: 441996

URL: http://svn.apache.org/viewvc?view=rev&rev=441996
Log:
Create a Harmony property for javac compiler parameterization; temporarily remove "-showversion" argument from test runs.

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

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Sun Sep 10 12:59:48 2006
@@ -20,25 +20,17 @@
      ====================================================================== -->
 <project name="build-java-source" default="default" basedir="..">
     <description>
-		Compile the Java source and package in component archives.
+        Compile the Java source and package in component archives.
     </description>
 
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
 
-    <!-- Users need to set this property to use a different compiler -->
-    <!-- To use the eclipse compiler set the value of the below      -->
-    <!-- property to be "org.eclipse.jdt.core.JDTCompilerAdapter"    -->
-    <!-- This requires that the CLASSPATH of the environment where   -->
-    <!-- this Ant is running includes the Eclipse archives           -->
-    <!-- jdtCompilerAdapter.jar and org.eclipse.jdt.core_3.1.0.jar   -->
-    <property name="build.compiler" value="modern" />
-
     <property name="build.output" location="build/classes" />
     <property name="depends.jars" location="depends/jars" />
     <property name="depends.manifests" location="depends/manifests" />
     <property name="depends.files" location="depends/files" />
-	<property name="hy.hdk" location="deploy" />
+    <property name="hy.hdk" location="deploy" />
     <property name="hy.jdk" location="${hy.hdk}/jdk" />
     <property file="make/depends.properties" />
 
@@ -93,9 +85,12 @@
             description="Compile the source">
         <mkdir dir="${build.output}" />
 
-        <javac fork="yes" memoryMaximumSize="${hy.javac.maxmem}"
+        <javac fork="yes" 
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
                destdir="${build.output}"
-               source="${hy.javac.source}" target="${hy.javac.target}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
                debug="${hy.javac.debug}">
             <src path="modules/accessibility/src/main/java/" />
             <src path="modules/annotation/src/main/java/" />
@@ -209,15 +204,15 @@
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${hy.jdk}">
                 <exclude name="jre/bin/default/**" />
-            	<exclude name="jre/bin/**" />
+                <exclude name="jre/bin/**" />
                 <exclude name="jre/lib/ext/**" />
             </fileset>
         </delete>
     </target>
 
     <target name="prepare-depends"
-    	    description="Check for jars required to compile prefs">
-    	
+            description="Check for jars required to compile prefs">
+        
       <ant antfile="make/depends.xml" inheritall="false" target="check"/>
 
     </target>

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Sun Sep 10 12:59:48 2006
@@ -24,10 +24,8 @@
 
     <!-- set global properties for this build. -->
 
-    <property name="build.compiler" value="modern"/>
-
     <property name="tests.output" location="build/test_report" />
-	<property name="hy.hdk" location="deploy" />
+    <property name="hy.hdk" location="deploy" />
     <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <property name="tests.build.output" location="build/tests" />
@@ -38,13 +36,13 @@
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"
-	    depends="clean, test-modules, gen-report, check-test-result">
+        depends="clean, test-modules, gen-report, check-test-result">
     </target>
 
     <target name="clean">
-	<delete dir="${tests.output}" />
-	<delete dir="${tests.build.output}" />
-	<delete dir="${tests.support.output}" />
+    <delete dir="${tests.output}" />
+    <delete dir="${tests.build.output}" />
+    <delete dir="${tests.support.output}" />
         <delete file="${hy.hdk}/build/test/support.jar" />
     </target>
 
@@ -53,16 +51,16 @@
     </target>
 
     <target name="gen-report">
-	<junitreport todir="${tests.output}">
-	    <fileset dir="${tests.output}">
-		<include name="TEST*-*.xml"/>
-	    </fileset>
-	    <report format="frames" todir="${tests.output}/html"/>
-	</junitreport>
-
-	<!-- use this property just to get the slashes to display right in the echo -->
-	<property name="display-location" location="${tests.output}/html/index.html"/>
-	<echo message="The test report is in ${display-location}"/>
+    <junitreport todir="${tests.output}">
+        <fileset dir="${tests.output}">
+        <include name="TEST*-*.xml"/>
+        </fileset>
+        <report format="frames" todir="${tests.output}/html"/>
+    </junitreport>
+
+    <!-- use this property just to get the slashes to display right in the echo -->
+    <property name="display-location" location="${tests.output}/html/index.html"/>
+    <echo message="The test report is in ${display-location}"/>
     </target>
 
     <target name="support.jar" depends="compile-support">
@@ -74,12 +72,15 @@
     </target>
 
     <target name="compile-support" depends="copy-test-resources, check-support-jars"
-    	    description="Compile the unit test source">
-    	<mkdir dir="${tests.support.output}" />
-    	<javac destdir="${tests.support.output}"
-    	       source="${hy.javac.source}"
-    	       target="${hy.javac.target}"
-    	       debug="on">
+            description="Compile the unit test source">
+        <mkdir dir="${tests.support.output}" />
+        <javac 
+               destdir="${tests.support.output}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <src path="${support.dir}/src/test/java" />
             <classpath location="${junit.jar}" />
@@ -90,9 +91,9 @@
                 </fileset>
             </bootclasspath>
         </javac>
-    	
+        
     </target>
-	
+    
     <target name="check-test-result">
         <available property="test.errors"
                    file="${tests.output}/test.errors" />
@@ -118,29 +119,28 @@
     </target>
 
     <target name="check-support-jars"
-    	    description="Check for jars required to compile and run unit tests">
+            description="Check for jars required to compile and run unit tests">
 
       <ant antfile="make/depends.xml" inheritall="false" target="check"/>
 
     </target>
 
     <target name="run-tests" description="Run JUnit tests">
-    	<!-- The location of the Harmony launcher can be overridden by 
-    	     the "harmony.vm.exe" property. Default value of property
-    	     is set assuming it is under the deploy tree -->
-    	<property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-    	
+        <!-- The location of the Harmony launcher can be overridden by 
+             the "harmony.vm.exe" property. Default value of property
+             is set assuming it is under the deploy tree -->
+        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
+        
         <!-- Delete "junitCompleted" - an empty file that can be used to
              check that the junit test VM does not exit prematurely -->
         <delete file="${user.home}/junitCompleted" failonerror="false" />
 
         <path id="classpath.id" location="${tests.build.output}" />
-    	
-    	<java classname="tests.main.AllTests"
-    	      fork="true"
-    	      jvm="${harmony.vm.exe}">
-    	    
-            <jvmarg value="-showversion" />
+        
+        <java classname="tests.main.AllTests"
+              fork="true"
+              jvm="${harmony.vm.exe}">
+            
 
             <!-- Required by various tests that set security manager etc -->
             <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
@@ -150,30 +150,30 @@
 
             <!-- Required if using the test excluder decorator -->
             <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
-        	
+            
             <classpath>
                 <path refid="classpath.id" />
                 <pathelement location="${junit.jar}" />
             </classpath>
-   	</java>
+    </java>
     </target>
 
-	
+    
     <!-- ================================= 
           target: run-tests-with-junit-task
          ================================= -->
     <target name="run-tests-with-junit-task" description="Run JUnit tests">
-    	<!-- The location of the Harmony launcher can be overridden by 
-    	     the "harmony.vm.exe" property. Default value of property
-    	     is set assuming it is under the deploy tree -->
-    	<property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
+        <!-- The location of the Harmony launcher can be overridden by 
+             the "harmony.vm.exe" property. Default value of property
+             is set assuming it is under the deploy tree -->
+        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
 
         <!-- Delete "junitCompleted" - an empty file that can be used to
              check that the junit test VM does not exit prematurely -->
         <delete file="${user.home}/junitCompleted" failonerror="false" />
 
         <path id="classpath.id" location="${tests.build.output}" />
-    	
+        
         <junit fork="true"
                forkmode="once"
                jvm="${harmony.vm.exe}"
@@ -182,8 +182,6 @@
             <env key="JAVA_HOME" value="${hy.jdk}/jre" />
             <env key="LD_LIBRARY_PATH" value="" />
             <!-- required to be unset on Linux -->
-            
-            <jvmarg value="-showversion" />
 
             <!-- Required by various tests that set security manager etc -->
             <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
@@ -193,16 +191,16 @@
 
             <!-- Required if using the test excluder decorator -->
             <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
-        	
+            
             <classpath>
                 <path refid="classpath.id" />
                 <pathelement location="${junit.jar}" />
             </classpath>
-        	
+            
             <formatter type="plain" usefile="false" />
             <formatter type="xml" />
-        	
-        	<test todir="${tests.results.dir}" name="tests.main.AllTests" />
+            
+            <test todir="${tests.results.dir}" name="tests.main.AllTests" />
         </junit>
 
         <fail if="tests.failed" message="Some Tests Failed !" />

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Sun Sep 10 12:59:48 2006
@@ -20,6 +20,8 @@
 <project name="Common Platform definitions" default="echo" basedir="..">
 
     <!-- Javac properties -->
+    <!-- Set compiler to org.eclipse.jdt.core.JDTCompilerAdapter to use ECJ. -->
+    <property name="hy.javac.compiler" value="modern" />
     <property name="hy.javac.source" value="1.5" />
     <property name="hy.javac.target" value="1.5" />
     <property name="hy.javac.debug" value="on" />
@@ -88,7 +90,7 @@
         </and>
     </condition>
     <property name="hy.arch" value="${os.arch}" />
-	
+    
     <condition property="hy.arch.define" value="HYX86">
         <equals arg1="${hy.arch}" arg2="x86"/>
     </condition>
@@ -98,8 +100,8 @@
     <condition property="hy.cflags" value="-fpic">
         <equals arg1="${hy.arch}" arg2="x86_64"/>
     </condition>
-	<property name="hy.cflags" value="-march=pentium3"/>
-	
+    <property name="hy.cflags" value="-march=pentium3"/>
+    
     <!-- Normalized platform name -->
     <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
     <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -54,9 +50,11 @@
         <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
-               srcdir="${hy.accessibility.src.main.java}"
+               srcdir="${hy.accessibility.src.main.java}" 
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -95,7 +93,9 @@
         <javac srcdir="${hy.accessibility.src.test.api}/java/common"
                destdir="${hy.accessibility.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.annotation.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -94,7 +92,9 @@
         <javac srcdir="${hy.annotation.src.test.java}"
                destdir="${hy.annotation.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -122,8 +122,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.applet.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -93,7 +91,9 @@
         <javac srcdir="${hy.applet.src.test.java}"
                destdir="${hy.applet.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -120,8 +120,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,7 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
+
     <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
@@ -114,7 +111,9 @@
         <javac sourcepath=""
                srcdir="${hy.archive.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -153,7 +152,9 @@
         <javac srcdir="${hy.archive.src.test.java}"
                destdir="${hy.archive.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -180,8 +181,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -79,7 +75,9 @@
 
         <javac sourcepath=""
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -121,9 +119,11 @@
         <mkdir dir="${hy.auth.bin.test}" />
 
         <javac  destdir="${hy.auth.bin.test}"
-                source="${hy.javac.source}"
-                target="${hy.javac.target}"
-                debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <src>
                 <pathelement location="${hy.auth.src.test.java}"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-             use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -61,7 +57,9 @@
 
         <javac sourcepath=""
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -194,7 +192,9 @@
 
         <javac destdir="${hy.awt.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -56,7 +52,9 @@
         <javac sourcepath=""
                srcdir="${hy.beans.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -96,7 +94,9 @@
         <javac srcdir="${hy.beans.src.test.support}"
                destdir="${hy.beans.bin.test.support}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -112,7 +112,9 @@
         <javac srcdir="${hy.beans.src.test.internal}"
                destdir="${hy.beans.bin.internal}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -130,7 +132,9 @@
         <javac srcdir="${hy.beans.src.test.java}"
                destdir="${hy.beans.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -162,8 +166,6 @@
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
-            <jvmarg value="-showversion"/>
-
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 
             <jvmarg value="-Xbootclasspath/a:${hy.beans.bin.internal}${path.separator}../../${junit.jar}"/>         
@@ -199,8 +201,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <target name="build" depends="compile.java, build.jar" />
 
     <target name="test" ><!-- depends="build, compile.tests, run.tests" --></target>
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.concurrent.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -84,7 +82,9 @@
         <javac srcdir="${hy.concurrent.src.test.java}"
                destdir="${hy.concurrent.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -112,8 +112,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -56,7 +52,9 @@
         <javac sourcepath=""
                srcdir="${hy.crypto.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -227,9 +225,11 @@
             <mkdir dir="@{destdir}" />
             
             <javac destdir="@{destdir}"
-                   source="${hy.javac.source}"
-                   target="${hy.javac.target}"
-                   debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
                 <javac-elements />
 
@@ -262,8 +262,6 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
-
-                <jvmarg value="-showversion"/>
 
                 <env key="JAVA_HOME" value="${test.jre.home}"/>
                 <junit-elements />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
     
     <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
 
@@ -83,9 +79,11 @@
         <javac sourcepath=""
             srcdir="${hy.instrument.src.main.java}"
             destdir="${hy.build}"
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -122,9 +120,11 @@
         <javac srcdir="${hy.instrument.src.test.java}"
             destdir="${hy.instrument.bin.test}"
             sourcepath=""
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -149,8 +149,6 @@
             showoutput="on"
             dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.jndi.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -93,9 +91,11 @@
         <javac srcdir="${hy.jndi.src.test.java}"
             destdir="${hy.jndi.bin.test}"
             sourcepath=""
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -120,8 +120,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <target name="build" depends="compile.java, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.lang-management.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -84,7 +82,9 @@
         <javac srcdir="${hy.lang-management.src.test.java}"
                destdir="${hy.lang-management.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -112,8 +112,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.jar.resources, build.jar, copy.resources" />
 
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.logging.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -85,7 +83,9 @@
         <javac srcdir="${hy.logging.src.test.internal}"
                destdir="${hy.logging.bin.internal}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -100,7 +100,9 @@
         <javac srcdir="${hy.logging.src.test.java}"
                destdir="${hy.logging.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -130,7 +132,6 @@
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
-            <jvmarg value="-showversion"/>
         	<!-- Required by various tests that set security manager etc -->
             <jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <property file="../../make/depends.properties" />
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
 
@@ -257,7 +253,9 @@
         <javac sourcepath=""
                srcdir="${hy.luni.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -359,9 +357,11 @@
             <mkdir dir="@{destdir}" />
 
             <javac destdir="@{destdir}"
-                   source="${hy.javac.source}"
-                   target="${hy.javac.target}"
-                   debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
                 <javac-elements />
 
@@ -394,8 +394,6 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
-
-                <jvmarg value="-showversion" />
 
                 <env key="JAVA_HOME" value="${test.jre.home}"/>
                 <junit-elements />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.math.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -93,7 +91,9 @@
         <javac srcdir="${hy.math.src.test.java}"
                destdir="${hy.math.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -120,8 +120,6 @@
             showoutput="on"
             dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.misc.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -110,7 +108,9 @@
         <javac srcdir="${hy.misc.src.test.java}"
                destdir="${hy.misc.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -137,8 +137,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
         <property name="hy.nio.src.test.java.platform"
                   value="${hy.nio.src.test.java}/../${hy.os}" />
 
@@ -76,9 +72,11 @@
         <javac sourcepath=""
             srcdir="${hy.nio.src.main.java}"
             destdir="${hy.build}"
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -115,7 +113,9 @@
 
         <javac destdir="${hy.nio.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -146,8 +146,6 @@
             showoutput="on"
             dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion" />
 
             <env key="JAVA_HOME" value="${test.jre.home}" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.nio_char.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -93,7 +91,9 @@
         <javac srcdir="${hy.nio_char.src.test.java}"
                destdir="${hy.nio_char.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -121,8 +121,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -74,7 +70,9 @@
         <javac sourcepath=""
                srcdir="${hy.prefs.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -113,7 +111,9 @@
         <javac srcdir="${hy.prefs.src.test.java}"
                destdir="${hy.prefs.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -141,8 +141,6 @@
             showoutput="on"
             dir="${basedir}"
             jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -54,8 +50,10 @@
         <javac sourcepath=""
                srcdir="${hy.regex.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
             <bootclasspath>
@@ -93,8 +91,10 @@
         <javac srcdir="${hy.regex.src.test.java}"
                destdir="${hy.regex.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
             <bootclasspath>
@@ -120,8 +120,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -56,7 +52,9 @@
         <javac sourcepath=""
                srcdir="${hy.rmi.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -150,9 +148,11 @@
             <mkdir dir="@{destdir}" />
 
             <javac destdir="@{destdir}"
-                   source="${hy.javac.source}"
-                   target="${hy.javac.target}"
-                   debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
                 <javac-elements />
 
@@ -185,8 +185,7 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
-
-                <jvmarg value="-showversion"/>
+                   
                 <jvmarg value="-Djava.security.policy=make/all.policy"/>
 
                 <env key="JAVA_HOME" value="${test.jre.home}"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -84,7 +80,9 @@
 
         <javac sourcepath=""
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -296,9 +294,11 @@
             <mkdir dir="@{destdir}" />
 
             <javac destdir="@{destdir}"
-                   source="${hy.javac.source}"
-                   target="${hy.javac.target}"
-                   debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
                 <javac-elements />
 
@@ -331,8 +331,6 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
-
-                <jvmarg value="-showversion" />
 
                 <env key="JAVA_HOME" value="${test.jre.home}"/>
                 <junit-elements />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml Sun Sep 10 12:59:48 2006
@@ -31,10 +31,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
     <target name="test" depends="build, compile.tests, run.tests" />
@@ -54,7 +50,9 @@
         <javac sourcepath=""
                srcdir="${hy.sound.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -93,7 +91,9 @@
         <javac srcdir="${hy.sound.src.test.java}"
                destdir="${hy.sound.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -121,8 +121,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -52,7 +48,9 @@
         <javac sourcepath=""
                srcdir="${hy.sql.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -91,7 +89,9 @@
         <javac srcdir="${hy.sql.src.test.java}"
                destdir="${hy.sql.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -118,8 +118,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, build.jar" />
 
@@ -52,7 +48,9 @@
         <javac sourcepath=""
                srcdir="${hy.suncompat.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -64,14 +62,14 @@
         </javac>
     </target>
 
-	<target name="copy.resources">
-    	<mkdir dir="${hy.build}" />
+    <target name="copy.resources">
+        <mkdir dir="${hy.build}" />
         <copy todir="${hy.build}" includeemptydirs="false">
             <fileset dir="${hy.suncompat.src.main.java}">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-	</target>
+    </target>
 
     <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
@@ -91,7 +89,9 @@
         <javac srcdir="${hy.suncompat.src.test.java}"
                destdir="${hy.suncompat.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -118,8 +118,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -61,7 +57,9 @@
 
         <javac sourcepath=""
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -105,10 +103,12 @@
         <javac srcdir="${hy.swing.src.test.api}/java/common"
                destdir="${hy.swing.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
-
+               
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
     
     <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
 
@@ -88,9 +84,11 @@
         <javac sourcepath=""
             srcdir="${hy.text.src.main.java}"
             destdir="${hy.build}"
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -127,9 +125,11 @@
         <javac srcdir="${hy.text.src.test.java}"
             destdir="${hy.text.bin.test}"
             sourcepath=""
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -154,8 +154,6 @@
                showoutput="on"
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <target name="build" depends="compile.java, copy.resources, build.jar" />
 
@@ -55,7 +51,9 @@
         <javac sourcepath=""
                srcdir="${hy.tools.src.main.java}"
                destdir="${hy.build}"
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -99,7 +97,9 @@
         <javac srcdir="${hy.tools.src.test.java}"
                destdir="${hy.tools.bin.test}"
                sourcepath=""
-               source="${hy.javac.source}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
@@ -129,8 +129,6 @@
                        showoutput="on"
                        dir="${basedir}"
                        jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
 
             <env key="JAVA_HOME" value="${test.jre.home}"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=441996&r1=441995&r2=441996
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Sun Sep 10 12:59:48 2006
@@ -30,10 +30,6 @@
         <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-         use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
 
     <property file="../../make/depends.properties" />
 
@@ -56,9 +52,11 @@
         <javac sourcepath=""
             srcdir="${hy.x-net.src.main.java}"
             destdir="${hy.build}"
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -203,9 +201,11 @@
             <mkdir dir="@{destdir}" />
             
             <javac destdir="@{destdir}"
-                   source="${hy.javac.source}"
-                   target="${hy.javac.target}"
-                   debug="${hy.javac.debug}">
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
 
                 <javac-elements />
 
@@ -238,8 +238,6 @@
                    showoutput="on"
                    dir="${basedir}"
                    jvm="${test.jre.home}/bin/java">
-
-                <jvmarg value="-showversion"/>
 
                 <env key="JAVA_HOME" value="${test.jre.home}"/>
                 <junit-elements />



Mime
View raw message