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

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

Author: jason.greene at jboss.com
Date: 2007-02-22 11:57:15 -0500 (Thu, 22 Feb 2007)
New Revision: 60796

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
Log:
Add StAX
Add JAX-WS tools jars / scripts 


Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-02-22 16:28:45 UTC (rev 60795)
+++ branches/Branch_4_2/build/build-distr.xml	2007-02-22 16:57:15 UTC (rev 60796)
@@ -1436,10 +1436,6 @@
       <fileset dir="${sun.jaf.lib}">
         <include name="activation.jar"/>
       </fileset>
-      <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
-        <include name="jaxb-impl.jar"/>
-      </fileset>
       <fileset dir="${apache.logging.lib}">
         <include name="commons-logging.jar"/>
       </fileset>
@@ -1470,11 +1466,26 @@
       <fileset dir="${jboss.jbossxb.lib}">
         <include name="jboss-xml-binding.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="${stax.api.lib}">
+        <include name="stax-api.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>
     </copy>
 
     <!-- copy thirdparty items to install/all/lib -->
@@ -1529,11 +1540,22 @@
 
     <!-- install thirdparty items to install/bin -->
     <!-- install wstools shell scripts -->
-    <unjar dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
+    <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
       <patternset>
         <include name="wstools.*"/>
+        <include name="wsconsume.*"/>
+        <include name="wsprovide.*"/>
+        <include name="wsrunclient.*"/>
       </patternset>
-    </unjar>
+    </unzip>
+    <chmod perm="+x">
+      <fileset dir ="${install.bin}">
+        <include name="wstools.sh"/>
+        <include name="wsprovide.sh"/>
+        <include name="wsconsume.sh"/>
+        <include name="wsrunclient.sh"/>
+      </fileset>
+    </chmod>
 
     <!-- Install JBossWS -->
     <mkdir dir="${install.all.deploy}/jbossws.sar"/>

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-02-22 16:28:45 UTC (rev 60795)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-02-22 16:57:15 UTC (rev 60796)
@@ -89,6 +89,7 @@
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jbossts14" version="4.2.3.CR3"/>
     <componentref name="jboss/jbossws" version="1.2.0.CR3"/>
+    <componentref name="jboss/jbossws-wsconsume-impl" version="2.0.0"/>
     <componentref name="jboss/jbossxb" version="1.0.0.CR9"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
@@ -107,6 +108,7 @@
     <componentref name="oswego-concurrent" version="1.3.4"/>
     <componentref name="quartz" version="1.5.2"/>
     <componentref name="qdox" version="1.4"/>
+    <componentref name="stax-api" version="1.0"/>
     <componentref name="sun-jaf" version="1.1"/>
     <componentref name="sun-javacc" version="3.2"/>
     <componentref name="sun-javamail" version="1.4"/>
@@ -115,6 +117,7 @@
     <componentref name="sun-jstl" version="1.2"/>
     <componentref name="sun-servlet" version="2.4"/>
     <componentref name="trove" version="1.0.2"/>
+    <componentref name="woodstox" version="3.1.1"/>
     <componentref name="xdoclet" version="1.2b3"/>
     <componentref name="xml-sax" version="2.0.x"/>