You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/15 17:27:46 UTC
svn commit: r1244568 -
/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Author: rmannibucau
Date: Wed Feb 15 16:27:46 2012
New Revision: 1244568
URL: http://svn.apache.org/viewvc?rev=1244568&view=rev
Log:
tomee-embedded should use our logging - note: for arquillian which uses jul it will be ignored
Modified:
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1244568&r1=1244567&r2=1244568&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Wed Feb 15 16:27:46 2012
@@ -114,18 +114,21 @@ public class Container {
copyFileTo(conf, "catalina.policy");
copyTemplateTo(conf, "catalina.properties");
copyFileTo(conf, "context.xml");
- copyFileTo(conf, "logging.properties");
copyFileTo(conf, "openejb.xml");
copyFileTo(conf, "server.xml");
copyFileTo(conf, "tomcat-users.xml");
copyFileTo(conf, "web.xml");
// Need to use JULI so log messages from the tests are visible
+ // using openejb logging conf in embedded mode
+ /* if we use our config (Logger.configure()) don't override it
+ copyFileTo(conf, "logging.properties");
System.setProperty("java.util.logging.manager", "org.apache.juli.ClassLoaderLogManager");
final File logging = new File(conf, "logging.properties");
if (logging.exists()) {
System.setProperty("java.util.logging.config.file", logging.getAbsolutePath());
}
+ */
System.setProperty("catalina.base", base.getAbsolutePath());
// Trigger loading of catalina.properties