[jbossws-commits] JBossWS SVN: r4150 - in trunk/integration: sunri/src/test and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-08-03 06:25:40 -0400 (Fri, 03 Aug 2007)
New Revision: 4150

Added:
   trunk/integration/sunri/src/test/etc/
   trunk/integration/xfire/src/test/etc/
Modified:
   trunk/integration/sunri/ant-import/build-testsuite.xml
   trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Fix test build xfire,sunri

Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml	2007-08-03 10:15:38 UTC (rev 4149)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml	2007-08-03 10:25:40 UTC (rev 4150)
@@ -11,11 +11,8 @@
 <project>
   
   <property name="tests.output.dir" value="${int.sunri.dir}/output/tests"/>
-  <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
   
-  <property name="tests.dir" value="${testsuite.dir}/src"/>
-  <property name="tests.java.dir" value="${tests.dir}/java"/>
-  <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+  <import file="${build.dir}/ant-import/build-testsuite.xml"/>
   
   <!-- Define excludesfile -->
   <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -59,7 +56,24 @@
   <!-- ================================================================== -->
 
   <target name="tests-compile" depends="tests-init" description="Compile sources">
-    <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/>
+		<macro-compile-classes srcdir="${int.sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+		<macro-compile-classes srcdir="${int.sunri.dir}/src/test/java" excludesfile="${excludesfile}"/>
   </target>
 
+  <!-- ================================================================== -->
+  <!-- Building                                                           -->
+  <!-- ================================================================== -->
+  
+  <!-- Copy resources -->
+  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+		<macro-copy-resources srcdir="${int.sunri.dir}/src/test-framework"/>
+		<macro-copy-resources srcdir="${int.sunri.dir}/src/test"/>
+  </target>
+  
+  <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+		<ant antfile="${int.sunri.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+  </target>
+  
+  <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+  
 </project>

Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml	2007-08-03 10:15:38 UTC (rev 4149)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml	2007-08-03 10:25:40 UTC (rev 4150)
@@ -11,11 +11,8 @@
 <project>
   
   <property name="tests.output.dir" value="${int.xfire.dir}/output/tests"/>
-  <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
   
-  <property name="tests.dir" value="${testsuite.dir}/src"/>
-  <property name="tests.java.dir" value="${tests.dir}/java"/>
-  <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+  <import file="${build.dir}/ant-import/build-testsuite.xml"/>
   
   <!-- Define excludesfile -->
   <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -55,7 +52,24 @@
   <!-- ================================================================== -->
 
   <target name="tests-compile" depends="tests-init" description="Compile sources">
-    <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/>
+		<macro-compile-classes srcdir="${int.xfire.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+		<macro-compile-classes srcdir="${int.xfire.dir}/src/test/java" excludesfile="${excludesfile}"/>
   </target>
 
+  <!-- ================================================================== -->
+  <!-- Building                                                           -->
+  <!-- ================================================================== -->
+  
+  <!-- Copy resources -->
+  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+		<macro-copy-resources srcdir="${int.xfire.dir}/src/test-framework"/>
+		<macro-copy-resources srcdir="${int.xfire.dir}/src/test"/>
+  </target>
+  
+  <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+		<ant antfile="${int.xfire.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+  </target>
+  
+  <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+  
 </project>