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

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

Author: bstansberry at jboss.com
Date: 2008-01-08 19:18:54 -0500 (Tue, 08 Jan 2008)
New Revision: 68705

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
[JBAS-5029] Integrate jboss-ha-server-api.jar

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-01-09 00:09:23 UTC (rev 68704)
+++ trunk/build/build-distr.xml	2008-01-09 00:18:54 UTC (rev 68705)
@@ -1285,7 +1285,11 @@
     <!-- Use the all war deployers descriptor -->
     <copy tofile="${install.server}/all/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
       file="${project.root}/${_module.name}/src/resources/war-deployers-all-beans.xml" overwrite="true"/>
-
+  	 <!--
+    <copy tofile="${install.server}/all/deployers/war-clustering-deployers-beans.xml"
+      file="${project.root}/${_module.name}/src/resources/war-clustering-deployers-beans.xml" overwrite="true"/>
+    -->
+  	
     <!-- Copy the ROOT.war -->
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/deploy">
@@ -1894,7 +1898,7 @@
       <fileset dir="${jboss.serialization.lib}">
         <include name="jboss-serialization.jar"/>
       </fileset>
-      <fileset dir="${jboss.ha.lib}">
+      <fileset dir="${jboss.jboss.ha.client.lib}">
         <include name="jboss-ha-client.jar"/>
       </fileset>
       <fileset dir="${stax.api.lib}">
@@ -1950,9 +1954,12 @@
       <fileset dir="${jaxen.jaxen.lib}">
         <include name="jaxen.jar"/>
       </fileset>
-      <fileset dir="${jboss.ha.lib}">
+      <fileset dir="${jboss.jboss.ha.client.lib}">
         <include name="jboss-ha-client.jar"/>
       </fileset>
+      <fileset dir="${jboss.jboss.ha.server.api.lib}">
+        <include name="jboss-ha-server-api.jar"/>
+      </fileset>
       <fileset dir="${jboss.integration.lib}">
         <include name="jboss-integration.jar"/>
       </fileset>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2008-01-09 00:09:23 UTC (rev 68704)
+++ trunk/build/build-thirdparty.xml	2008-01-09 00:18:54 UTC (rev 68705)
@@ -89,12 +89,13 @@
     <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
     <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
     <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
-    <componentref name="jboss/ha" version="1.0.0.BETA1"/>
     <componentref name="jboss/integration" version="5.0.0.Beta4"/>
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jboss-ejb3-cache" version="0.11.1"/>
     <componentref name="jboss/jboss-ejb3-ext-api" version="0.1.2.Beta1"/>
     <componentref name="jboss/jboss-ejb3-impl" version="0.1.2.Beta1"/>
+    <componentref name="jboss/jboss-ha-client" version="1.0.0.BETA1"/>
+    <componentref name="jboss/jboss-ha-server-api" version="1.0.0.BETA2-SNAPSHOT"/>
     <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
     <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3Update1"/>
     <componentref name="jboss/jboss-security-spi" version="2.0.2.Beta1"/>