Author: jharting Date: 2009-10-05 05:59:48 -0400 (Mon, 05 Oct 2009) New Revision: 11540 Modified: branches/community/Seam_2_2/src/test/ftest/build.xml branches/community/Seam_2_2/src/test/ftest/examples/build.xml branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml Log: JBSEAM-4430 fixed htmlunit dependency Modified: branches/community/Seam_2_2/src/test/ftest/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:36:31 UTC (rev 11539) +++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 09:59:48 UTC (rev 11540) @@ -352,38 +352,10 @@ </sequential> </macrodef> - <!-- Target for declaring needed libraries for ftest tests --> - <target name="importlibraries"> - <copyInlineDependencies id="allexamples" scope="compile" todir="${lib.dir}"> - <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/> - <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/> - <dependency groupId="org.w3c" artifactId="sac" version="1.3"/> - <dependency groupId="commons-io" artifactId="commons-io" version="1.3.1"/> - <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/> - <dependency groupId="apache-xerces" artifactId="xercesImpl" version="2.9.0"/> - <dependency groupId="commons-collections" artifactId="commons-collections" version="3.1"/> - <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/> - <dependency groupId="apache-xalan" artifactId="xalan" version="j_2.7.0"/> - <dependency groupId="commons-codec" artifactId="commons-codec" version="1.3"/> - <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/> - <dependency groupId="net.sourceforge.cssparser" artifactId="cssparser" version="0.9.5"/> - <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit-core-js" version="2.4"/> - <dependency groupId="net.sourceforge.nekohtml" artifactId="nekohtml" version="1.9.9"/> - <dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/> - <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/> - </copyInlineDependencies> - </target> - - - <macrodef name="callExample"> <attribute name="path" /> <attribute name="target" /> <sequential> - - <!-- Added for downloading libraries --> - <antcall target="importlibraries"> </antcall> - <ant dir="@{path}" target="@{target}" inheritall="false"> <property name="container" value="${container}"> </property> Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:36:31 UTC (rev 11539) +++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 09:59:48 UTC (rev 11540) @@ -31,8 +31,8 @@ <property name="ftest.dir" value="${seam.dir}/src/test/ftest" /> <property name="src.dir" value="src" /> <property name="common.src.dir" value="${ftest.dir}/src/main" /> - <property name="build.dir" value="build" /> - <property name="classes.dir" value="${build.dir}/classes" /> + <property name="local.build.dir" value="build" /> + <property name="classes.dir" value="${local.build.dir}/classes" /> <property name="test.output.dir" value="${seam.dir}/test-output" /> <property name="ftest.lib.dir" value="${ftest.dir}/lib" /> <property name="log.dir" value="log" /> @@ -56,6 +56,8 @@ <property name="functional.listener" value="org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener"/> <property name="root.lib.dir" value="${seam.dir}/lib" /> + <!-- Build resources --> + <import file="${seam.dir}/build/common.build.xml" /> <!-- common path setup --> @@ -72,7 +74,7 @@ <!-- common target definitions --> <target name="clean" description="Delete all generated files"> - <delete dir="${build.dir}" /> + <delete dir="${local.build.dir}" /> <delete dir="${test.output.dir}" /> <delete dir="${report.dir}" /> <delete dir="${log.dir}" /> @@ -82,7 +84,7 @@ <target name="build.extras" description="Build example specific files before build"> </target> - <target name="build" depends="build.common, build.extras" description="Compiles the Test"> + <target name="build" depends="build.common, build.extras, copy.htmlunit" description="Compiles the Test"> <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" /> <copy todir="${classes.dir}"> <fileset dir="${src.dir}"> @@ -252,5 +254,27 @@ <sleep seconds="3"/> </sequential> </target> + + <!-- Target for obtaining htmlunit --> + <target name="copy.htmlunit" if="depends.htmlunit"> + <copyInlineDependencies id="allexamples" scope="compile" todir="${ftest.lib.dir}"> + <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit" version="2.3"/> + <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/> + <dependency groupId="org.w3c" artifactId="sac" version="1.3"/> + <dependency groupId="commons-io" artifactId="commons-io" version="1.3.1"/> + <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/> + <dependency groupId="apache-xerces" artifactId="xercesImpl" version="2.9.0"/> + <dependency groupId="commons-collections" artifactId="commons-collections" version="3.1"/> + <dependency groupId="commons-lang" artifactId="commons-lang" version="2.3"/> + <dependency groupId="apache-xalan" artifactId="xalan" version="j_2.7.0"/> + <dependency groupId="commons-codec" artifactId="commons-codec" version="1.3"/> + <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/> + <dependency groupId="net.sourceforge.cssparser" artifactId="cssparser" version="0.9.5"/> + <dependency groupId="net.sourceforge.htmlunit" artifactId="htmlunit-core-js" version="2.4"/> + <dependency groupId="net.sourceforge.nekohtml" artifactId="nekohtml" version="1.9.9"/> + <dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/> + <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/> + </copyInlineDependencies> + </target> </project> Modified: branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml 2009-10-05 09:36:31 UTC (rev 11539) +++ branches/community/Seam_2_2/src/test/ftest/examples/ui/build.xml 2009-10-05 09:59:48 UTC (rev 11540) @@ -23,6 +23,8 @@ <project name="ui.ftest.build" basedir="." default="build"> <property name="example.name" value="ui" /> + <property name="depends.htmlunit" value="true"/> + <import file="../build.xml" /> <!-- Location of Seam -->