[jboss-svn-commits] JBL Code SVN: r13787 - labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta.

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

Author: jhalliday
Date: 2007-07-25 05:55:06 -0400 (Wed, 25 Jul 2007)
New Revision: 13787

Modified:
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
Log:
Changed JNDI binding location of TransactionSynchronizationRegistry from / to java:/ per Adrian's comments on javaeetck at jboss.org.


Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2007-07-25 07:47:41 UTC (rev 13786)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2007-07-25 09:55:06 UTC (rev 13787)
@@ -133,7 +133,7 @@
         System.setProperty(com.arjuna.ats.tsmx.TransactionServiceMX.AGENT_IMPLEMENTATION_PROPERTY,
                 com.arjuna.ats.internal.jbossatx.agent.LocalJBossAgentImpl.class.getName());
         System.setProperty(Environment.LAST_RESOURCE_OPTIMISATION_INTERFACE, LastResource.class.getName()) ;
-        
+
         if (timeout != 0)
         {
             TxControl.setDefaultTimeout(timeout);
@@ -144,7 +144,7 @@
 
         // Associate transaction reaper with our context classloader.
         TransactionReaper.create() ;
-        
+
         /** Register propagation context manager **/
         try
         {
@@ -198,9 +198,9 @@
         jtaPropertyManager.propertyManager.setProperty(Environment.JTA_UT_IMPLEMENTATION, UserTransactionImple.class.getName());
 
 		jtaPropertyManager.propertyManager.setProperty(Environment.JTA_TSR_IMPLEMENTATION, TransactionSynchronizationRegistryImple.class.getName());
-		// When running inside the app server, we bind TSR in the JNDI root, not its normal location.
+		// When running inside the app server, we bind TSR in the JNDI java:/ space, not its required location.
 		// It's the job of individual components (EJB3, web, etc) to copy the ref to the java:/comp space)
-		jtaPropertyManager.propertyManager.setProperty(Environment.TSR_JNDI_CONTEXT, "TransactionSynchronizationRegistry");
+        jtaPropertyManager.propertyManager.setProperty(Environment.TSR_JNDI_CONTEXT, "java:/TransactionSynchronizationRegistry");
 
 		JNDIManager.bindJTATransactionManagerImplementation();
 		JNDIManager.bindJTATransactionSynchronizationRegistryImplementation();
@@ -308,7 +308,7 @@
      *
      * @param timeout The default timeout in seconds for all transactions created
      * using this transaction manager.
-     * 
+     *
      * @throws IllegalStateException if the MBean has already started.
      */
     public void setTransactionTimeout(int timeout) throws IllegalStateException
@@ -463,7 +463,7 @@
      * JBoss.  If this is false the Recovery Manager is already expected to
      * be running when JBoss starts.
      * @param runRM
-     * 
+     *
      * @throws IllegalStateException If the MBean has already started.
      */
     public void setRunInVMRecoveryManager(boolean runRM)
@@ -489,7 +489,7 @@
      * Get whether the recovery manager should be ran in the same VM as
      * JBoss.  If this is false the Recovery Manager is already expected to
      * be running when JBoss starts.
-     * 
+     *
      * @return true if the recover manager is running in the same VM, false otherwise.
      */
     public boolean getRunInVMRecoveryManager()
@@ -499,11 +499,11 @@
 	    return _runRM ;
 	}
     }
-    
+
     /**
      * Set the object store directory.
      * @param objectStoreDir The object store directory.
-     * 
+     *
      * @throws IllegalStateException if the MBean has already started.
      */
     public void setObjectStoreDir(final String objectStoreDir)
@@ -526,7 +526,7 @@
             }
         }
     }
-    
+
     /**
      * Get the object store directory.
      * @return objectStoreDir The object store directory.