[jboss-cvs] JBossAS SVN: r67142 - trunk/build.

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

Author: bstansberry at jboss.com
Date: 2007-11-15 11:20:53 -0500 (Thu, 15 Nov 2007)
New Revision: 67142

Modified:
   trunk/build/build-distr.xml
Log:
[JBAS-4976] Integrate jboss-ha-client.jar

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-11-15 16:19:36 UTC (rev 67141)
+++ trunk/build/build-distr.xml	2007-11-15 16:20:53 UTC (rev 67142)
@@ -987,7 +987,6 @@
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="jbossha.jar"/>
-        <include name="jbossmqha.jar"/>
       </fileset>
     </copy>
 
@@ -995,18 +994,10 @@
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${_module.output}/lib">
-        <include name="jbossha-client.jar"/>
-        <include name="jbossmqha.jar"/>
+        <include name="jboss-ha-legacy-client.jar"/>
       </fileset>
     </copy>
 
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${jgroups.jgroups.lib}">
-        <include name="jgroups.jar"/>
-      </fileset>
-    </copy>
-
     <!-- Default server config -->
 
     <!-- Copy the deployables -->
@@ -1915,6 +1906,9 @@
       <fileset dir="${jboss.serialization.lib}">
         <include name="jboss-serialization.jar"/>
       </fileset>
+      <fileset dir="${jboss.ha.lib}">
+        <include name="jboss-ha-client.jar"/>
+      </fileset>
       <fileset dir="${stax.api.lib}">
         <include name="stax-api.jar"/>
       </fileset>
@@ -1965,6 +1959,9 @@
       <fileset dir="${jaxen.jaxen.lib}">
         <include name="jaxen.jar"/>
       </fileset>
+      <fileset dir="${jboss.ha.lib}">
+        <include name="jboss-ha-client.jar"/>
+      </fileset>
       <fileset dir="${jboss.integration.lib}">
         <include name="jboss-integration.jar"/>
       </fileset>
@@ -1986,6 +1983,9 @@
         <include name="jboss-jaxws-ext.jar"/>
         <include name="jboss-saaj.jar"/>
       </fileset>
+      <fileset dir="${jgroups.jgroups.lib}">
+        <include name="jgroups.jar"/>
+      </fileset>
     </copy>
     <!-- Unpack the javaee dtds/schemas from jboss-metadata.jar -->
     <mkdir dir="${install.dtd}"/>