You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/05/02 01:11:28 UTC
svn commit: r1098437 -
/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java
Author: jgallimore
Date: Sun May 1 23:11:28 2011
New Revision: 1098437
URL: http://svn.apache.org/viewvc?rev=1098437&view=rev
Log:
OPENEJB-1535 setup transaction manager earlier on for Tomcat 7
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java?rev=1098437&r1=1098436&r2=1098437&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java Sun May 1 23:11:28 2011
@@ -27,6 +27,9 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.deploy.ContextTransaction;
+import org.apache.naming.factory.Constants;
+import org.apache.openejb.tomcat.common.UserTransactionFactory;
import org.apache.openejb.tomcat.loader.TomcatHelper;
import org.apache.tomcat.JarScanner;
@@ -117,6 +120,10 @@ public class GlobalListenerSupport imple
} else if (Lifecycle.CONFIGURE_START_EVENT.equals(type)) {
if (TomcatHelper.isTomcat7()) {
TomcatHelper.configureJarScanner(standardContext);
+
+ ContextTransaction contextTransaction = new ContextTransaction();
+ contextTransaction.setProperty(Constants.FACTORY, UserTransactionFactory.class.getName());
+ standardContext.getNamingResources().setTransaction(contextTransaction);
}
}
} else if (source instanceof StandardHost) {