[jboss-cvs] JBossAS SVN: r57120 - 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 16:44:44 -0400 (Sun, 24 Sep 2006)
New Revision: 57120

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 20:44:22 UTC (rev 57119)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java	2006-09-24 20:44:44 UTC (rev 57120)
@@ -274,6 +274,16 @@
       
    }
    
+   public boolean getPadXid()
+   {
+      return this.padXid;
+      
+   }
+   
+   public void setPadXid(boolean padXid)
+   {
+      this.padXid = padXid;
+   }
    /**
     * Set the IsSameRMOverrideValue value.
     * 
@@ -402,6 +412,7 @@
       if (localTransactions)
       {
          xaResource = new LocalXAResource(log);
+    
          if (xaResourceTimeout != 0)
             log.debug("XAResource transaction timeout cannot be set for local transactions: " + getJndiName());
       }
@@ -409,7 +420,6 @@
       else
       {
          
-
          if(wrapXAResource)
          {
             log.trace("Generating XAResourceWrapper for TxConnectionManager" + this);
@@ -468,6 +478,7 @@
          super(mc, mcp, context, log);
          this.log = log;
          this.xaResource = xaResource;
+         
          if (xaResource instanceof LocalXAResource)
             ((LocalXAResource) xaResource).setConnectionListener(this);
       }

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	2006-09-24 20:44:22 UTC (rev 57119)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/TxConnectionManagerMBean.java	2006-09-24 20:44:44 UTC (rev 57120)
@@ -115,5 +115,9 @@
    
    public void setWrapXAResource(boolean useXAWrapper);
    
+   public void setPadXid(boolean padXid);
+   
+   public boolean getPadXid();
+   
 
 }