[jboss-cvs] JBossAS SVN: r63347 - trunk/build.

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

Author: heiko.braun at jboss.com
Date: 2007-06-05 09:49:50 -0400 (Tue, 05 Jun 2007)
New Revision: 63347

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
Move to jbossws-snapshot (fixes the tool script distribution)

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-06-05 12:42:47 UTC (rev 63346)
+++ trunk/build/build-distr.xml	2007-06-05 13:49:50 UTC (rev 63347)
@@ -1702,6 +1702,7 @@
       <fileset dir="${sun.jaxb.lib}">
         <include name="jaxb-api.jar"/>
         <include name="jaxb-impl.jar"/>
+	<include name="jaxb-xjc.jar"/>
       </fileset>
       <fileset dir="${stax.api.lib}">
         <include name="stax-api.jar"/>
@@ -1765,6 +1766,10 @@
         <include name="jaxb-impl.jar"/>
         <include name="jaxb-xjc.jar"/>
       </fileset>
+      <fileset dir="${sun.jaxws.lib}">
+        <include name="jaxws-tools.jar"/>
+        <include name="jaxws-rt.jar"/>
+      </fileset>
       <fileset dir="${jboss.jbossws.spi.lib}">
         <include name="jbossws-spi.jar"/>
       </fileset>
@@ -1837,18 +1842,23 @@
     <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-native.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws-native.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
+    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
+    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
 
-    <!-- Install jbossws tools 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.spi.lib}/jbossws-spi-scripts.zip">
+      <patternset>
         <include name="wsprovide.*"/>
         <include name="wsconsume.*"/>
-        <include name="wsrunclient.*"/>
       </patternset>
     </unzip>
+
     <chmod perm="+x">
       <fileset dir ="${install.bin}">
         <include name="wstools.sh"/>
@@ -1857,7 +1867,6 @@
         <include name="wsrunclient.sh"/>
       </fileset>
     </chmod>
-     -->
     
   </target>
   </project>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-06-05 12:42:47 UTC (rev 63346)
+++ trunk/build/build-thirdparty.xml	2007-06-05 13:49:50 UTC (rev 63347)
@@ -95,7 +95,7 @@
       <componentref name="jboss/jboss-javaee" version="5.0.0-SNAPSHOT"/>
       <componentref name="jboss/jboss-jaspi-api" version="1.0-SNAPSHOT"/>
       <componentref name="jboss/jbossxb" version="2.0.0.CR2"/>
-      <componentref name="jboss/jbossws-native50" version="2.1.0.Beta1"/>
+      <componentref name="jboss/jbossws-native50" version="snapshot"/>
       <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"/>