[jboss-svn-commits] JBL Code SVN: r35362 - in labs/jbosstm/trunk/txbridge: demo/src/org/jboss/jbossts/txbridge/demo/bistro and 2 other directories.

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

Author: jhalliday
Date: 2010-09-30 07:25:44 -0400 (Thu, 30 Sep 2010)
New Revision: 35362

Modified:
   labs/jbosstm/trunk/txbridge/demo/build.xml
   labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroEntityImpl.java
   labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroImpl.java
   labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java
   labs/jbosstm/trunk/txbridge/tests/src/org/jboss/jbossts/txbridge/tests/outbound/utility/TestRecoveryModule.java
Log:
Tweak bridging code for XTS recovery API change and logging deps change. JBTM-44


Modified: labs/jbosstm/trunk/txbridge/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/demo/build.xml	2010-09-30 09:47:05 UTC (rev 35361)
+++ labs/jbosstm/trunk/txbridge/demo/build.xml	2010-09-30 11:25:44 UTC (rev 35362)
@@ -36,7 +36,7 @@
 	<path id="build-prereqs">
         <fileset dir="../../build/extlib">
             <include name="jboss-servlet-api_3.0_spec.jar"/>
-            <include name="log4j.jar"/>
+            <include name="jboss-logging.jar"/>
             <include name="jboss-transaction-api_1.1_spec.jar"/>
             <include name="hibernate-jpa-2.0-api.jar"/>
             <include name="jboss-ejb-api_3.1_spec.jar"/>

Modified: labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroEntityImpl.java
===================================================================
--- labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroEntityImpl.java	2010-09-30 09:47:05 UTC (rev 35361)
+++ labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroEntityImpl.java	2010-09-30 11:25:44 UTC (rev 35362)
@@ -23,7 +23,7 @@
  */
 package org.jboss.jbossts.txbridge.demo.bistro;
 
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
 
 import java.io.Serializable;
 

Modified: labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroImpl.java
===================================================================
--- labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroImpl.java	2010-09-30 09:47:05 UTC (rev 35361)
+++ labs/jbosstm/trunk/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/bistro/BistroImpl.java	2010-09-30 11:25:44 UTC (rev 35362)
@@ -23,7 +23,7 @@
  */
 package org.jboss.jbossts.txbridge.demo.bistro;
 
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
 
 import javax.ejb.*;
 import javax.persistence.*;

Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java	2010-09-30 09:47:05 UTC (rev 35361)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/inbound/InboundBridgeRecoveryManager.java	2010-09-30 11:25:44 UTC (rev 35362)
@@ -144,6 +144,18 @@
     }
 
     /**
+     * participant recovery modules may need to perform special processing when the a recovery scan has
+     * completed. in particular it is only after the first recovery scan has completed they can identify
+     * whether locally prepared changes are accompanied by a recreated participant and roll back changes
+     * for those with no such participant.
+     */
+    @Override
+    public void endScan()
+    {
+        // unused - periodicWorkSecondPass/orphanedXAResourcesAreIdentifiable handle the lifecycle stuff instead.
+    }
+
+    /**
      * Unused recovery callback. We use serialization instead, so this method will always throw an exception if called.
      */
     @Override

Modified: labs/jbosstm/trunk/txbridge/tests/src/org/jboss/jbossts/txbridge/tests/outbound/utility/TestRecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/txbridge/tests/src/org/jboss/jbossts/txbridge/tests/outbound/utility/TestRecoveryModule.java	2010-09-30 09:47:05 UTC (rev 35361)
+++ labs/jbosstm/trunk/txbridge/tests/src/org/jboss/jbossts/txbridge/tests/outbound/utility/TestRecoveryModule.java	2010-09-30 11:25:44 UTC (rev 35362)
@@ -95,4 +95,16 @@
     {
         throw new Exception("recreation not supported - should use deserialization instead.");
     }
+
+    /**
+     * participant recovery modules may need to perform special processing when the a recovery scan has
+     * completed. in particular it is only after the first recovery scan has completed they can identify
+     * whether locally prepared changes are accompanied by a recreated participant and roll back changes
+     * for those with no such participant.
+     */
+    @Override
+    public void endScan()
+    {
+        // unused
+    }
 }