[jbossws-commits] JBossWS SVN: r3379 - in trunk: integration/native/ant-import and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-01 14:40:32 -0400 (Fri, 01 Jun 2007)
New Revision: 3379

Modified:
   trunk/build/ant-import/build-testsuite.xml
   trunk/integration/native/ant-import/macros-deploy-native.xml
   trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
   trunk/jbossws-core/ant-import-tests/build-testsuite.xml
Log:
Fix container integration deployment

Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml	2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/build/ant-import/build-testsuite.xml	2007-06-01 18:40:32 UTC (rev 3379)
@@ -97,7 +97,6 @@
       <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
       <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
       <pathelement location="${jboss.client}/mail.jar"/>
-      <pathelement location="${jboss.client}/jbossws-integration-tools.jar"/>
       <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
       <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
       <pathelement location="${jboss.server.lib}/servlet-api.jar"/>

Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml	2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml	2007-06-01 18:40:32 UTC (rev 3379)
@@ -124,6 +124,8 @@
 		<attribute name="thirdpartylibs"/>
 		<sequential>
 			<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+      
+			<!-- CLIENT JARS -->
 			<copy todir="${jboss42.home}/client" overwrite="true">							
 				<fileset dir="@{jbosslibs}">
 					<include name="jbossws-jboss42.jar"/>
@@ -133,7 +135,6 @@
 					<include name="jboss-jaxws.jar"/>
 					<include name="jboss-saaj.jar"/>
 					<include name="jbossws-client.jar"/>
-					<include name="jbossws-integration-tools.jar"/>
 				</fileset>
 				<fileset dir="@{thirdpartylibs}">
 					<include name="jaxb-api.jar"/>
@@ -145,7 +146,12 @@
 					<include name="policy.jar"/>
 				</fileset>
 			</copy>
+      
+  		<!-- SERVER JARS -->
 			<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">												
+				<fileset dir="@{jbosslibs}">
+					<include name="jbossws-jboss42.jar"/>
+				</fileset>
 				<fileset dir="@{corelibs}">
 					<include name="jboss-jaxrpc.jar"/>
 					<include name="jboss-jaxws.jar"/>
@@ -165,6 +171,8 @@
 		<sequential>
 			<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
 			<delete>
+        
+  			<!-- CLIENT JARS -->
 				<fileset dir="${jboss42.home}/client">
 					<include name="jaxb-api.jar"/>
 					<include name="jaxb-impl.jar"/>
@@ -175,13 +183,14 @@
 					<include name="jboss-jaxws.jar"/>
 					<include name="jboss-saaj.jar"/>
 					<include name="jbossws-client.jar"/>
-					<include name="jbossws-integration-tools.jar"/>
 					<include name="jbossws-jboss42.jar"/>					
 					<include name="policy.jar"/>
 					<include name="wsdl4j.jar"/>
           <!-- remove only, do not deploy -->
 					<include name="jbossws-wsconsume-impl.jar"/>
 				</fileset>
+        
+        <!-- SERVER JARS -->
 				<fileset dir="${jboss42.home}/lib">
           <!-- remove only, do not deploy -->
 					<include name="jbossws-integration.jar"/>

Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml	2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml	2007-06-01 18:40:32 UTC (rev 3379)
@@ -45,9 +45,6 @@
         </fileset>
       </copy>
       <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
-        <fileset dir="@{spilibs}">
-          <include name="jbossws-spi.jar"/>
-        </fileset>
         <fileset dir="@{jbosslibs}">
           <include name="jbossws-jboss50.jar"/>
         </fileset>
@@ -72,7 +69,6 @@
           <include name="jbossws-jboss50.jar"/>
         </fileset>
         <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
-          <include name="jbossws-spi.jar"/>
           <include name="jbossws-jboss50.jar"/>
         </fileset>
       </delete>
@@ -109,9 +105,6 @@
         </fileset>
       </copy>
       <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
-        <fileset dir="@{spilibs}">
-          <include name="jbossws-spi.jar"/>
-        </fileset>
         <fileset dir="@{jbosslibs}">
           <include name="jbossws-jboss42.jar"/>
         </fileset>
@@ -133,7 +126,6 @@
           <include name="jbossws-jboss42.jar"/>
         </fileset>
         <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
-          <include name="jbossws-spi.jar"/>
           <include name="jbossws-jboss42.jar"/>
         </fileset>
       </delete>

Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml	2007-06-01 18:16:07 UTC (rev 3378)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml	2007-06-01 18:40:32 UTC (rev 3379)
@@ -186,7 +186,6 @@
         <classpath location="${thirdparty.dir}/commons-logging.jar"/>
         <classpath location="${tests.output.dir}/classes"/>
         <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
-        <classpath location="${core.dir}/output/lib/jbossws-integration-tools.jar"/>
      </taskdef>
 
      <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>