Index: build/build.xml
===================================================================
--- build/build.xml	(revision 106765)
+++ build/build.xml	(working copy)
@@ -1142,7 +1142,7 @@
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.common.lib}"/>
     <copy file="${cluster.module.output}/jboss-as-cluster.jar"
-            tofile="${install.common.lib}/jbossha.jar" filtering="no" />
+            tofile="${install.all.lib}/jbossha.jar" filtering="no" />
 
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
@@ -2045,11 +2045,6 @@
       <fileset refid="org.jboss.logmanager:jboss-logmanager-log4j:jar"/>
       <fileset refid="org.quartz-scheduler:quartz:jar"/>
       <fileset refid="jaxen:jaxen:jar"/>
-      <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
-      <fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
-      <fileset refid="org.jboss.cluster:jboss-ha-server-core:jar"/>
-      <fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
-      <fileset refid="org.jboss.cluster:jboss-ha-server-cache-jbc:jar"/>
       <fileset refid="org.jboss.integration:jboss-integration:jar"/>
       <fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
       <fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
@@ -2209,6 +2204,11 @@
       <fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
       <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
       <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-server-core:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-server-cache-jbc:jar"/>
       <mapper refid="remove-versions" />
     </copy>