You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2008/03/03 22:04:36 UTC
svn commit: r633275 -
/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
Author: dain
Date: Mon Mar 3 13:04:33 2008
New Revision: 633275
URL: http://svn.apache.org/viewvc?rev=633275&view=rev
Log:
Reenable System EJBs like the MEJB and DeployerEJB in Tomcat
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java?rev=633275&r1=633274&r2=633275&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatLoader.java Mon Mar 3 13:04:33 2008
@@ -56,6 +56,11 @@
protected ServiceManager manager;
public void init(Properties properties) throws Exception {
+ // Enable System EJBs like the MEJB and DeployerEJB
+ properties.setProperty("openejb.deployments.classpath", "true");
+ properties.setProperty("openejb.deployments.classpath.filter.systemapps", "false");
+ properties.setProperty("openejb.provider.default", "org.apache.openejb.tomcat");
+
// Loader maybe the first thing executed in a new classloader
// so we must attempt to initialize the system instance.
SystemInstance.init(properties);
@@ -82,13 +87,6 @@
} catch (IOException e) {
System.out.println("Processing conf/system.properties failed: "+e.getMessage());
}
-
-
- // initialize system instance before doing anything
- System.setProperty("openejb.deployments.classpath", "true");
- System.setProperty("openejb.deployments.classpath.filter.systemapps", "false");
- System.setProperty("openejb.provider.default", "org.apache.openejb.tomcat");
- SystemInstance.init(properties);
System.setProperty("openejb.home", SystemInstance.get().getHome().getDirectory().getAbsolutePath());
System.setProperty("openejb.base", SystemInstance.get().getBase().getDirectory().getAbsolutePath());