You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/22 02:23:44 UTC

svn commit: r1328751 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Author: dblevins
Date: Sun Apr 22 00:23:43 2012
New Revision: 1328751

URL: http://svn.apache.org/viewvc?rev=1328751&view=rev
Log:
Yank the SystemInstance.init(_) that was only there for the WebappClassLoader of the tomee.war
TOMEE-163

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java?rev=1328751&r1=1328750&r2=1328751&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java Sun Apr 22 00:23:43 2012
@@ -47,6 +47,7 @@ public class ServerListener implements L
             TomcatHelper.setServer(server);
 
             final Properties properties = new Properties();
+            System.getProperties().setProperty("openejb.embedder.source", getClass().getSimpleName());
             properties.setProperty("openejb.embedder.source", getClass().getSimpleName());
 
 
@@ -108,7 +109,6 @@ public class ServerListener implements L
                 // ignored
             }
 
-            SystemInstance.init(properties);
             TomcatLoader loader = new TomcatLoader();
             loader.init(properties);