[jboss-svn-commits] JBL Code SVN: r29891 - in labs/jbosstm/trunk/ArjunaJTA: jta/classes/com/arjuna/ats/jta and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 2 09:23:03 EST 2009
Author: jhalliday
Date: 2009-11-02 09:23:03 -0500 (Mon, 02 Nov 2009)
New Revision: 29891
Modified:
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionManagerImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/UserTransactionImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java
labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/ToolInitializer.java
Log:
Get JTA JNDI related properties direct from the env bean, not the JNDIManager. JBTM-628
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionManagerImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionManagerImple.java 2009-11-02 13:42:16 UTC (rev 29890)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionManagerImple.java 2009-11-02 14:23:03 UTC (rev 29891)
@@ -29,7 +29,6 @@
package com.arjuna.ats.internal.jta.transaction.arjunacore;
import com.arjuna.ats.jta.logging.*;
-import com.arjuna.ats.jta.utils.JNDIManager;
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.common.util.logging.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/UserTransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/UserTransactionImple.java 2009-11-02 13:42:16 UTC (rev 29890)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/UserTransactionImple.java 2009-11-02 14:23:03 UTC (rev 29891)
@@ -31,8 +31,6 @@
package com.arjuna.ats.internal.jta.transaction.arjunacore;
-import com.arjuna.ats.jta.utils.JNDIManager;
-
import java.util.Hashtable;
import javax.naming.*;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java 2009-11-02 13:42:16 UTC (rev 29890)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/TransactionManager.java 2009-11-02 14:23:03 UTC (rev 29891)
@@ -32,7 +32,7 @@
package com.arjuna.ats.jta;
import com.arjuna.ats.jta.logging.jtaLogger;
-import com.arjuna.ats.jta.utils.JNDIManager;
+import com.arjuna.ats.jta.common.jtaPropertyManager;
import javax.naming.InitialContext;
@@ -53,7 +53,7 @@
try
{
- transactionManager = (javax.transaction.TransactionManager)ctx.lookup(JNDIManager.getTransactionManagerJNDIName());
+ transactionManager = (javax.transaction.TransactionManager)ctx.lookup(jtaPropertyManager.getJTAEnvironmentBean().getJtaTMJNDIContext());
}
catch (Exception e)
{
@@ -90,7 +90,7 @@
{
try
{
- _transactionManager = (javax.transaction.TransactionManager) Thread.currentThread().getContextClassLoader().loadClass(JNDIManager.getTransactionManagerImplementationClassname()).newInstance();
+ _transactionManager = (javax.transaction.TransactionManager) Thread.currentThread().getContextClassLoader().loadClass(jtaPropertyManager.getJTAEnvironmentBean().getJtaTMImplementation()).newInstance();
}
catch (Exception e)
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java 2009-11-02 13:42:16 UTC (rev 29890)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/UserTransaction.java 2009-11-02 14:23:03 UTC (rev 29891)
@@ -32,7 +32,7 @@
package com.arjuna.ats.jta;
import com.arjuna.ats.jta.logging.jtaLogger;
-import com.arjuna.ats.jta.utils.JNDIManager;
+import com.arjuna.ats.jta.common.jtaPropertyManager;
import javax.naming.InitialContext;
@@ -56,7 +56,7 @@
try
{
- userTransaction = (javax.transaction.UserTransaction) ctx.lookup(JNDIManager.getUserTransactionJNDIName());
+ userTransaction = (javax.transaction.UserTransaction) ctx.lookup(jtaPropertyManager.getJTAEnvironmentBean().getJtaUTJNDIContext());
}
catch (Exception e)
{
@@ -96,7 +96,7 @@
{
if ((_userTransaction == null) || (reset))
{
- _userTransaction = (javax.transaction.UserTransaction) Thread.currentThread().getContextClassLoader().loadClass(JNDIManager.getUserTransactionImplementationClassname()).newInstance();
+ _userTransaction = (javax.transaction.UserTransaction) Thread.currentThread().getContextClassLoader().loadClass(jtaPropertyManager.getJTAEnvironmentBean().getJtaUTImplementation()).newInstance();
}
}
catch (Exception e)
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java 2009-11-02 13:42:16 UTC (rev 29890)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JNDIManager.java 2009-11-02 14:23:03 UTC (rev 29891)
@@ -66,21 +66,6 @@
bindJTATransactionSynchronizationRegistryImplementation();
}
- public static String getTransactionManagerImplementationClassname()
- {
- return jtaPropertyManager.getJTAEnvironmentBean().getJtaTMImplementation();
- }
-
- public static String getUserTransactionImplementationClassname()
- {
- return jtaPropertyManager.getJTAEnvironmentBean().getJtaUTImplementation();
- }
-
- public static String getTransactionSynchronizationRegistryImplementationClassname()
- {
- return jtaPropertyManager.getJTAEnvironmentBean().getJtaTSRImplementation();
- }
-
/**
* Bind the currently configured transaction manager implementation to the default
* JNDI context.
@@ -109,7 +94,7 @@
public static void bindJTATransactionManagerImplementation(InitialContext initialContext) throws javax.naming.NamingException
{
/** Look up and instantiate an instance of the configured transaction manager implementation **/
- String tmImplementation = getTransactionManagerImplementationClassname();
+ String tmImplementation = jtaPropertyManager.getJTAEnvironmentBean().getJtaTMImplementation();
/** Bind the transaction manager to the appropriate JNDI context **/
Reference ref = new Reference(tmImplementation, tmImplementation, null);
@@ -145,7 +130,7 @@
public static void bindJTAUserTransactionImplementation(InitialContext initialContext) throws javax.naming.NamingException
{
/** Look up and instantiate an instance of the configured user transaction implementation **/
- String utImplementation = getUserTransactionImplementationClassname();
+ String utImplementation = jtaPropertyManager.getJTAEnvironmentBean().getJtaUTImplementation();
/** Bind the user transaction to the appropriate JNDI context **/
Reference ref = new Reference(utImplementation, utImplementation, null);
@@ -182,7 +167,7 @@
public static void bindJTATransactionSynchronizationRegistryImplementation(InitialContext initialContext) throws javax.naming.NamingException
{
/** Look up and instantiate an instance of the configured TransactionSynchronizationRegistry implementation **/
- String tsrImplementation = getTransactionSynchronizationRegistryImplementationClassname();
+ String tsrImplementation = jtaPropertyManager.getJTAEnvironmentBean().getJtaTSRImplementation();
Object tsr = null;
try {
tsr = Class.forName(tsrImplementation).newInstance();
@@ -206,12 +191,12 @@
initialContext.unbind(getTransactionSynchronizationRegistryJNDIName());
}
- public final static String getTransactionManagerJNDIName()
+ private final static String getTransactionManagerJNDIName()
{
return jtaPropertyManager.getJTAEnvironmentBean().getJtaTMJNDIContext();
}
- public final static String getUserTransactionJNDIName()
+ private final static String getUserTransactionJNDIName()
{
return jtaPropertyManager.getJTAEnvironmentBean().getJtaUTJNDIContext();
}
Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/ToolInitializer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/ToolInitializer.java 2009-11-02 13:42:16 UTC (rev 29890)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/ToolInitializer.java 2009-11-02 14:23:03 UTC (rev 29891)
@@ -7,7 +7,7 @@
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple;
import com.arjuna.ats.internal.arjuna.utils.XATxConverter;
import com.arjuna.ats.jta.xa.XidImple;
-import com.arjuna.ats.jta.utils.JNDIManager;
+import com.arjuna.ats.jta.common.jtaPropertyManager;
import javax.transaction.Transaction;
import javax.transaction.xa.Xid;
@@ -19,7 +19,7 @@
public void initialize(ToolPlugin plugin)
{
- String tmClassName = JNDIManager.getTransactionManagerImplementationClassname();
+ String tmClassName = jtaPropertyManager.getJTAEnvironmentBean().getJtaTMImplementation();
com.arjuna.ats.internal.jta.Implementations.initialise(); // needed for XAResourceRecord
More information about the jboss-svn-commits
mailing list