You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gh...@apache.org on 2006/04/12 19:03:46 UTC

svn commit: r393521 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/applet/make/ modules/applet/make/common/ modules/archive/make/ modules/archive/make/common/ modules/auth/make/ modules/auth/make/common/ modules/awt/make/ modules/awt/ma...

Author: gharley
Date: Wed Apr 12 10:03:36 2006
New Revision: 393521

URL: http://svn.apache.org/viewcvs?rev=393521&view=rev
Log:
Temporary move to compile with "modern" compiler using the "jsr14" target until 5.0 VM support becomes available.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Wed Apr 12 10:03:36 2006
@@ -244,7 +244,7 @@
             description="Compile the source">
         <mkdir dir="${build.output}" />
 
-        <javac destdir="${build.output}" source="1.4" target="1.4" debug="on">
+        <javac destdir="${build.output}" source="1.5" target="jsr14" debug="on">
             <src path="modules/applet/src/main/java" />
             <src path="modules/auth/src/main/java/common" />
             <src path="modules/auth/src/main/java/windows" />

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Wed Apr 12 10:03:36 2006
@@ -178,7 +178,7 @@
     <target name="compile-support" depends="copy-test-resources, check-support-jars"
     	description="Compile the unit test source">
     	<mkdir dir="${tests.build.output}" />
-        <javac destdir="${tests.build.output}" source="1.4" target="1.4" debug="on">
+        <javac destdir="${tests.build.output}" source="1.5" target="jsr14" debug="on">
             <src path="${support.dir}/src/test/java" />
             <src path="modules/archive/src/test/java" />
             <src path="modules/luni/src/test/java" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- APPLET TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.applet.src.main.java}"
 			destdir="${hy.applet.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.applet.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- ARCHIVE TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.archive.src.main.java}"
 			destdir="${hy.archive.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.archive.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml Wed Apr 12 10:03:36 2006
@@ -72,9 +72,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<!-- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> -->
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -90,7 +90,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- AUTH TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -33,6 +33,7 @@
 		<javac sourcepath=""
 			destdir="${hy.auth.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<src>
@@ -63,6 +64,7 @@
 
 		<javac 	destdir="${hy.auth.bin.test}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<!-- FIXME: AUTH tests should not reach into security module code -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- AWT TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.awt.src.main.java}"
 			destdir="${hy.awt.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.awt.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- BEANS TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.beans.src.main.java}"
 			destdir="${hy.beans.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.beans.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- CRYPTO TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -28,6 +28,7 @@
 			srcdir="${hy.crypto.src.main.java}"
 			destdir="${hy.crypto.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 
 		<javac 	destdir="${hy.crypto.bin.test}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
                     <!-- FIXME: CRYPTO tests should not reach into security module code -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- JNDI TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.jndi.src.main.java}"
 			destdir="${hy.jndi.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.jndi.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- LOGGING TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.logging.src.main.java}"
 			destdir="${hy.logging.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -54,6 +55,7 @@
 			destdir="${hy.logging.bin.injected}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -67,6 +69,7 @@
 			destdir="${hy.logging.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml Wed Apr 12 10:03:36 2006
@@ -87,9 +87,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -105,7 +105,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- LUNI TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -22,7 +22,12 @@
 
 		<mkdir dir="${hy.luni.bin.main}" />
 
-		<javac sourcepath="" srcdir="${hy.luni.src.main.java}" destdir="${hy.luni.bin.main}" source="${source.ver}" debug="${java.debug.option}">
+		<javac sourcepath=""
+			srcdir="${hy.luni.src.main.java}"
+			destdir="${hy.luni.bin.main}"
+			source="${source.ver}"
+			target="jsr14"
+			debug="${java.debug.option}">
 
 			<bootclasspath>
 				<fileset dir="${hy.target}/jre/lib/boot">
@@ -44,7 +49,12 @@
 
 		<mkdir dir="${hy.luni.bin.test}" />
 
-		<javac srcdir="${hy.luni.src.test.java}" destdir="${hy.luni.bin.test}" sourcepath="" source="${source.ver}" debug="${java.debug.option}">
+		<javac srcdir="${hy.luni.src.test.java}"
+			destdir="${hy.luni.bin.test}"
+			sourcepath=""
+			source="${source.ver}"
+			target="jsr14"
+			debug="${java.debug.option}">
 
 			<bootclasspath>
 				<fileset dir="${hy.target}/jre/lib/boot">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- MATH TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.math.src.main.java}"
 			destdir="${hy.math.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.math.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- NIO TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.nio.src.main.java}"
 			destdir="${hy.nio.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.nio.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,10 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 	<target name="init">
 		<tstamp>
 			<format property="build-date" pattern="yyyyMMdd" locale="en" />
@@ -89,7 +88,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- TEXT TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.nio_char.src.main.java}"
 			destdir="${hy.nio_char.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.nio_char.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- PREFS TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.prefs.src.main.java}"
 			destdir="${hy.prefs.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.prefs.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/make/build.xml Wed Apr 12 10:03:36 2006
@@ -104,7 +104,8 @@
         <javac srcdir="${taglet1.src}"
                sourcepath=""
                destdir="${classes.dir}"
-               source="1.4"
+               source="1.5"
+        	   target="jsr14"
                deprecation="on"
                classpathref="compile.classpath"
                debug="off">
@@ -127,7 +128,8 @@
         <javac srcdir="${src.dir}"
                sourcepath=""
                destdir="${classes.dir}"
-               source="1.4"
+               source="1.5"
+        	   target="jsr14"
                deprecation="on"
                classpathref="compile.classpath"
                debug="on">
@@ -140,7 +142,8 @@
         <javac srcdir="${tst.src.dir}"
                sourcepath=""
                destdir="${tst.classes.dir}"
-               source="1.4"
+               source="1.5"
+        	   target="jsr14"
                deprecation="on"
                bootclasspath="${classes.dir};${env.JAVA_HOME}/jre/lib/rt.jar"
                classpathref="tst.classpath"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- RMI TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.rmi.src.main.java}"
 			destdir="${hy.rmi.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.rmi.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml Wed Apr 12 10:03:36 2006
@@ -72,9 +72,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<!-- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> -->
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -90,7 +90,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- SECURITY TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -28,6 +28,7 @@
 			srcdir="${hy.security.src.main.java}"
 			destdir="${hy.security.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 		<javac 	destdir="${hy.security.bin.test}"
 			srcdir="${hy.security.src.test.java}"
 			source="${source.ver}"
+			target="jsr14"
 			sourcepath=""
 			debug="${java.debug.option}">
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- SQL TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.sql.src.main.java}"
 			destdir="${hy.sql.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.sql.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- TEXT TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.text.src.main.java}"
 			destdir="${hy.text.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,6 +54,7 @@
 			destdir="${hy.text.bin.test}"
 			sourcepath=""
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml Wed Apr 12 10:03:36 2006
@@ -71,9 +71,9 @@
 	<!-- Define the platform property dependant upon the OS and platform -->
 	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
-	<!-- Set the java compiler to be the Eclipse Java compiler -->
-	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. But it does not support jsr14 target -->
+	<property name="build.compiler" value="modern" />
 
 	<target name="init">
 		<tstamp>
@@ -89,7 +89,7 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.4" />
+		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- X-NET TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=393521&r1=393520&r2=393521&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Wed Apr 12 10:03:36 2006
@@ -26,6 +26,7 @@
 			srcdir="${hy.x-net.src.main.java}"
 			destdir="${hy.x-net.bin.main}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -51,6 +52,7 @@
 
 		<javac 	destdir="${hy.x-net.bin.test}"
 			source="${source.ver}"
+			target="jsr14"
 			debug="${java.debug.option}">
 
                     <!-- FIXME: X-NET tests should not reach into security module code -->



Re: svn commit: r393521 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/applet/make/ modules/applet/make/common/ modules/archive/make/ modules/archive/make/common/ modules/auth/make/ modules/auth/make/common/ modules/awt/make/ modules/awt/ma...

Posted by Geir Magnusson Jr <ge...@pobox.com>.
idle curiosity... 1) why not make both 'source' and 'target' settable by 
a property, and 2) educate me on ant - why couldn't this have been set 
in a property in the script that kicked things off and have the value 
propagate down?


gharley@apache.org wrote:
> Author: gharley
> Date: Wed Apr 12 10:03:36 2006
> New Revision: 393521
> 
> URL: http://svn.apache.org/viewcvs?rev=393521&view=rev
> Log:
> Temporary move to compile with "modern" compiler using the "jsr14" target until 5.0 VM support becomes available.
> 

[snip]

---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org