Author: pete.muir(a)jboss.org Date: 2008-03-24 17:03:57 -0400 (Mon, 24 Mar 2008) New Revision: 7681 Modified: branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml trunk/seam-gen/icefaces/build-scripts/build-war.xml trunk/seam-gen/icefaces/build-scripts/build.xml Log: JBSEAM-2573, thanks to Joshua Partogi! Modified: branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2008-03-24 17:35:22 UTC (rev 7680) +++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/build-war.xml 2008-03-24 21:03:57 UTC (rev 7681) @@ -337,12 +337,18 @@ <target name="test" depends="buildtest" description="Run the tests"> <taskdef resource="testngtasks" classpath="${testng.jar}" /> - <testng outputdir="${basedir}/test-report"> - <classpath path="${test.dir}" /> - <classpath path="${bootstrap.dir}" /> - <classpath refid="build.classpath" /> - <xmlfileset dir="${test.dir}" includes="*Test.xml" /> - </testng> + <path id="test.path"> + <path path="${test.dir}" /> + <fileset dir="${lib.dir}/test"> + <include name="*.jar" /> + </fileset> + <path path="${bootstrap.dir}" /> + <path refid="build.classpath" /> + </path> + <testng outputdir="${basedir}/test-report"> + <classpath refid="test.path" /> + <xmlfileset dir="${test.dir}" includes="*Test.xml" /> + </testng> </target> <target name="freshen" description="grab fresh icefaces jars"> Modified: branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml 2008-03-24 17:35:22 UTC (rev 7680) +++ branches/Seam_2_0/seam-gen/icefaces/build-scripts/build.xml 2008-03-24 21:03:57 UTC (rev 7681) @@ -302,12 +302,18 @@ <target name="test" depends="buildtest" description="Run the tests"> <taskdef resource="testngtasks" classpath="${testng.jar}" /> - <testng outputdir="${basedir}/test-report"> - <classpath path="${test.dir}" /> - <classpath path="${bootstrap.dir}" /> - <classpath refid="build.classpath" /> - <xmlfileset dir="${test.dir}" includes="*Test.xml" /> - </testng> + <path id="test.path"> + <path path="${test.dir}" /> + <fileset dir="${lib.dir}/test"> + <include name="*.jar" /> + </fileset> + <path path="${bootstrap.dir}" /> + <path refid="build.classpath" /> + </path> + <testng outputdir="${basedir}/test-report"> + <classpath refid="test.path" /> + <xmlfileset dir="${test.dir}" includes="*Test.xml" /> + </testng> </target> <target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files"> Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-03-24 17:35:22 UTC (rev 7680) +++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-03-24 21:03:57 UTC (rev 7681) @@ -337,12 +337,18 @@ <target name="test" depends="buildtest" description="Run the tests"> <taskdef resource="testngtasks" classpath="${testng.jar}" /> - <testng outputdir="${basedir}/test-report"> - <classpath path="${test.dir}" /> - <classpath path="${bootstrap.dir}" /> - <classpath refid="build.classpath" /> - <xmlfileset dir="${test.dir}" includes="*Test.xml" /> - </testng> + <path id="test.path"> + <path path="${test.dir}" /> + <fileset dir="${lib.dir}/test"> + <include name="*.jar" /> + </fileset> + <path path="${bootstrap.dir}" /> + <path refid="build.classpath" /> + </path> + <testng outputdir="${basedir}/test-report"> + <classpath refid="test.path" /> + <xmlfileset dir="${test.dir}" includes="*Test.xml" /> + </testng> </target> <target name="freshen" description="grab fresh icefaces jars"> Modified: trunk/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-03-24 17:35:22 UTC (rev 7680) +++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-03-24 21:03:57 UTC (rev 7681) @@ -302,12 +302,18 @@ <target name="test" depends="buildtest" description="Run the tests"> <taskdef resource="testngtasks" classpath="${testng.jar}" /> - <testng outputdir="${basedir}/test-report"> - <classpath path="${test.dir}" /> - <classpath path="${bootstrap.dir}" /> - <classpath refid="build.classpath" /> - <xmlfileset dir="${test.dir}" includes="*Test.xml" /> - </testng> + <path id="test.path"> + <path path="${test.dir}" /> + <fileset dir="${lib.dir}/test"> + <include name="*.jar" /> + </fileset> + <path path="${bootstrap.dir}" /> + <path refid="build.classpath" /> + </path> + <testng outputdir="${basedir}/test-report"> + <classpath refid="test.path" /> + <xmlfileset dir="${test.dir}" includes="*Test.xml" /> + </testng> </target> <target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files">