Author: dblevins
Date: Fri Jun 20 19:54:17 2008
New Revision: 670126
URL: http://svn.apache.org/viewvc?rev=670126&view=rev
Log:
OPENEJB-826: Better detection of testing and embedded scenarios
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java?rev=670126&r1=670125&r2=670126&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
Fri Jun 20 19:54:17 2008
@@ -59,6 +59,7 @@
openejb = new OpenEJBInstance();
if (openejb.isInitialized()) return;
SystemInstance.init(properties);
+ SystemInstance.get().setProperty("openejb.embedded", "true");
openejb.init(properties);
if (properties.getProperty(OPENEJB_EMBEDDED_REMOTABLE,
"false").equalsIgnoreCase("true")){
bootServerServices();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java?rev=670126&r1=670125&r2=670126&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
Fri Jun 20 19:54:17 2008
@@ -53,9 +53,7 @@
String defaultValue = "org.apache.openejb";
try {
SystemInstance system = SystemInstance.get();
- FileUtils base = system.getBase();
- File confDir = base.getDirectory("conf");
- if (!confDir.exists()) {
+ if (system.getProperty("openejb.embedded") != null){
defaultValue = "org.apache.openejb.embedded";
}
} catch (Exception ignored) {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties?rev=670126&r1=670125&r2=670126&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/logging.properties
Fri Jun 20 19:54:17 2008
@@ -1,3 +1,11 @@
+# ---------------------------------------------------
+# The configuration below is good for standalone
+# scenarios. There's a log file and everything is
+# time stamped and settings are slightly more verbose.
+#
+# For embedded scenarios the commented out configuration
+# below is a much better fit.
+#
log4j.category.OpenEJB = warn,R
log4j.category.OpenEJB.server = info
log4j.category.OpenEJB.startup = info
@@ -10,8 +18,8 @@
log4j.category.org.apache.activemq = error,R
log4j.category.org.apache.geronimo = error,R
log4j.category.openjpa = error,R
-log4j.category.axis = info,R
-log4j.category.axis2 = info,R
+log4j.category.axis = info,R
+log4j.category.axis2 = info,R
log4j.category.cxf = info,R
log4j.appender.R=org.apache.log4j.RollingFileAppender
@@ -26,4 +34,30 @@
log4j.appender.TX.MaxFileSize=1000KB
log4j.appender.TX.MaxBackupIndex=100
log4j.appender.TX.File=logs/transaction.log
-log4j.appender.TX.layout.ConversionPattern=%d - %-5p - %m%n
\ No newline at end of file
+log4j.appender.TX.layout.ConversionPattern=%d - %-5p - %m%n
+
+
+## ---------------------------------------------------
+## Nice alternate configuration for embedded testing
+##
+## Output is slightly more terse and sent to System.out
+##
+## Simply comment out the above declarations and
+## uncomment the configuration below.
+##
+#
+#log4j.rootLogger = fatal,C
+#log4j.category.OpenEJB = warn
+#log4j.category.OpenEJB.server = info
+#log4j.category.OpenEJB.startup = info
+#log4j.category.OpenEJB.startup.service = warn
+#log4j.category.OpenEJB.startup.config = info
+#log4j.category.OpenEJB.hsql = info
+#log4j.category.CORBA-Adapter = info
+#log4j.category.Transaction = warn
+#log4j.category.org.apache.activemq = error
+#log4j.category.org.apache.geronimo = error
+#log4j.category.openjpa = error
+#
+#log4j.appender.C = org.apache.log4j.ConsoleAppender
+#log4j.appender.C.layout = org.apache.log4j.SimpleLayout
