[jbossws-commits] JBossWS SVN: r3525 - in branches/jbossws-2.0/integration/native: ant-import and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-10 12:48:11 -0400 (Sun, 10 Jun 2007)
New Revision: 3525

Modified:
   branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
   branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
   branches/jbossws-2.0/integration/native/build.xml
   branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
   branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
Log:
Fix distribution targets

Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml	2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml	2007-06-10 16:48:11 UTC (rev 3525)
@@ -62,7 +62,7 @@
 		</copy>
 
 		<copy todir="${bindist.bin.dir}">
-			<fileset dir="${spi.dir}/etc">
+			<fileset dir="${spi.dir}/src/main/etc">
 				<include name="*.sh"/>
 				<include name="*.bat"/>
 			</fileset>

Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml	2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml	2007-06-10 16:48:11 UTC (rev 3525)
@@ -13,9 +13,6 @@
 
 <project>
 
-	<import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
-	<import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
-
 	<!-- ================================================================== -->
 	<!-- Deployment  JBoss50                                                -->
 	<!-- ================================================================== -->

Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml	2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/build.xml	2007-06-10 16:48:11 UTC (rev 3525)
@@ -20,6 +20,8 @@
   <import file="${int.native.dir}/ant-import/build-release.xml"/>
   <import file="${int.native.dir}/ant-import/build-testsuite.xml"/>
   <import file="${int.native.dir}/ant-import/build-thirdparty.xml"/>
+	<import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
+	<import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
   
   <!-- ================================================================== -->
   <!-- Setup                                                              -->

Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml	2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml	2007-06-10 16:48:11 UTC (rev 3525)
@@ -133,6 +133,11 @@
 
 	<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
 
+  <!-- dummy jar targets -->
+	<target name="jars-jboss50" depends="prepare"/>
+	<target name="jars-jboss42" depends="prepare"/>
+	<target name="jars-jboss40" depends="prepare"/>
+  
 	<!-- ================================================================== -->
 	<!-- Miscellaneous                                                       -->
 	<!-- ================================================================== -->

Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml	2007-06-09 17:28:37 UTC (rev 3524)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml	2007-06-10 16:48:11 UTC (rev 3525)
@@ -27,7 +27,6 @@
 				thirdpartylibs="${lib.dir}"/>
 		<macro-deploy-spi
 				spilibs="${lib.dir}"
-				spiscripts="${bin.dir}"
 				thirdpartylibs="${lib.dir}"
         jbosshome="${jboss50.home}"/>
 	</target>
@@ -54,7 +53,6 @@
 				thirdpartylibs="${lib.dir}"/>
 		<macro-deploy-spi
 				spilibs="${lib.dir}"
-				spiscripts="${bin.dir}"
 				thirdpartylibs="${lib.dir}"
         jbosshome="${jboss42.home}"/>
 	</target>
@@ -87,7 +85,6 @@
     
 		<macro-deploy-spi
 				spilibs="${lib.dir}"
-				spiscripts="${bin.dir}"
 				thirdpartylibs="${lib.dir}"
         jbosshome="${jboss40.home}"/>
 	</target>