[jboss-cvs] JBossAS SVN: r66013 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.

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

Author: weston.price at jboss.com
Date: 2007-10-10 12:46:38 -0400 (Wed, 10 Oct 2007)
New Revision: 66013

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
Log:
[JBAS-4809] The ManagedConnectionEmptyContentAdapter was incorrectly identifying non datasource tx connection factories as local tx when in fact they were XA. The metadata has been reworked to correctly set this property for both local and xa deployments by overriding the local transactions property in the subclasses rather than allowing the parent to be the authority for this property.

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java	2007-10-10 15:28:15 UTC (rev 66012)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionEmptyContentAdapter.java	2007-10-10 16:46:38 UTC (rev 66013)
@@ -42,7 +42,7 @@
       
       
       if (e.getNodeName().equals("track-connection-by-tx") || e.getNodeName().equals("no-tx-separate-pools")
-            || e.getNodeName().equals("local-transaction") || e.getNodeName().equals("use-strict-min"))
+            || e.getNodeName().equals("local-transaction") || e.getNodeName().equals("use-strict-min") || e.getNodeName().equals("xa-transaction"))
       {
          results = Boolean.TRUE;
 

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java	2007-10-10 15:28:15 UTC (rev 66012)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NoTxConnectionFactoryDeploymentMetaData.java	2007-10-10 16:46:38 UTC (rev 66013)
@@ -41,13 +41,19 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -8637168894246737692L;
-
+   
    @Override
+   public Boolean getLocalTransactions()
+   {
+      return false;
+   }
+   
+   @Override
    @ManagementProperty(ignored=true)
    public ManagedConnectionFactoryTransactionSupportMetaData getTransactionSupportMetaData()
    {
       return ManagedConnectionFactoryTransactionSupportMetaData.NONE;
       
    }
-   
+      
 }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java	2007-10-10 15:28:15 UTC (rev 66012)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java	2007-10-10 16:46:38 UTC (rev 66013)
@@ -25,6 +25,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.jboss.managed.api.annotation.ManagementComponent;
 import org.jboss.managed.api.annotation.ManagementObject;
@@ -49,21 +50,42 @@
    public TxConnectionFactoryDeploymentMetaData()
    {
    }
-
+   
    @XmlElement(name="xa-resource-timeout")
    private int xaResourceTimeout;
-
+   
+   @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
+   @XmlElement(name="xa-transaction")
+   private Boolean xaTransaction;
+   
    public int getXaResourceTimeout()
    {
       return xaResourceTimeout;
    }
-
+   
+   public Boolean getXATransaction()
+   {
+      return xaTransaction;
+   }
+   
+   
+   public void setXATransaction(Boolean xaTransaction)
+   {
+      this.xaTransaction = xaTransaction;
+      
+   }
    public void setXaResourceTimeout(int xaResourceTimeout)
    {
       this.xaResourceTimeout = xaResourceTimeout;
    }
    
    @Override
+   public Boolean getLocalTransactions()
+   {
+      return !getXATransaction();
+   }
+
+   @Override
    @ManagementProperty(ignored=true)
    public ManagedConnectionFactoryTransactionSupportMetaData getTransactionSupportMetaData()
    {