svn commit: r691771 - /ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

[doogie-3]

Author: doogie
Date: Wed Sep  3 14:03:35 2008
New Revision: 691771

URL: http://svn.apache.org/viewvc?rev=691771&view=rev
Log:
The defaults for several values were incorrect; if they weren't
specified in the properties file, then they would have the wrong
value.

Modified:
    ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java?rev=691771&r1=691770&r2=691771&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java Wed Sep  3 14:03:35 2008
@@ -518,19 +518,19 @@
             // base config directory
             baseConfig = System.getProperty("ofbiz.base.config");
             if (baseConfig == null) {
-                baseConfig = ofbizHome + "/" + props.getProperty("ofbiz.base.config", "base/config");
+                baseConfig = ofbizHome + "/" + props.getProperty("ofbiz.base.config", "framework/base/config");
             }
 
             // base schema directory
             baseDtd = System.getProperty("ofbiz.base.schema");
             if (baseDtd == null) {
-                baseDtd = ofbizHome + "/" + props.getProperty("ofbiz.base.schema", "base/dtd");
+                baseDtd = ofbizHome + "/" + props.getProperty("ofbiz.base.schema", "framework/base/dtd");
             }
 
             // base lib directory
             baseLib = System.getProperty("ofbiz.base.lib");
             if (baseLib == null) {
-                baseLib = ofbizHome + "/" + props.getProperty("ofbiz.base.lib", "base/lib");
+                baseLib = ofbizHome + "/" + props.getProperty("ofbiz.base.lib", "framework/base/lib");
             }
 
             // base jar file
@@ -558,7 +558,7 @@
             // log directory
             logDir = System.getProperty("ofbiz.log.dir");
             if (logDir == null) {
-                logDir = ofbizHome + "/" + props.getProperty("ofbiz.log.dir", "logs");
+                logDir = ofbizHome + "/" + props.getProperty("ofbiz.log.dir", "runtime/logs");
             }
 
             // container configuration
@@ -597,11 +597,11 @@
             // set the Derby system home
             String derbyPath = System.getProperty("derby.system.home");
             if (derbyPath == null) {
-                derbyPath = props.getProperty("derby.system.home", "data/derby");
+                derbyPath = props.getProperty("derby.system.home", "runtime/data/derby");
             }
             System.setProperty("derby.system.home", derbyPath);
 
-            // set the property to tell Log4J to use debug.properties
+            // set the property to tell Log4J to use log4j.xml
             String log4jConfig = System.getProperty("log4j.configuration");
             if (log4jConfig == null) {
                 log4jConfig = props.getProperty("log4j.configuration");