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

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

Author: thomas.diesler at jboss.com
Date: 2008-03-06 16:57:26 -0500 (Thu, 06 Mar 2008)
New Revision: 70520

Modified:
   trunk/build/build-thirdparty.xml
   trunk/webservices/build.xml
Log:
Remove dependency on jbossws-native50

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2008-03-06 21:43:02 UTC (rev 70519)
+++ trunk/build/build-thirdparty.xml	2008-03-06 21:57:26 UTC (rev 70520)
@@ -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="snapshot"/>
+    <componentref name="jboss/jbossws" 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 21:43:02 UTC (rev 70519)
+++ trunk/webservices/build.xml	2008-03-06 21:57:26 UTC (rev 70520)
@@ -143,6 +143,17 @@
   -->
   <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}" />
@@ -185,7 +196,7 @@
       <metainf dir="${jboss.jbossws.resources}">
         <include name="standard-*-config.xml"/>
       </metainf>
-      <metainf dir="${jboss.jbossws.native50.resources}">
+      <metainf dir="${build.resources}">
         <include name="jbossws-beans.xml"/>
       </metainf>
     </jar>