[jboss-cvs] JBossAS SVN: r57746 - branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager

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

Author: weston.price at jboss.com
Date: 2006-10-20 00:44:04 -0400 (Fri, 20 Oct 2006)
New Revision: 57746

Modified:
   branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
   branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java
Log:
[JBAS-3183] [JBAS-1405] Added JcaXAResourceWrapped and JcaXid to support 
thirdparty integration as well as Xid padding in JCA layer.

Modified: branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
===================================================================
--- branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-10-20 04:43:46 UTC (rev 57745)
+++ branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-10-20 04:44:04 UTC (rev 57746)
@@ -47,6 +47,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.resource.JBossResourceException;
+import org.jboss.resource.connectionmanager.xa.JcaXAResourceWrapper;
 import org.jboss.tm.LastResource;
 import org.jboss.tm.TransactionTimeoutConfiguration;
 import org.jboss.tm.TxUtils;
@@ -141,7 +142,11 @@
    private boolean localTransactions;
    
    private int xaResourceTimeout = 0;
-
+   
+   private Boolean isSameRMOverrideValue;
+   
+   private boolean pad;
+   
    protected static void rethrowAsSystemException(String context, Transaction tx, Throwable t)
       throws SystemException
    {
@@ -245,6 +250,26 @@
       this.xaResourceTimeout = timeout;
    }
    
+   public Boolean getIsSameRMOverrideValue()
+   {
+      return isSameRMOverrideValue;
+   }
+   
+   public void setIsSameRMOverrideValue(Boolean isSameRMOverride)
+   {
+      this.isSameRMOverrideValue = isSameRMOverride;
+   }
+   
+   public boolean getPadXid()
+   {
+      return this.pad;
+      
+   }
+   public void setPadXid(boolean pad)
+   {
+      this.pad = pad;
+      
+   }
    public long getTimeLeftBeforeTransactionTimeout(boolean errorRollback) throws RollbackException
    {
       if (tm == null)
@@ -358,6 +383,7 @@
       throws ResourceException
    {
       XAResource xaResource = null;
+      
       if (localTransactions)
       {
          xaResource = new LocalXAResource(log);
@@ -366,7 +392,8 @@
       }
       else
       {
-         xaResource = mc.getXAResource();
+         xaResource = new JcaXAResourceWrapper(mc.getXAResource(), pad, isSameRMOverrideValue);
+         
          if (xaResourceTimeout != 0)
          {
             try

Modified: branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java
===================================================================
--- branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	2006-10-20 04:43:46 UTC (rev 57745)
+++ branches/Branch_4_0/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	2006-10-20 04:44:04 UTC (rev 57746)
@@ -96,4 +96,12 @@
    int getXAResourceTransactionTimeout();
    
    void setXAResourceTransactionTimeout(int timeout);
+
+   Boolean getIsSameRMOverrideValue();
+   
+   void setIsSameRMOverrideValue(Boolean override);
+
+   boolean getPadXid();
+   
+   void setPadXid(boolean pad);
 }