[jboss-svn-commits] JBL Code SVN: r37149 - in labs/jbosstm/trunk/ArjunaJTA/examples/object_store: src/main/java/org/jboss/narayana/jta/examples and 1 other directory.

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

Author: mmusgrov
Date: 2011-06-24 06:01:02 -0400 (Fri, 24 Jun 2011)
New Revision: 37149

Modified:
   labs/jbosstm/trunk/ArjunaJTA/examples/object_store/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/examples/object_store/readme
   labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java
Log:
[JBTM-854] Re-enable the Hornetq Object Store example

Modified: labs/jbosstm/trunk/ArjunaJTA/examples/object_store/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/object_store/pom.xml	2011-06-24 09:41:42 UTC (rev 37148)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/object_store/pom.xml	2011-06-24 10:01:02 UTC (rev 37149)
@@ -17,19 +17,4 @@
 	<packaging>jar</packaging>
 	<name>Configuring the Object Store</name>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- temporarily disable the Hornetq store test - it seems to hang -->
-                    <excludes>
-                        <exclude>**/HornetqStoreExample.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/examples/object_store/readme
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/object_store/readme	2011-06-24 09:41:42 UTC (rev 37148)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/object_store/readme	2011-06-24 10:01:02 UTC (rev 37149)
@@ -13,5 +13,3 @@
 	To run an example use the maven java exec plugin. For example to run the first example:
 
 	mvn -e exec:java -Dexec.mainClass=org.jboss.narayana.jta.examples.VolatileStoreExample
-
-WARNING: I've disabled the hornetq store example temporarily - it seems to be hanging

Modified: labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java	2011-06-24 09:41:42 UTC (rev 37148)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java	2011-06-24 10:01:02 UTC (rev 37149)
@@ -21,6 +21,7 @@
 package org.jboss.narayana.jta.examples;
 
 import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
+import com.arjuna.ats.arjuna.objectstore.StoreManager;
 import com.arjuna.ats.internal.arjuna.objectstore.hornetq.HornetqJournalEnvironmentBean;
 import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
 
@@ -38,8 +39,7 @@
         utx.begin();
         utx.commit();
 
-        if (!new File(storeDir).exists())
-            throw new RuntimeException(storeDir + " should have been created");
+		shutdownStore();
     }
 
     public static void setupStore() throws Exception {
@@ -54,6 +54,12 @@
         BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "default").setObjectStoreType(storeClassName);
         // TODO figure out why we can't use the hornetqStore as the communications store
         //BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "communicationStore").setObjectStoreType(storeClassName);
+    }
 
-    }
+    public static void shutdownStore() throws Exception {
+        StoreManager.shutdown();
+
+        if (!new File(storeDir).exists())
+            throw new RuntimeException(storeDir + " should have been created");
+	}
 }