[jboss-cvs] JBossAS SVN: r111009 - in projects/jboss-jca/trunk/adapters/src/main: resources/jdbc/local/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 23 11:48:38 EDT 2011
Author: maeste
Date: 2011-03-23 11:48:38 -0400 (Wed, 23 Mar 2011)
New Revision: 111009
Modified:
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java
projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/local/META-INF/ra.xml
projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/xa/META-INF/ra.xml
Log:
switching to userTransaction
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java 2011-03-23 14:52:54 UTC (rev 111008)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnectionFactory.java 2011-03-23 15:48:38 UTC (rev 111009)
@@ -227,8 +227,8 @@
private ClassLoaderPlugin classLoaderPlugin;
- /** The JNDI name for the transaction manager */
- private String transactionManagerJndiName;
+ /** The JNDI name for the user transaction */
+ private String userTransactionJndiName;
/**
* Constructor
@@ -862,24 +862,24 @@
}
/**
- * Get the transaction manager JNDI name
+ * Get the user transaction JNDI name
* @return The value
*/
- public String getTransactionManagerJndiName()
+ public String getUserTransactionJndiName()
{
- if (transactionManagerJndiName == null || transactionManagerJndiName.trim().equals(""))
- return "java:/TransactionManager";
+ if (userTransactionJndiName == null || userTransactionJndiName.trim().equals(""))
+ return "java:/UserTransaction";
- return transactionManagerJndiName;
+ return userTransactionJndiName;
}
/**
- * Set the transaction manager JNDI name
+ * Set the user transaction JNDI name
* @param v The value
*/
- public void setTransactionManagerJndiName(String v)
+ public void setUserTransactionJndiName(String v)
{
- this.transactionManagerJndiName = v;
+ this.userTransactionJndiName = v;
}
/**
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java 2011-03-23 14:52:54 UTC (rev 111008)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java 2011-03-23 15:48:38 UTC (rev 111009)
@@ -41,8 +41,7 @@
import javax.sql.DataSource;
import javax.transaction.RollbackException;
import javax.transaction.Status;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
import org.jboss.logging.Logger;
@@ -65,7 +64,7 @@
private PrintWriter logger;
private Reference reference;
- private TransactionManager transactionManager;
+ private UserTransaction userTransaction;
/**
* Constructor
@@ -76,7 +75,7 @@
{
this.mcf = mcf;
this.cm = cm;
- this.transactionManager = null;
+ this.userTransaction = null;
}
/**
@@ -211,22 +210,19 @@
*/
protected void checkTransactionActive() throws SQLException
{
- if (transactionManager == null)
- initTransactionManager();
+ if (userTransaction == null)
+ initUserTransaction();
try
{
- Transaction tx = transactionManager.getTransaction();
- if (tx != null)
+ int status = userTransaction.getStatus();
+ if (status == Status.STATUS_NO_TRANSACTION)
+ return;
+ // Only allow states that will actually succeed
+ if (status != Status.STATUS_ACTIVE && status != Status.STATUS_PREPARING &&
+ status != Status.STATUS_PREPARED && status != Status.STATUS_COMMITTING)
{
- int status = tx.getStatus();
-
- // Only allow states that will actually succeed
- if (status != Status.STATUS_ACTIVE && status != Status.STATUS_PREPARING &&
- status != Status.STATUS_PREPARED && status != Status.STATUS_COMMITTING)
- {
- throw new SQLException("Transaction " + tx + " cannot proceed " + TxUtils.getStatusAsString(status));
- }
+ throw new SQLException("Transaction cannot proceed " + TxUtils.getStatusAsString(status));
}
}
catch (SQLException se)
@@ -240,15 +236,15 @@
}
/**
- * Init the transaction manager reference
+ * Init the user transaction reference
*/
- private void initTransactionManager() throws SQLException
+ private void initUserTransaction() throws SQLException
{
Context context = null;
try
{
context = new InitialContext();
- transactionManager = (TransactionManager)context.lookup(mcf.getTransactionManagerJndiName());
+ userTransaction = (UserTransaction)context.lookup(mcf.getUserTransactionJndiName());
}
catch (Throwable t)
{
Modified: projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/local/META-INF/ra.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/local/META-INF/ra.xml 2011-03-23 14:52:54 UTC (rev 111008)
+++ projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/local/META-INF/ra.xml 2011-03-23 15:48:38 UTC (rev 111009)
@@ -168,8 +168,8 @@
<config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The JNDI name of the transaction manager</description>
- <config-property-name>TransactionManagerJndiName</config-property-name>
+ <description>The JNDI name of the user transaction</description>
+ <config-property-name>UserTransactionJndiName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
</config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
Modified: projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/xa/META-INF/ra.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/xa/META-INF/ra.xml 2011-03-23 14:52:54 UTC (rev 111008)
+++ projects/jboss-jca/trunk/adapters/src/main/resources/jdbc/xa/META-INF/ra.xml 2011-03-23 15:48:38 UTC (rev 111009)
@@ -168,8 +168,8 @@
<config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The JNDI name of the transaction manager</description>
- <config-property-name>TransactionManagerJndiName</config-property-name>
+ <description>The JNDI name of the user transaction</description>
+ <config-property-name>UserTransactionJndiName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
</config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
More information about the jboss-cvs-commits
mailing list