[jboss-cvs] JBossAS SVN: r63878 - branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build.

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

Author: thomas.diesler at jboss.com
Date: 2007-07-06 12:51:45 -0400 (Fri, 06 Jul 2007)
New Revision: 63878

Modified:
   branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-distr.xml
   branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-thirdparty.xml
Log:
Install jbossws-2.0.0.GA

Modified: branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-distr.xml
===================================================================
--- branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-distr.xml	2007-07-06 16:41:10 UTC (rev 63877)
+++ branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-distr.xml	2007-07-06 16:51:45 UTC (rev 63878)
@@ -1841,28 +1841,34 @@
       <fileset dir="${jboss.serialization.lib}">
         <include name="jboss-serialization.jar"/>
       </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
-        <include name="jaxb-impl.jar"/>
-        <include name="jaxb-xjc.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>
+      <fileset dir="${jboss.jbossws.jboss50.lib}">
+        <include name="jbossws-jboss50.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossws.spi.lib}">
+        <include name="jbossws-spi.jar"/>
+      </fileset>
       <fileset dir="${stax.api.lib}">
         <include name="stax-api.jar"/>
       </fileset>
+      <fileset dir="${sun.javamail.lib}">
+        <include name="mail.jar"/>
+      </fileset>
+      <fileset dir="${sun.jaxb.lib}">
+        <include name="jaxb-api.jar"/>
+        <include name="jaxb-impl.jar"/>
+        <include name="jaxb-xjc.jar"/>
+      </fileset>
       <fileset dir="${woodstox.woodstox.lib}">
         <include name="wstx.jar"/>
       </fileset>
-      <fileset dir="${jboss.jbossws.wsconsume.impl.lib}">
-        <include name="jbossws-wsconsume-impl.jar"/>
+      <fileset dir="${wscommons.policy.lib}">
+        <include name="policy.jar"/>
       </fileset>
     </copy>
 
@@ -1889,30 +1895,29 @@
         <include name="jaxen.jar"/>
       </fileset>
       <fileset dir="${jboss.jbossws.lib}">
-        <include name="jbossws-integration.jar"/>
         <include name="jboss-jaxrpc.jar"/>
         <include name="jboss-jaxws.jar"/>
         <include name="jboss-saaj.jar"/>
       </fileset>
+      <fileset dir="${jboss.jbossws.spi.lib}">
+        <include name="jbossws-spi.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossws.jboss50.lib}">
+        <include name="jbossws-jboss50.jar"/>
+      </fileset>
     </copy>
 
     <!-- Install jbossws.deployer -->
     <mkdir dir="${install.server}/all/deployers/jbossws.deployer"/>
-    <unzip dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.jboss50.lib}/jbossws50-deployer.zip"/>
+    <unzip dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.native50.lib}/jbossws-native50-deployer.zip"/>
 
     <!-- Install jbossws.sar -->
     <mkdir dir="${install.all.deploy}/jbossws.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.jboss50.lib}/jbossws50.sar"/>
+    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
 
-    <!-- install wstools shell scripts -->
-    <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
-      <patternset>
-        <include name="wstools.*"/>
-        <include name="wsprovide.*"/>
-        <include name="wsconsume.*"/>
-        <include name="wsrunclient.*"/>
-      </patternset>
-    </unzip>
+    <!-- Install jbossws tools shell scripts -->
+    <unzip dest="${install.bin}" src="${jboss.jbossws.spi.lib}/jbossws-spi-scripts.zip"/>
+    <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-core-scripts.zip"/>
     <chmod perm="+x">
       <fileset dir ="${install.bin}">
         <include name="wstools.sh"/>

Modified: branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-thirdparty.xml	2007-07-06 16:41:10 UTC (rev 63877)
+++ branches/JBoss_5_0_0_Beta2_JBossWS_2_0/build/build-thirdparty.xml	2007-07-06 16:51:45 UTC (rev 63878)
@@ -92,8 +92,8 @@
       <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
       <componentref name="jboss/jaxr" version="1.2.0.GA"/>
       <componentref name="jboss/jbossxb" version="2.0.0.CR2"/>
-      <componentref name="jboss/jbossws-jboss50" version="1.2.1.GA"/>
-      <componentref name="jboss/jbossws-wsconsume-impl" version="2.0.0"/>
+      <componentref name="jboss/jbossws-native50" version="2.0.0.GA"/>
+      <componentref name="jboss/jbossws-jboss50" version="2.0.0.GA"/>
       <componentref name="jboss/messaging" version="1.2.0.SP.snapshot.aop2beta"/>
       <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/>
       <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/>