[jboss-cvs] JBossAS SVN: r110681 - branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/etc.

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

Author: pferraro
Date: 2011-02-15 13:31:15 -0500 (Tue, 15 Feb 2011)
New Revision: 110681

Modified:
   branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/etc/build.xml
Log:
JBPAPP-5895 Remove HAJNDI (not actually needed), but make sure we're using non-clustered deployment repository.

Modified: branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/etc/build.xml	2011-02-15 18:27:02 UTC (rev 110680)
+++ branches/JBPAPP_5_1_0_Final_HornetQ_2_2/hornetq-int/src/etc/build.xml	2011-02-15 18:31:15 UTC (rev 110681)
@@ -149,31 +149,31 @@
          <fileset dir="${jboss_home}/server/${config}">
             <include name="conf/**"/>
             <include name="data"/>
-            <include name="deploy/cluster/jboss-cache-manager.sar/**"/>
-            <include name="deploy/cluster/jgroups-channelfactory.sar/**"/>
-            <include name="deploy/cluster/farm-deployment-jboss-beans.xml"/>
-            <include name="deploy/cluster/hajndi-jboss-beans.xml"/>
-            <include name="deploy/cluster/hapartition-jboss-beans.xml"/>
-            <include name="deploy/cluster/timestamps-jboss-beans.xml"/>
             <include name="deploy/hornetq/hornetq-configuration.xml"/>
             <include name="deploy/hornetq/hornetq-jboss-beans.xml"/>
             <include name="deploy/security/**"/>
             <include name="deploy/hdscanner-jboss-beans.xml"/>
+            <include name="deploy/profileservice-jboss-beans.xml"/>
+            <include name="deploy/remoting-jboss-beans.xml"/>
             <include name="deploy/vfs-jboss-beans.xml"/>
             <include name="deployers/logbridge-jboss-beans.xml"/>
             <include name="deployers/security-deployer-jboss-beans.xml"/>
             <include name="deployers/hornetq-deployers-jboss-beans.xml"/>
-            <include name="farm/**"/>
-            <include name="lib/jbosscache-core.jar"/>
-            <include name="lib/jbosscache-pojo.jar"/>
-            <include name="lib/jgroups.jar"/>
+            <include name="lib"/>
          </fileset>
       </copy>
       <copy todir="${jboss_home}/server/${backup.config}/deploy/hornetq">
          <fileset dir="${jboss_home}/server/${config}/deploy/jms-ra.rar">
-           <include name="hornetq-ra.jar"/>
+            <include name="hornetq-ra.jar"/>
          </fileset>
       </copy>
+      <!-- Use non-clustered profile service beans (from default profile) -->
+      <copy todir="${jboss_home}/server/${backup.config}/conf/bootstrap" overwrite="true">
+         <fileset dir="${jboss_home}/server/default/conf/bootstrap">
+            <include name="profile.xml"/>
+         </fileset>
+      </copy>
+      <!-- Update HornetQ configuration to enable backup mode -->
       <replace file="${jboss_home}/server/${backup.config}/deploy/hornetq/hornetq-configuration.xml">
          <replacetoken><![CDATA[<name>HornetQ.main.config</name>]]></replacetoken>
          <replacevalue><![CDATA[<name>HornetQ.main.config</name>
@@ -181,9 +181,15 @@
    <backup>true</backup>
    <allow-failback>true</allow-failback>]]></replacevalue>
       </replace>
+      <!-- Disable HornetQRAService -->
       <replace file="${jboss_home}/server/${backup.config}/deploy/hornetq/hornetq-jboss-beans.xml">
-         <replacetoken><![CDATA[<bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService">]]></replacetoken>
-         <replacevalue><![CDATA[<bean name="HornetQRAService" class="org.hornetq.ra.HornetQRAService" mode="Disabled">]]></replacevalue>
+         <replacetoken>bean name="HornetQRAService"</replacetoken>
+         <replacevalue>bean name="HornetQRAService" mode="Disabled"</replacevalue>
       </replace>
+      <!-- Remove dependency on TransactionManager -->
+      <replace file="${jboss_home}/server/${backup.config}/deploy/remoting-jboss-beans.xml">
+         <replacetoken><![CDATA[<depends>TransactionManager</depends>]]></replacetoken>
+         <replacevalue><![CDATA[<!--depends>TransactionManager</depends-->]]></replacevalue>
+      </replace>
    </target>
 </project>