[jboss-cvs] JBoss Messaging SVN: r6417 - in trunk/examples/jms/automatic-failover: server0 and 2 other directories.

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

Author: timfox
Date: 2009-04-14 07:23:25 -0400 (Tue, 14 Apr 2009)
New Revision: 6417

Modified:
   trunk/examples/jms/automatic-failover/build.xml
   trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
   trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
   trunk/examples/jms/automatic-failover/src/org/jboss/jms/example/AutomaticFailoverExample.java
Log:
fix automatic failove example and some other tweaks

Modified: trunk/examples/jms/automatic-failover/build.xml
===================================================================
--- trunk/examples/jms/automatic-failover/build.xml	2009-04-14 09:45:21 UTC (rev 6416)
+++ trunk/examples/jms/automatic-failover/build.xml	2009-04-14 11:23:25 UTC (rev 6417)
@@ -32,18 +32,27 @@
 
    <import file="../common/build.xml"/>
 
-   <target name="run">
+   <target name="run" depends="delete-files">
       <antcall target="runExample">
          <param name="example.classname" value="org.jboss.jms.example.AutomaticFailoverExample"/>
          <param name="jbm.example.beans.file" value="server0 server1"/>
       </antcall>
    </target>
 
-   <target name="runRemote">
+   <target name="runRemote" depends="delete-files">
       <antcall target="runExample">
          <param name="example.classname" value="org.jboss.jms.example.AutomaticFailoverExample"/>
          <param name="jbm.example.runServer" value="false"/>
       </antcall>
    </target>
+   
+   <target name="delete-files">
+      <delete file="./server1/KILL_ME"/>
+      <!-- Need to delete the server data dirs before each run since after failover cannot just rerun test since backup is now live -->
+      <delete dir="./server0/data"/>
+      <delete dir="./server0/logs"/>
+      <delete dir="./server1/data"/>
+      <delete dir="./server1/logs"/>
+   </target>
 
 </project>

Modified: trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-jms.xml	2009-04-14 09:45:21 UTC (rev 6416)
+++ trunk/examples/jms/automatic-failover/server0/jbm-jms.xml	2009-04-14 11:23:25 UTC (rev 6417)
@@ -15,4 +15,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</deployment>

Modified: trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-jms.xml	2009-04-14 09:45:21 UTC (rev 6416)
+++ trunk/examples/jms/automatic-failover/server1/jbm-jms.xml	2009-04-14 11:23:25 UTC (rev 6417)
@@ -15,4 +15,4 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-</deployment>
\ No newline at end of file
+</deployment>

Modified: trunk/examples/jms/automatic-failover/src/org/jboss/jms/example/AutomaticFailoverExample.java
===================================================================
--- trunk/examples/jms/automatic-failover/src/org/jboss/jms/example/AutomaticFailoverExample.java	2009-04-14 09:45:21 UTC (rev 6416)
+++ trunk/examples/jms/automatic-failover/src/org/jboss/jms/example/AutomaticFailoverExample.java	2009-04-14 11:23:25 UTC (rev 6417)
@@ -90,7 +90,7 @@
 
          // We now cause the server to crash
 
-         //killServer(1);
+         killServer(1);
          
          // Step 14.