[jboss-cvs] JBossAS SVN: r70514 - in trunk: webservices and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2008-03-06 15:56:23 -0500 (Thu, 06 Mar 2008)
New Revision: 70514

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
   trunk/webservices/build.xml
Log:
Move the build of jbossws.sar to AS50

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-03-06 20:49:40 UTC (rev 70513)
+++ trunk/build/build-distr.xml	2008-03-06 20:56:23 UTC (rev 70514)
@@ -1572,9 +1572,19 @@
     <property name="_module.name" value="webservices" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
-    <!-- Install jbossws.deployer -->
-    <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
-    <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
+    <!-- Install jbossws tools shell scripts -->
+    <copy todir="${install.bin}">
+      <fileset dir="${jboss.jbossws.root}/bin">
+        <include name="wstools.*"/>
+        <include name="wsrunclient.*"/>
+      </fileset>
+    </copy>
+    <unzip dest="${install.bin}" src="${jboss.jbossws.framework.lib}/jbossws-framework-scripts.zip">
+      <patternset>
+        <include name="wsprovide.*"/>
+        <include name="wsconsume.*"/>
+      </patternset>
+    </unzip>
 
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
@@ -1583,7 +1593,16 @@
         <include name="jbossws-jboss50.jar"/>
       </fileset>
     </copy>
+    
+    <!-- Install jbossws.deployer -->
+    <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
+    <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
 
+    <!-- Install jbossws.sar -->
+    <mkdir dir="${install.all.deploy}/jbossws.sar/jbossws-context.war"/>
+    <unjar dest="${install.all.deploy}/jbossws.sar" src="${_module.output}/lib/jbossws.sar"/>
+    <unjar dest="${install.all.deploy}/jbossws.sar/jbossws-context.war" src="${jboss.jbossws.lib}/jbossws-context.war"/>
+
   </target>
 
   <target name="_module-webservices-all" depends="_module-webservices-most">
@@ -1996,30 +2015,9 @@
     </copy>
     <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
 
-    <!-- Install jbossws.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">
-      <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="wsprovide.*"/>
-        <include name="wsconsume.*"/>
-      </patternset>
-    </unzip>
-
     <chmod perm="+x">
       <fileset dir="${install.bin}">
-        <include name="wstools.sh"/>
-        <include name="wsprovide.sh"/>
-        <include name="wsconsume.sh"/>
-        <include name="wsrunclient.sh"/>
+        <include name="*.sh"/>
       </fileset>
     </chmod>
 

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2008-03-06 20:49:40 UTC (rev 70513)
+++ trunk/build/build-thirdparty.xml	2008-03-06 20:56:23 UTC (rev 70514)
@@ -107,7 +107,7 @@
     <componentref name="jboss/jbosssx-client" version="2.0.2.Beta4"/>
     <componentref name="jboss/jbossts" version="4.3.0.BETA2"/>
     <componentref name="jboss/jboss-vfs" version="2.0.0.snapshot"/>
-    <componentref name="jboss/jbossws-native50" version="2.0.3.GA"/>
+    <componentref name="jboss/jbossws-native50" version="snapshot"/>
     <componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
     <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
     <componentref name="jboss/jnp-client" version="5.0.0.Beta4"/>

Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml	2008-03-06 20:49:40 UTC (rev 70513)
+++ trunk/webservices/build.xml	2008-03-06 20:56:23 UTC (rev 70514)
@@ -154,10 +154,10 @@
       <fileset dir="${build.lib}">
         <include name="jbossws-jboss50.jar"/>
       </fileset>
-      <fileset dir="${project.thirdparty}/jboss/jbossws-common/lib">
+      <fileset dir="${jboss.jbossws.common.lib}">
         <include name="jbossws-common.jar"/>
       </fileset>
-      <fileset dir="${project.thirdparty}/jboss/jbossws-framework/lib">
+      <fileset dir="${jboss.jbossws.framework.lib}">
         <include name="jbossws-framework.jar"/>
       </fileset>
       <fileset dir="${build.resources}/jbossws-jboss50.deployer">
@@ -165,12 +165,31 @@
       </fileset>
     </zip>
     
-    <!-- Build jbossws50-src.zip 
-    <zip zipfile="${build.lib}/jbossws-jboss50-src.zip" >
-      <fileset dir="${jbws50.java.dir}"/>
-    </zip>
-	-->
-	  
+    <!-- Build jbossws.sar -->
+    <jar jarfile="${build.lib}/jbossws.sar">
+      <fileset dir="${jboss.jbossws.lib}">
+        <include name="jbossws-core.jar"/>
+      </fileset>
+      <fileset dir="${wscommons.policy.lib}">
+        <include name="policy.jar"/>
+      </fileset>
+      <fileset dir="${ibm.wsdl4j.lib}">
+        <include name="wsdl4j.jar"/>
+      </fileset>
+      <fileset dir="${apache.xmlsec.lib}">
+        <include name="xmlsec.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jaxbintros.lib}">
+        <include name="jboss-jaxb-intros.jar"/>
+      </fileset>
+      <metainf dir="${jboss.jbossws.resources}">
+        <include name="standard-*-config.xml"/>
+      </metainf>
+      <metainf dir="${jboss.jbossws.native50.resources}">
+        <include name="jbossws-beans.xml"/>
+      </metainf>
+    </jar>
+    
   </target>
 
   <!-- ================================================================== -->