QPID-3990: Multiple XAResources isSameRM behavior

    *Track XAResource siblings in start/end methods
    *Added AMQXAResource interface
    *Added systemtest for new XAResource behavior
    *Refactored XAResourceTest to extend AbstractXATest

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1338355 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 2 deletions

diff --git a/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
index 22b39792b1..37ae7f5514 100644
--- a/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
@@ -21,10 +21,13 @@
 
 package org.apache.qpid.ra;
 
+import java.util.List;
+
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
+import org.apache.qpid.client.AMQXAResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * QpidRAXAResource.
  *
  */
-public class QpidRAXAResource implements XAResource
+public class QpidRAXAResource implements AMQXAResource
 {
    /** The logger */
    private static final Logger _log = LoggerFactory.getLogger(QpidRAXAResource.class);
@@ -192,7 +195,7 @@ public class QpidRAXAResource implements XAResource
       {
          _log.trace("isSameRM(" + xaRes + ")");
       }
-
+      
       return _xaResource.isSameRM(xaRes);
    }
 
@@ -242,4 +245,14 @@ public class QpidRAXAResource implements XAResource
 
       return _xaResource.setTransactionTimeout(seconds);
    }
+   
+   public String getBrokerUUID()
+   {
+       return ((AMQXAResource)_xaResource).getBrokerUUID();
+   }
+   
+   public List<XAResource> getSiblings()
+   {
+       return ((AMQXAResource)_xaResource).getSiblings();
+   }
 }