r9857 - helma/helma/trunk/src/helma/framework/core

Author: hannes
Date: 2009-09-08 21:51:28 +0200 (Tue, 08 Sep 2009)
New Revision: 9857

Modified:
   helma/helma/trunk/src/helma/framework/core/Application.java
Log:
Use TransientNode for app data node and prevent a bug where the helma logdir property breaks log4j.


Details at http://dev.helma.org/trac/helma/changeset/9857

Modified: helma/helma/trunk/src/helma/framework/core/Application.java
===================================================================
--- helma/helma/trunk/src/helma/framework/core/Application.java	2009-09-08 19:48:08 UTC (rev 9856)
+++ helma/helma/trunk/src/helma/framework/core/Application.java	2009-09-08 19:51:28 UTC (rev 9857)
@@ -431,7 +431,7 @@
             nmgr.init(dbDir.getAbsoluteFile(), props);
 
             // create the app cache node exposed as app.data
-            cachenode = new Node("app", null, getWrappedNodeManager());
+            cachenode = new TransientNode("app");
 
             // create and init session manager
             String sessionMgrImpl = props.getProperty("sessionManagerImpl",
@@ -1889,12 +1889,17 @@
                 }
             }
 
-            logDir = props.getProperty("logdir", "log");
-            if (System.getProperty("helma.logdir") == null) {
-                // set up helma.logdir system property in case we're using it
-                // FIXME: this sets a global System property, should be per-app
-                File dir = new File(logDir);
-                System.setProperty("helma.logdir", dir.getAbsolutePath());
+            String loggerFactory = props.getProperty("loggerFactory", "helma.util.Logging");
+            if ("helma.util.Logging".equals(loggerFactory)) {
+                logDir = props.getProperty("logdir", "log");
+                if (System.getProperty("helma.logdir") == null) {
+                    // set up helma.logdir system property in case we're using it
+                    // FIXME: this sets a global System property, should be per-app
+                    File dir = new File(logDir);
+                    System.setProperty("helma.logdir", dir.getAbsolutePath());
+                }
+            } else {
+                logDir = null;
             }
 
             // set log level for event log in case it is a helma.util.Logger