[seam-commits] Seam SVN: r11547 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directories.

[seam-commits at lists.jboss.org]

Author: jharting
Date: 2009-10-06 04:39:38 -0400 (Tue, 06 Oct 2009)
New Revision: 11547

Removed:
   branches/community/Seam_2_2/src/test/ftest/lib/
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/seamgen/build.xml
Log:
Moved folder for functional test dependencies to ${seam.dir}/lib/ftest

Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml	2009-10-06 07:23:25 UTC (rev 11546)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml	2009-10-06 08:39:38 UTC (rev 11547)
@@ -33,7 +33,7 @@
 	<property name="ftest.dir" value="${seam.dir}/src/test/ftest" />
 
 	<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
-	<property name="lib.dir" value="${ftest.dir}/lib" />
+	<property name="lib.dir" value="${seam.dir}/lib/ftest" />
 	<property name="log.dir" value="${ftest.dir}/log" />
 
 	<!-- Build resources -->

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-06 07:23:25 UTC (rev 11546)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml	2009-10-06 08:39:38 UTC (rev 11547)
@@ -34,7 +34,7 @@
 	<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="ftest.lib.dir" value="${seam.dir}/lib/ftest" />
 	<property name="log.dir" value="log" />
 	<property name="test.report.dir" value="test-report" />
 
@@ -258,7 +258,7 @@
 	</target>
 	
 	<!-- Target for obtaining htmlunit  -->
-	<target name="copy.htmlunit" if="depends.htmlunit">
+	<target name="copy.htmlunit" if="depends.htmlunit" unless="copy.htmlunit.done">
 		<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"/>
@@ -277,9 +277,10 @@
 			<dependency groupId="apache-xalan" artifactId="serializer" version="j_2.7.0"/>
 			<dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/>
 		</copyInlineDependencies>
+		<property name="copy.htmlunit.done" value="true" />
 	</target>
 	
-	<target name="copy.selenium">
+	<target name="copy.selenium" unless="copy.selenium.done">
 		<copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
 			<dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.1" classifier="standalone">
 				<exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" />
@@ -291,6 +292,7 @@
 				<exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" />
 			</dependency>
 		</copyInlineDependencies>
+		<property name="copy.selenium.done" value="true" />
 	</target>
 
 </project>

Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml	2009-10-06 07:23:25 UTC (rev 11546)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml	2009-10-06 08:39:38 UTC (rev 11547)
@@ -35,7 +35,7 @@
 	<property name="seamgen.build.dir" value="${ftest.dir}/seamgen/build" />
 	<property name="classes.dir" value="${seamgen.build.dir}/classes" />
 	<property name="test.output.dir" value="${seam.dir}/test-output" />
-	<property name="ftest.lib.dir" value="${ftest.dir}/lib" />
+	<property name="ftest.lib.dir" value="${seam.dir}/lib/ftest" />
 	<property name="root.lib.dir" value="${seam.dir}/lib" />
 	<property name="ftest.config.location" value="src/test/ftest/ftest.properties"/>
 
@@ -66,6 +66,7 @@
 		<delete dir="${test.output.dir}" />
 		<delete dir="${report.dir}" />
 		<delete dir="${log.dir}" />
+		<delete dir="${ftest.lib.dir}" />
 	</target>
 
 	<target name="copy.selenium">