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

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

Author: thomas.diesler at jboss.com
Date: 2007-01-06 10:50:29 -0500 (Sat, 06 Jan 2007)
New Revision: 59396

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
Log:
jbossws-1.2.0.CR2

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-01-06 15:30:33 UTC (rev 59395)
+++ branches/Branch_4_2/build/build-distr.xml	2007-01-06 15:50:29 UTC (rev 59396)
@@ -1512,9 +1512,11 @@
       </patternset>
     </unjar>
 
-    <!-- create deployments from thirdparty items -->
+    <!-- Install JBossWS without dependency on EJB3 -->
     <mkdir dir="${install.all.deploy}/jbossws.sar"/>
     <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws42.sar"/>
+    <copy tofile="${install.all.deploy}/jbossws.sar/META-INF/jboss-service.xml" file="${install.all.deploy}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
+    <delete file="${install.all.deploy}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
   </target>
 
 
@@ -1637,9 +1639,10 @@
       <fileset dir="${project.root}/aspects/output/lib/jboss-aop-jdk50.deployer" />
     </copy>
 
-    <!-- unjar the jbossws.sar -->
+    <!-- Install JBossWS -->
     <mkdir dir="${install.ejb3.root}/server/default/deploy/jbossws.sar"/>
     <unjar dest="${install.ejb3.root}/server/default/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws42.sar"/>
+    <delete file="${install.ejb3.root}/server/default/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
 
      <delete includeEmptyDirs="true">
         <fileset dir="${install.ejb3.root}/server/all/deploy">
@@ -1658,9 +1661,10 @@
       <fileset dir="${project.root}/aspects/output/lib/jboss-aop-jdk50.deployer" />
     </copy>
 
-    <!-- unjar the jbossws.sar -->
+    <!-- Install JBossWS -->
     <mkdir dir="${install.ejb3.root}/server/all/deploy/jbossws.sar"/>
     <unjar dest="${install.ejb3.root}/server/all/deploy/jbossws.sar" src="${jboss.jbossws.lib}/jbossws42.sar"/>
+    <delete file="${install.ejb3.root}/server/all/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
   </target>
 
 </project>

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-01-06 15:30:33 UTC (rev 59395)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-01-06 15:50:29 UTC (rev 59396)
@@ -92,7 +92,7 @@
     <componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
     <componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
     <componentref name="jboss/jbossts14" version="4.2.3.CR2"/>
-    <componentref name="jboss/jbossws" version="1.2.0.CR1"/>
+    <componentref name="jboss/jbossws" version="1.2.0.CR2"/>
     <componentref name="jboss/jbossxb" version="snapshot"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>
     <componentref name="jboss/remoting" version="2.0.0.GA"/>