[jboss-cvs] JBossAS SVN: r63213 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: scott.stark at jboss.org
Date: 2007-05-25 15:38:54 -0400 (Fri, 25 May 2007)
New Revision: 63213

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java
Log:
JBAS-4445, Link java:comp/TransactionSynchronizationRegistry to JNDI TransactionSynchronizationRegistry

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-05-25 19:28:28 UTC (rev 63212)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-05-25 19:38:54 UTC (rev 63213)
@@ -466,7 +466,10 @@
                   log.debug("Unable to retrieve orb", t);
                }
 
-               // TODO: injection, Add a link to the global transaction manager
+               
+               // JTA links
+               envCtx.bind("TransactionSynchronizationRegistry", new LinkRef("TransactionSynchronizationRegistry"));
+               log.debug("Linked java:comp/TransactionSynchronizationRegistry to JNDI name: TransactionSynchronizationRegistry");
                envCtx.bind("UserTransaction", new LinkRef("UserTransaction"));
                log.debug("Linked java:comp/UserTransaction to JNDI name: UserTransaction");
                envCtx = envCtx.createSubcontext("env");

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java	2007-05-25 19:28:28 UTC (rev 63212)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment2.java	2007-05-25 19:38:54 UTC (rev 63213)
@@ -352,7 +352,9 @@
                log.debug("Unable to retrieve orb" + t.toString());
             }
 
-            // TODO: injection, Add a link to the global transaction manager
+            // JTA links
+            envCtx.bind("TransactionSynchronizationRegistry", new LinkRef("TransactionSynchronizationRegistry"));
+            log.debug("Linked java:comp/TransactionSynchronizationRegistry to JNDI name: TransactionSynchronizationRegistry");
             envCtx.bind("UserTransaction", new LinkRef("UserTransaction"));
             log.debug("Linked java:comp/UserTransaction to JNDI name: UserTransaction");