[jboss-cvs] JBossAS SVN: r112750 - in branches/JBPAPP_5_1: hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery and 1 other directory.

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

Author: clebert.suconic
Date: 2012-03-09 16:15:19 -0500 (Fri, 09 Mar 2012)
New Revision: 112750

Modified:
   branches/JBPAPP_5_1/component-matrix/pom.xml
   branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java
Log:
JBPAPP-8366 AND JBPAPP-8377

Modified: branches/JBPAPP_5_1/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_1/component-matrix/pom.xml	2012-03-09 18:38:33 UTC (rev 112749)
+++ branches/JBPAPP_5_1/component-matrix/pom.xml	2012-03-09 21:15:19 UTC (rev 112750)
@@ -44,7 +44,7 @@
     <version.jboss.jbossws>3.1.2.SP11</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.8.SP5</version.jboss.messaging>
-    <version.hornetq>2.2.10.GA</version.hornetq>
+    <version.hornetq>2.2.10.GA-patch-01</version.hornetq>
     <version.jboss.web>2.1.12.GA-patch-03</version.jboss.web>
     <version.jgroups>2.6.20.Final</version.jgroups>
     <version.junit>3.8.2</version.junit>

Modified: branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java	2012-03-09 18:38:33 UTC (rev 112749)
+++ branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java	2012-03-09 21:15:19 UTC (rev 112750)
@@ -21,18 +21,20 @@
 */
 package org.jboss.as.integration.hornetq.recovery;
 
+import org.hornetq.jms.server.recovery.HornetQRegistryBase;
+import org.jboss.logging.Logger;
 import org.jboss.tm.XAResourceRecoveryRegistry;
-import org.hornetq.jms.server.recovery.HornetQResourceRecovery;
-import org.hornetq.jms.server.recovery.RecoveryRegistry;
-import org.hornetq.jms.server.recovery.XARecoveryConfig;
 
 
 /**
  * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ * @author Clebert Suconic
  *         9/19/11
  */
-public class AS5RecoveryRegistry implements RecoveryRegistry
+public class AS5RecoveryRegistry extends HornetQRegistryBase
 {
+   private static final Logger log = Logger
+         .getLogger(AS5RecoveryRegistry.class);
    static volatile XAResourceRecoveryRegistry registry;
 
 
@@ -45,15 +47,11 @@
    {
       AS5RecoveryRegistry.registry = registry;
    }
-
-   public void register(HornetQResourceRecovery resourceRecovery)
+   
+   public XAResourceRecoveryRegistry getTMRegistry()
    {
-      registry.addXAResourceRecovery(resourceRecovery);
+      return registry;
    }
+   
 
-   public void unRegister(HornetQResourceRecovery resourceRecovery)
-   {
-      registry.removeXAResourceRecovery(resourceRecovery);
-   }
-
 }