[jboss-cvs] JBossAS SVN: r71777 - trunk/webservices.

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

Author: thomas.diesler at jboss.com
Date: 2008-04-08 04:04:17 -0400 (Tue, 08 Apr 2008)
New Revision: 71777

Modified:
   trunk/webservices/build.xml
Log:
Delegate building of jbossws.sar to jbossws build macro

Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml	2008-04-08 06:21:22 UTC (rev 71776)
+++ trunk/webservices/build.xml	2008-04-08 08:04:17 UTC (rev 71777)
@@ -143,17 +143,6 @@
   -->
   <target name="module-jars" depends="compile">
 
-    <!-- Concat jbossws-beans.xml -->
-    <concat destfile="${build.resources}/jbossws-beans.xml">
-      <header trimleading="yes">
-        &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt;
-      </header>
-      <fileset file="${jboss.jbossws.resources}/jbossws-native-config.xml"/>
-      <footer trimleading="yes">
-        &lt;/deployment&gt;
-      </footer>
-    </concat>
-    
     <!-- Build jbossws-jboss50.jar -->
     <jar jarfile="${build.lib}/jbossws-jboss50.jar" manifest="${build.etc}/default.mf">
       <fileset dir="${build.classes}" />
@@ -176,31 +165,6 @@
       </fileset>
     </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="${build.resources}">
-        <include name="jbossws-beans.xml"/>
-      </metainf>
-    </jar>
-    
   </target>
 
   <!-- ================================================================== -->
@@ -212,10 +176,9 @@
   -->
   <target name="deploy" depends="module-jars">
 
-
     <!-- Build jbossws-native50.deployer -->
-    <unzip dest="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer" src="${build.lib}/jbossws-jboss50-deployer.zip">
-    </unzip>
+    <property name="jbossws.deployer.dir" value="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer"/>
+    <unzip dest="${jbossws.deployer.dir}" src="${build.lib}/jbossws-jboss50-deployer.zip"/>
     
   </target>
 </project>