[jboss-cvs] JBossAS SVN: r70742 - branches/Branch_4_2/build.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-03-11 11:36:32 -0400 (Tue, 11 Mar 2008)
New Revision: 70742

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
Log:
Delegate jbossws deployment to stack repository

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2008-03-11 15:13:59 UTC (rev 70741)
+++ branches/Branch_4_2/build/build-distr.xml	2008-03-11 15:36:32 UTC (rev 70742)
@@ -1289,6 +1289,13 @@
       </fileset>
     </copy>
 	  
+    <!-- Delegate to the jbossws deploy macros for stack specific deployments -->
+    <ant antfile="${jboss.jbossws.resources}/jbossws-deploy-macros.xml" target="deploy-jbossws-native42" inheritall="false">
+      <property name="resourcesdir" value="${_module.output}/resources/jbossws-jboss42.sar"/>
+      <property name="thirdpartydir" value="${project.thirdparty}"/>
+      <property name="installserver" value="${install.all}"/>
+    </ant>
+	  
   </target>
 
   <target name="_module-webservices-all" depends="_module-webservices-most">
@@ -1543,22 +1550,6 @@
        <fileset dir="${stax.api.lib}">
         <include name="stax-api.jar"/>
       </fileset>
-
-      <fileset dir="${jboss.jbossws.common.lib}">
-        <include name="jbossws-common.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.framework.lib}">
-        <include name="jbossws-framework.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.spi.lib}">
-        <include name="jbossws-spi.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.lib}">
-        <include name="jbossws-client.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-jaxws.jar"/>
-        <include name="jboss-saaj.jar"/>
-      </fileset>
     </copy>
 
     <!-- copy thirdparty items to install/all/lib -->
@@ -1579,20 +1570,6 @@
       <fileset dir="${javassist.javassist.lib}">
         <include name="javassist.jar"/>
       </fileset>
-      <fileset dir="${jboss.jbossws.common.lib}">
-        <include name="jbossws-common.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.framework.lib}">
-        <include name="jbossws-framework.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.spi.lib}">
-        <include name="jbossws-spi.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.lib}">
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-jaxws.jar"/>
-        <include name="jboss-saaj.jar"/>
-      </fileset>
       <fileset dir="${apache.httpclient.lib}">
         <include name="commons-httpclient.jar"/>
       </fileset>
@@ -1619,25 +1596,6 @@
       <fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
     </copy>
 
-    <!-- install thirdparty items to install/bin -->
-    <!-- install wstools shell scripts -->
-    <!-- Install jbossws tools shell scripts -->
-    <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
-      <patternset>
-        <include name="wstools.*"/>
-        <include name="wsrunclient.*"/>
-      </patternset>
-    </unzip>
-    <unzip dest="${install.bin}" src="${jboss.jbossws.framework.lib}/jbossws-framework-scripts.zip">
-      <patternset>
-        <include name="*.*"/>
-      </patternset>
-    </unzip>
-
-    <!-- Install JBossWS -->
-    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native42.lib}/jbossws-native42.sar"/>
-
     <!-- This is executed last, so make executable all bin/*.sh scripts -->
     <chmod perm="+x">
       <fileset dir="${install.bin}">

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2008-03-11 15:13:59 UTC (rev 70741)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2008-03-11 15:36:32 UTC (rev 70742)
@@ -83,7 +83,7 @@
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jbossts14" version="4.2.3.SP6"/>
     <componentref name="jboss/jboss-vfs" version="1.0.0.GA"/>    
-    <componentref name="jboss/jbossws-native42" version="2.0.3.GA"/>
+    <componentref name="jboss/jbossws" version="snapshot"/>
     <componentref name="jboss/jbossxb" version="1.0.0.SP1"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>