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 2011/09/18 02:14:53 UTC

svn commit: r1172158 - in /openejb/trunk/openejb3: assembly/openejb-tomcat/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java

Author: dblevins
Date: Sun Sep 18 00:14:52 2011
New Revision: 1172158

URL: http://svn.apache.org/viewvc?rev=1172158&view=rev
Log:
Better logging for the Embedded TomEE container

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1172158&r1=1172157&r2=1172158&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Sun Sep 18 00:14:52 2011
@@ -84,6 +84,7 @@ public class Container {
         System.out.println("Starting TomEE from: " + catalinaDirectory.getAbsolutePath());
 
         String catalinaBase = catalinaDirectory.getAbsolutePath();
+        System.setProperty("openejb.logging.embedded", "true");
         System.setProperty("openejb.deployments.classpath", "false");
         System.setProperty("catalina.home", catalinaBase);
         System.setProperty("catalina.base", catalinaBase);

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1172158&r1=1172157&r2=1172158&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Sun Sep 18 00:14:52 2011
@@ -63,9 +63,11 @@ public class Log4jLogStreamFactory imple
         // OpenJPA should use Log4j also
         System.setProperty("openjpa.Log", "log4j");
 
+        final boolean embedded = System.getProperty("openejb.logging.embedded", "false").equalsIgnoreCase("true");
+
         File confDir = SystemInstance.get().getBase().getDirectory("conf");
         File loggingPropertiesFile = new File(confDir, LOGGING_PROPERTIES_FILE);
-        if (confDir.exists()) {
+        if (!embedded && confDir.exists()) {
             if (loggingPropertiesFile.exists()) {
                 // load logging.properties file
                 BufferedInputStream bis = new BufferedInputStream(new FileInputStream(loggingPropertiesFile));