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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jul 18 10:30:42 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-07-18 10:30:41 -0400 (Wed, 18 Jul 2007)
New Revision: 64120

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
Install jbossws snapshot that supports new deployers

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-07-18 13:41:26 UTC (rev 64119)
+++ trunk/build/build-distr.xml	2007-07-18 14:30:41 UTC (rev 64120)
@@ -1735,6 +1735,18 @@
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
+      <fileset dir="${apache.logging.lib}">
+        <include name="commons-logging.jar"/>
+      </fileset>
+      <fileset dir="${apache.xmlsec.lib}">
+        <include name="xmlsec.jar"/>
+      </fileset>
+      <fileset dir="${ibm.wsdl4j.lib}">
+        <include name="wsdl4j.jar"/>
+      </fileset>
+      <fileset dir="${javassist.javassist.lib}">
+        <include name="javassist.jar"/>
+      </fileset>
       <fileset dir="${jboss.common.core.lib}">
         <exclude name="*-sources.jar"/>
       </fileset>
@@ -1750,44 +1762,26 @@
       <fileset dir="${jboss.jbossxb.lib}">
         <include name="jboss-xml-binding.jar"/>
       </fileset>
+      <fileset dir="${jboss.remoting.lib}">
+        <include name="jboss-remoting.jar"/>
+      </fileset>
       <fileset dir="${jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>
       </fileset>
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${apache.logging.lib}">
-        <include name="commons-logging.jar"/>
-      </fileset>
-      <fileset dir="${apache.xmlsec.lib}">
-        <include name="xmlsec.jar"/>
-      </fileset>
-      <fileset dir="${ibm.wsdl4j.lib}">
-        <include name="wsdl4j.jar"/>
-      </fileset>
-      <fileset dir="${javassist.javassist.lib}">
-        <include name="javassist.jar"/>
-      </fileset>
-      <fileset dir="${jboss.remoting.lib}">
-        <include name="jboss-remoting.jar"/>
-      </fileset>
       <fileset dir="${jboss.security.lib}">
         <include name="jbosssx-client.jar"/>
       </fileset>
       <fileset dir="${jboss.serialization.lib}">
         <include name="jboss-serialization.jar"/>
       </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
+      <fileset dir="${jboss.integration.lib}">
+        <include name="jboss-integration.jar"/>
       </fileset>
-      <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
-        <include name="jaxb-impl.jar"/>
-        <include name="jaxb-xjc.jar"/>
+      <fileset dir="${jboss.jboss.jaspi.api.lib}">
+        <include name="jboss-jaspi-api.jar"/>
       </fileset>
-      <fileset dir="${sun.jaxws.lib}">
-        <include name="jaxws-tools.jar"/>
-        <include name="jaxws-rt.jar"/>
+      <fileset dir="${jboss.jboss.javaee.lib}">
+        <include name="jboss-javaee.jar"/>
       </fileset>
       <fileset dir="${jboss.jbossws.spi.lib}">
         <include name="jbossws-spi.jar"/>
@@ -1804,18 +1798,27 @@
       <fileset dir="${stax.api.lib}">
         <include name="stax-api.jar"/>
       </fileset>
+      <fileset dir="${sun.jaf.lib}">
+        <include name="activation.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="${sun.jaxws.lib}">
+        <include name="jaxws-tools.jar"/>
+        <include name="jaxws-rt.jar"/>
+      </fileset>
       <fileset dir="${woodstox.woodstox.lib}">
         <include name="wstx.jar"/>
       </fileset>
-      <fileset dir="${jboss.jboss.jaspi.api.lib}">
-        <include name="jboss-jaspi-api.jar"/>
+      <fileset dir="${wscommons.policy.lib}">
+        <include name="policy.jar"/>
       </fileset>
-      <fileset dir="${jboss.jboss.javaee.lib}">
-        <include name="jboss-javaee.jar"/>
-      </fileset>
-      <fileset dir="${jboss.integration.lib}">
-        <include name="jboss-integration.jar"/>
-      </fileset>
     </copy>
 
     <!-- Copy thirdparty code to lib/endorsed -->
@@ -1840,21 +1843,18 @@
       <fileset dir="${jaxen.jaxen.lib}">
         <include name="jaxen.jar"/>
       </fileset>
+      <fileset dir="${jboss.integration.lib}">
+        <include name="jboss-integration.jar"/>
+      </fileset>
       <fileset dir="${jboss.jboss.jaspi.api.lib}">
         <include name="jboss-jaspi-api.jar"/>
       </fileset>
       <fileset dir="${jboss.jboss.javaee.lib}">
         <include name="jboss-javaee.jar"/>
       </fileset>
-      <fileset dir="${jboss.integration.lib}">
-        <include name="jboss-integration.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>
       <fileset dir="${jboss.jbossws.lib}">
         <include name="jboss-jaxrpc.jar"/>
         <include name="jboss-jaxws.jar"/>
@@ -1863,12 +1863,12 @@
     </copy>
 
     <!-- Install jbossws.deployer -->
-    <!-- TEMP REMOVED mkdir dir="${install.server}/all/deployers/jbossws.deployer"/>
-    <unzip dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.native50.lib}/jbossws-native50-deployer.zip"/-->
+    <mkdir dir="${install.server}/all/deployers/jbossws.deployer"/>
+    <unzip dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.jboss50.lib}/jbossws-jboss50-deployer.zip"/>
 
     <!-- Install jbossws.sar -->
-    <!-- TEMP REMOVED mkdir dir="${install.all.deploy}/jbossws.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws.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 -->
     <unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
@@ -1894,4 +1894,4 @@
     </chmod>
     
   </target>
-  </project>
+</project>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-07-18 13:41:26 UTC (rev 64119)
+++ trunk/build/build-thirdparty.xml	2007-07-18 14:30:41 UTC (rev 64120)
@@ -94,9 +94,8 @@
       <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" version="snapshot"/>
-      <componentref name="jboss/jbossws-spi" version="snapshot"/>
       <componentref name="jboss/jbossws-native50" version="snapshot"/>
+      <componentref name="jboss/jbossws-jboss50" version="snapshot"/>
       <componentref name="jboss/messaging" version="1.2.0.SP.snapshot.aop2beta"/>
       <componentref name="jboss/microcontainer" version="snapshot-classloader"/>
       <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/>




More information about the jboss-cvs-commits mailing list