Merge pull request akara#53 from jvirkki/jdk7-compilation

Allow using JDK 1.7 to compile faban.

Author: shanti

common/build-defaults.properties

@@ -2,5 +2,5 @@ compiler.debug=on
 compiler.generate.no.warnings=off
 compiler.args=-Xlint
 compiler.max.memory=128m
-compiler.target.version=1.5
+compiler.source.version=1.5
 junit.jar=/opt/netbeans-6.5/platform9/modules/ext/junit-4.5.jar

common/build.xml

@@ -57,7 +57,7 @@
         <mkdir dir="${compile.output}"/>
         <javac destdir="${compile.output}" debug="${compiler.debug}"
             nowarn="${compiler.generate.no.warnings}"
-            target="${compiler.target.version}" includeantruntime="false"
+            source="${compiler.source.version}" includeantruntime="false"
             memoryMaximumSize="${compiler.max.memory}" fork="true">
             <compilerarg line="${compiler.args}"/>
             <src refid="source.path"/>
@@ -69,7 +69,7 @@
         <mkdir dir="${compile.test.output}"/>
         <javac destdir="${compile.test.output}" debug="${compiler.debug}"
             nowarn="${compiler.generate.no.warnings}"
-            target="${compiler.target.version}" includeantruntime="false"
+            source="${compiler.source.version}" includeantruntime="false"
             memoryMaximumSize="${compiler.max.memory}" fork="true">
             <compilerarg line="${compiler.args}"/>
             <classpath refid="test.class.path"/>
@@ -143,7 +143,7 @@
     <target name="rmic" depends="compile"
         description="Create rmi stubs and skeletons">
         <rmic base="${compile.output}"
-            stubversion="${compiler.target.version}"
+            stubversion="1.2"
             includes="**/*Impl.class"
             excludes="**/*$*.class"/>
     </target>

driver/build-defaults.properties

@@ -2,5 +2,5 @@ compiler.debug=on
 compiler.generate.no.warnings=off
 compiler.args=
 compiler.max.memory=128m
-compiler.target.version=1.5
+compiler.source.version=1.5
 junit.jar=/opt/netbeans-6.5/platform9/modules/ext/junit-4.5.jar

driver/build.xml

@@ -72,7 +72,7 @@
         <mkdir dir="${compile.output}"/>
         <javac destdir="${compile.output}" debug="${compiler.debug}"
             nowarn="${compiler.generate.no.warnings}"
-            target="${compiler.target.version}" includeantruntime="false"
+            source="${compiler.source.version}" includeantruntime="false"
             memoryMaximumSize="${compiler.max.memory}" fork="true">
             <compilerarg line="${compiler.args}"/>
             <classpath refid="class.path"/>
@@ -86,7 +86,7 @@
         <mkdir dir="${compile.test.output}"/>
         <javac destdir="${compile.test.output}" debug="${compiler.debug}"
             nowarn="${compiler.generate.no.warnings}"
-            target="${compiler.target.version}" includeantruntime="false"
+            source="${compiler.source.version}" includeantruntime="false"
             memoryMaximumSize="${compiler.max.memory}" fork="true">
             <compilerarg line="${compiler.args}"/>
             <classpath refid="test.class.path"/>
@@ -162,7 +162,7 @@
     <target name="rmic" depends="compile"
         description="Create rmi stubs and skeletons">
         <rmic base="${compile.output}"
-              stubversion="${compiler.target.version}"
+              stubversion="1.2"
               includes="**/engine/*Impl.class"/>
     </target>
 

harness/build-defaults.properties

@@ -2,5 +2,5 @@ compiler.debug=on
 compiler.generate.no.warnings=off
 compiler.args=
 compiler.max.memory=128m
-compiler.target.version=1.5
+compiler.source.version=1.5
 junit.jar=/opt/netbeans-6.5/platform9/modules/ext/junit-4.5.jar

harness/build.xml

@@ -76,7 +76,7 @@
         <mkdir dir="${compile.output}"/>
         <javac destdir="${compile.output}" debug="${compiler.debug}"
             nowarn="${compiler.generate.no.warnings}"
-            target="${compiler.target.version}" includeantruntime="false" 
+            source="${compiler.source.version}" includeantruntime="false"
             memoryMaximumSize="${compiler.max.memory}" fork="true">
             <compilerarg line="${compiler.args}"/>
             <classpath refid="class.path"/>
@@ -89,7 +89,7 @@
         <mkdir dir="${compile.test.output}"/>
         <javac destdir="${compile.test.output}" debug="${compiler.debug}"
             nowarn="${compiler.generate.no.warnings}"
-            target="${compiler.target.version}" includeantruntime="false"
+            source="${compiler.source.version}" includeantruntime="false"
             memoryMaximumSize="${compiler.max.memory}" fork="true">
             <compilerarg line="${compiler.args}"/>
             <classpath refid="test.class.path"/>
@@ -167,7 +167,7 @@
     <target name="rmic" depends="compile"
         description="Create rmi stubs and skeletons">
         <rmic base="${compile.output}"
-            stubversion="${compiler.target.version}"
+            stubversion="1.2"
             includes="**/*Impl.class"
             excludes="**/*$*.class">
             <classpath refid="class.path"/>

samples/benchmarks/fabanload/build.properties

@@ -4,4 +4,4 @@ faban.url=http://brazilian:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=false
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/benchmarks/fabanload/build.xml

@@ -31,7 +31,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" target="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/benchmarks/ftp101/build.properties

@@ -4,4 +4,4 @@ faban.url=http://brazilian.sfbay:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=false
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/benchmarks/ftp101/build.xml

@@ -31,7 +31,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" target="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/benchmarks/hadoopgridmix/build.properties

@@ -4,4 +4,4 @@ faban.url=http://brazilian:9980
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/benchmarks/hadoopgridmix/build.xml

@@ -195,7 +195,7 @@
 
     <target name="compile" depends="init,GridMix" description="Compiling all source files">
         <javac srcdir="${src.dir}"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" target="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="com/sun/hadoop/harness/GridMix.java" />
             <classpath refid="classpath"/>

samples/benchmarks/specweb2005/build.properties

@@ -4,4 +4,4 @@ faban.url=http://brazilian.sfbay:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=false
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/benchmarks/specweb2005/build.xml

@@ -31,7 +31,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" target="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/benchmarks/web101/build.properties

@@ -4,4 +4,4 @@ faban.url=http://brazilian:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/benchmarks/web101/build.xml

@@ -31,7 +31,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/services/ApacheHttpdService/build.properties

@@ -4,4 +4,4 @@ faban.url=http://localhost:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/services/ApacheHttpdService/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/services/GlassfishService/build.properties

@@ -4,4 +4,4 @@ faban.url=http://localhost:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/services/GlassfishService/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/services/LighttpdService/build.properties

@@ -4,4 +4,4 @@ faban.url=http://localhost:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/services/LighttpdService/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/services/MemcachedService/build.properties

@@ -4,4 +4,4 @@ faban.url=http://localhost:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/services/MemcachedService/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/services/MysqlService/build.properties

@@ -4,4 +4,4 @@ faban.url=http://localhost:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/services/MysqlService/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>

samples/services/OracleService/build.properties

@@ -4,4 +4,4 @@ faban.url=http://localhost:9980/
 deploy.user=deployer
 deploy.password=adminadmin
 deploy.clearconfig=true
-compiler.target.version=1.5
+compiler.source.version=1.5

samples/services/OracleService/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" description="Compiling all source files">
         <javac srcdir="${src.dir}" includeantruntime="false"
-            deprecation="on" target="${compiler.target.version}"
+            deprecation="on" source="${compiler.source.version}"
             destdir="${classes.dir}" debug="on">
             <include name="**/*.java" />
             <classpath refid="classpath"/>