[jbossws-commits] JBossWS SVN: r4694 - in stack/native/branches/tdiesler/trunk: ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-10-08 12:24:35 -0400 (Mon, 08 Oct 2007)
New Revision: 4694

Modified:
   stack/native/branches/tdiesler/trunk/ant-import/build-bin-dist.xml
   stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
   stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml
   stack/native/branches/tdiesler/trunk/build.xml
   stack/native/branches/tdiesler/trunk/version.properties
Log:
Remove dependency on jbossws-jboss42

Modified: stack/native/branches/tdiesler/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/ant-import/build-bin-dist.xml	2007-10-08 14:43:53 UTC (rev 4693)
+++ stack/native/branches/tdiesler/trunk/ant-import/build-bin-dist.xml	2007-10-08 16:24:35 UTC (rev 4694)
@@ -92,7 +92,6 @@
 				<include name="jbossws-framework.jar"/>
 				<include name="jbossws-framework-scripts.zip"/>
 				<include name="jbossws-spi.jar"/>
-				<include name="jbossws-jboss42.jar"/>
 				<include name="jbossws-jboss40.jar"/>
 			</fileset>
 			<fileset dir="${core.dir}/output/lib">

Modified: stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml	2007-10-08 14:43:53 UTC (rev 4693)
+++ stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml	2007-10-08 16:24:35 UTC (rev 4694)
@@ -56,9 +56,6 @@
     <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" 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/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
 	      
     <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
     <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>

Modified: stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml	2007-10-08 14:43:53 UTC (rev 4693)
+++ stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml	2007-10-08 16:24:35 UTC (rev 4694)
@@ -141,7 +141,6 @@
                <include name="jbossws-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"/>
@@ -161,11 +160,6 @@
                <include name="jboss-xml-binding.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.sar"/>
          <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
@@ -199,7 +193,6 @@
               <include name="jboss-jaxws-ext.jar"/>
                <include name="jboss-saaj.jar"/>
                <include name="jbossws-client.jar"/>
-               <include name="jbossws-jboss42.jar"/>
                <include name="policy.jar"/>
                <include name="stax-ex.jar"/>
                <include name="streambuffer.jar"/>
@@ -217,10 +210,9 @@
                <include name="jbossws-integration.jar"/>
             </fileset>
             <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
-               <include name="jbossws-jboss42.jar"/>
                <include name="jboss-jaxrpc.jar"/>
                <include name="jboss-jaxws.jar"/>
-              <include name="jboss-jaxws-ext.jar"/>
+               <include name="jboss-jaxws-ext.jar"/>
                <include name="jboss-saaj.jar"/>
                <!-- Remove only, do not deploy -->
                <include name="jbossws-integration.jar"/>

Modified: stack/native/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/build.xml	2007-10-08 14:43:53 UTC (rev 4693)
+++ stack/native/branches/tdiesler/trunk/build.xml	2007-10-08 16:24:35 UTC (rev 4694)
@@ -331,7 +331,6 @@
         <include name="jbossws-core.jar"/>
       </fileset>
       <fileset dir="${core.dir}/thirdparty">
-        <include name="jbossws-jboss42.jar"/>
         <include name="jaxb-api.jar"/>
         <include name="jaxb-impl.jar"/>
         <include name="policy.jar"/>

Modified: stack/native/branches/tdiesler/trunk/version.properties
===================================================================
--- stack/native/branches/tdiesler/trunk/version.properties	2007-10-08 14:43:53 UTC (rev 4693)
+++ stack/native/branches/tdiesler/trunk/version.properties	2007-10-08 16:24:35 UTC (rev 4694)
@@ -28,7 +28,6 @@
 jbossws-common=1.0.0.GA
 jbossws-framework=2.0.1.GA
 jbossws-jboss40=2.0.1.GA
-jbossws-jboss42=2.0.1.GA
 
 # JBossAS-5.0
 jboss-jbossxb-jboss50=2.0.0.CR4