Author: dan.j.allen Date: 2009-04-08 00:38:52 -0400 (Wed, 08 Apr 2009) New Revision: 10347 Modified: branches/community/Seam_2_0/seam-gen/build-scripts/build-war.xml branches/community/Seam_2_0/seam-gen/build-scripts/build.xml branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml Log: add JDK 6 fix for tests Modified: branches/community/Seam_2_0/seam-gen/build-scripts/build-war.xml =================================================================== --- branches/community/Seam_2_0/seam-gen/build-scripts/build-war.xml 2009-04-08 04:37:15 UTC (rev 10346) +++ branches/community/Seam_2_0/seam-gen/build-scripts/build-war.xml 2009-04-08 04:38:52 UTC (rev 10347) @@ -331,6 +331,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk" value="true"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}" /> <path id="test.path"> <path path="${test.dir}" /> @@ -341,6 +348,7 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: branches/community/Seam_2_0/seam-gen/build-scripts/build.xml =================================================================== --- branches/community/Seam_2_0/seam-gen/build-scripts/build.xml 2009-04-08 04:37:15 UTC (rev 10346) +++ branches/community/Seam_2_0/seam-gen/build-scripts/build.xml 2009-04-08 04:38:52 UTC (rev 10347) @@ -304,6 +304,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk" value="true"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}" /> <path id="test.path"> <path path="${test.dir}" /> @@ -314,6 +321,7 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2009-04-08 04:37:15 UTC (rev 10346) +++ branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2009-04-08 04:38:52 UTC (rev 10347) @@ -327,6 +327,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk" value="true"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}" /> <path id="test.path"> <path path="${test.dir}" /> @@ -337,6 +344,7 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml 2009-04-08 04:37:15 UTC (rev 10346) +++ branches/community/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml 2009-04-08 04:38:52 UTC (rev 10347) @@ -300,6 +300,13 @@ </target> <target name="test" depends="buildtest" description="Run the tests"> + <condition property="incompatible.jdk" value="true"> + <and> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <not><available classname="javax.xml.bind.JAXB"/></not> + </and> + </condition> + <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail> <taskdef resource="testngtasks" classpath="${testng.jar}" /> <path id="test.path"> <path path="${test.dir}" /> @@ -310,6 +317,7 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng>