[jbossws-commits] JBossWS SVN: r4705 - in stack/metro/trunk: ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-10-09 08:22:04 -0400 (Tue, 09 Oct 2007)
New Revision: 4705

Modified:
   stack/metro/trunk/ant-import/build-bin-dist.xml
   stack/metro/trunk/ant-import/build-thirdparty.xml
   stack/metro/trunk/ant-import/macros-deploy-sunri.xml
   stack/metro/trunk/build.xml
Log:
Remove dependency on jbossws-jboss42.jar

Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml	2007-10-09 11:11:11 UTC (rev 4704)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml	2007-10-09 12:22:04 UTC (rev 4705)
@@ -101,7 +101,6 @@
 				<include name="jbossws-sunri50.sar"/>
 			</fileset>
 			<fileset dir="${thirdparty.dir}">
-				<include name="jbossws-jboss42.jar"/>
         <include name="FastInfoset.jar"/>
         <include name="http.jar"/>
 				<include name="jaxb-api.jar"/>

Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml	2007-10-09 11:11:11 UTC (rev 4704)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml	2007-10-09 12:22:04 UTC (rev 4705)
@@ -46,7 +46,6 @@
     <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
-    <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
     
     <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>

Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml	2007-10-09 11:11:11 UTC (rev 4704)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml	2007-10-09 12:22:04 UTC (rev 4705)
@@ -111,7 +111,6 @@
 					<include name="jbossws-sunri-client.jar"/>
 				</fileset>
 				<fileset dir="@{thirdpartylibs}">
-					<include name="jbossws-jboss42.jar"/>
 					<include name="jaxb-api.jar"/>
 					<include name="jaxb-impl.jar"/>
 					<include name="jaxb-xjc.jar"/>
@@ -131,11 +130,6 @@
 					<include name="jaxb-impl.jar"/>
 				</fileset>
 			</copy>
-			<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
-				<fileset dir="@{thirdpartylibs}">
-					<include name="jbossws-jboss42.jar"/>
-				</fileset>
-			</copy>
 			<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
 			<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/>
 			<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
@@ -159,13 +153,8 @@
 					<include name="jsr181-api.jar"/>
 					<include name="saaj-api.jar"/>
 					<include name="saaj-impl.jar"/>
-
-					<include name="jbossws-jboss42.jar"/>					
 					<include name="jbossws-sunri-client.jar"/>
 				</fileset>
-				<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
-					<include name="jbossws-jboss42.jar"/>
-				</fileset>
 			</delete>
 			<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
 			<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>

Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml	2007-10-09 11:11:11 UTC (rev 4704)
+++ stack/metro/trunk/build.xml	2007-10-09 12:22:04 UTC (rev 4705)
@@ -212,7 +212,6 @@
         <include name="jbossws-sunri.jar"/>
       </fileset>
       <fileset dir="${thirdparty.dir}">
-        <include name="jbossws-jboss42.jar"/>
         <include name="FastInfoset.jar"/>
         <include name="http.jar"/>
         <include name="jaxb-api.jar"/>