[jboss-cvs] JBossAS SVN: r65757 - in branches/Branch_4_2: tools/etc/buildmagic and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2007-10-02 09:34:57 -0400 (Tue, 02 Oct 2007)
New Revision: 65757

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/tools/etc/buildmagic/modules.ent
   branches/Branch_4_2/tools/etc/buildmagic/modules.xml
Log:
Use jbossws-jboss42.jar from module webservices

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-10-02 13:17:09 UTC (rev 65756)
+++ branches/Branch_4_2/build/build-distr.xml	2007-10-02 13:34:57 UTC (rev 65757)
@@ -1284,6 +1284,14 @@
       </fileset>
     </copy>
 
+    <!-- Copy the generated libraries -->
+    <mkdir dir="${install.all.lib}"/>
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${_module.output}/lib">
+        <include name="jbossws-jboss42.jar"/>
+      </fileset>
+    </copy>
+	  
   </target>
 
   <target name="_module-webservices-all" depends="_module-webservices-most">
@@ -1622,6 +1630,7 @@
     <!-- Install JBossWS -->
     <mkdir dir="${install.all.deploy}/jbossws.sar"/>
     <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native42.lib}/jbossws-native42.sar"/>
+    <delete file="${install.all.deploy}/jbossws.sar/jbossws-jboss42.jar"/>
 
     <!-- This is executed last, so make executable all bin/*.sh scripts -->
     <chmod perm="+x">

Modified: branches/Branch_4_2/tools/etc/buildmagic/modules.ent
===================================================================
--- branches/Branch_4_2/tools/etc/buildmagic/modules.ent	2007-10-02 13:17:09 UTC (rev 65756)
+++ branches/Branch_4_2/tools/etc/buildmagic/modules.ent	2007-10-02 13:34:57 UTC (rev 65757)
@@ -177,10 +177,10 @@
     <pathelement path="${jboss.varia.root}/classes"/>
   </path>
 
-  <!-- Webservice -->
-  <property name="jboss.webservice.root" value="${project.root}/webservice/output"/>
-  <property name="jboss.webservice.lib" value="${jboss.webservice.root}/lib"/>
-  <path id="jboss.webservice.classpath" />
+  <!-- Webservices -->
+  <property name="jboss.webservices.root" value="${project.root}/webservices/output"/>
+  <property name="jboss.webservices.lib" value="${jboss.webservices.root}/lib"/>
+  <path id="jboss.webservices.classpath" />
 
   <!-- Hibernate2 integration module -->
   <property name="jboss.hibernate.root" value="${project.root}/hibernate-int/output"/>

Modified: branches/Branch_4_2/tools/etc/buildmagic/modules.xml
===================================================================
--- branches/Branch_4_2/tools/etc/buildmagic/modules.xml	2007-10-02 13:17:09 UTC (rev 65756)
+++ branches/Branch_4_2/tools/etc/buildmagic/modules.xml	2007-10-02 13:34:57 UTC (rev 65757)
@@ -167,12 +167,12 @@
     <pathelement path="${jboss.varia.root}/classes"/>
   </path>
 
-  <!-- Webservice -->
-  <property name="jboss.webservice.root" value="${project.root}/webservice/output"/>
-  <property name="jboss.webservice.lib" value="${jboss.webservice.root}/lib"/>
-  <path id="jboss.webservice.classpath">
-    <pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/>
-    <pathelement path="${jboss.webservice.lib}/jboss-ws4ee.jar"/>
+  <!-- webservices -->
+  <property name="jboss.webservices.root" value="${project.root}/webservices/output"/>
+  <property name="jboss.webservices.lib" value="${jboss.webservices.root}/lib"/>
+  <path id="jboss.webservices.classpath">
+    <pathelement path="${jboss.webservices.lib}/jboss-ws4ee-client.jar"/>
+    <pathelement path="${jboss.webservices.lib}/jboss-ws4ee.jar"/>
   </path>
 
   <!-- Hibernate2 integration module -->