[jboss-cvs] JBossAS SVN: r57114 - trunk/connector/src/main/org/jboss/resource/connectionmanager

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

Author: weston.price at jboss.com
Date: 2006-09-24 03:03:21 -0400 (Sun, 24 Sep 2006)
New Revision: 57114

Modified:
   trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
   trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java
Log:
[JBAS-3183] [JBAS-1405] [JBAS-397] Continued work on XAResourceWrapper and JcaXid. Moving
previous handling of Xid padding and isSameRM from XidFactory and
BaseWrapperManagedConnectionFactory respectively. Made XAResoruceWrapper
configurable option from XSLT.

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-09-24 07:02:57 UTC (rev 57113)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-09-24 07:03:21 UTC (rev 57114)
@@ -146,7 +146,9 @@
    
    private boolean padXid;
    
-   private boolean overrideXAResource;
+   private boolean wrapXAResource;
+
+   private Boolean isSameRMOverrideValue;
    
    protected static void rethrowAsSystemException(String context, Transaction tx, Throwable t)
       throws SystemException
@@ -251,6 +253,37 @@
       this.xaResourceTimeout = timeout;
    }
    
+   /**
+    * Get the IsSameRMOverrideValue value.
+    * 
+    * @return the IsSameRMOverrideValue value.
+    */
+   public Boolean getIsSameRMOverrideValue()
+   {
+      return isSameRMOverrideValue;
+   }
+   
+   public boolean getWrapXAResource()
+   {      
+      return wrapXAResource;      
+   }
+   
+   public void setWrapXAResource(boolean useXAWrapper)
+   {
+      this.wrapXAResource = useXAWrapper;
+      
+   }
+   
+   /**
+    * Set the IsSameRMOverrideValue value.
+    * 
+    * @param isSameRMOverrideValue The new IsSameRMOverrideValue value.
+    */
+   public void setIsSameRMOverrideValue(Boolean isSameRMOverrideValue)
+   {
+      this.isSameRMOverrideValue = isSameRMOverrideValue;
+   }
+   
    public long getTimeLeftBeforeTransactionTimeout(boolean errorRollback) throws RollbackException
    {
       if (tm == null)
@@ -275,7 +308,8 @@
          log.warn("----------------------------------------------------------");
          tm = (TransactionManager)new InitialContext().lookup(tmName);
       }
-
+      
+      
       super.startService();
    }
 
@@ -375,9 +409,21 @@
       else
       {
          
-         //Should we allow complete ignore?
-         xaResource = new XAResourceWrapper(false, padXid, mc.getXAResource());
+
+         if(wrapXAResource)
+         {
+            log.trace("Generating XAResourceWrapper for TxConnectionManager" + this);
+            xaResource = new XAResourceWrapper(isSameRMOverrideValue, padXid, mc.getXAResource());
+            
+         }
          
+         else
+         {
+            log.trace("Not wrapping XAResource.");
+            xaResource = mc.getXAResource();
+            
+         }
+                                
          if (xaResourceTimeout != 0)
          {
             try

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	2006-09-24 07:02:57 UTC (rev 57113)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	2006-09-24 07:03:21 UTC (rev 57114)
@@ -106,4 +106,14 @@
     * @param timeout
     */
    void setXAResourceTransactionTimeout(int timeout);
+
+   Boolean getIsSameRMOverrideValue();
+   
+   void setIsSameRMOverrideValue(Boolean value);
+   
+   public boolean getWrapXAResource();
+   
+   public void setWrapXAResource(boolean useXAWrapper);
+   
+
 }