Author: jacopoc
Date: Thu Sep 4 12:40:15 2014
New Revision: 1622468
URL: http://svn.apache.org/r1622468
Log:
Removed some obsolete properties set at startup.
Modified:
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/both.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/install.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/rmi.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/testlist.properties
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java Thu Sep 4
12:40:15 2014
@@ -151,13 +151,6 @@ public class Config {
String derbyPath = getProp(props, "derby.system.home",
"runtime/data/derby");
System.setProperty("derby.system.home", derbyPath);
- // set the property to tell Log4J to use log4j.xml
- String log4jConfig = getProp(props, "log4j.configuration",
"log4j.xml");
-
- // set the log4j configuration property so we don't pick up one inside
jars by
- // mistake
- System.setProperty("log4j.configuration", log4jConfig);
-
// check for shutdown hook
if (System.getProperty("ofbiz.enable.hook") != null &&
System.getProperty("ofbiz.enable.hook").length() > 0) {
useShutdownHook =
"true".equalsIgnoreCase(System.getProperty("ofbiz.enable.hook"));
@@ -185,9 +178,6 @@ public class Config {
// get the splash logo
splashLogo = props.getProperty("ofbiz.start.splash.logo", null);
- // set the property to tell Jetty to use 2.4 SessionListeners
-
System.setProperty("org.mortbay.jetty.servlet.AbstractSessionManager.24SessionDestroyed",
"true");
-
// set the default locale
String localeString = props.getProperty("ofbiz.locale.default");
if (localeString != null && localeString.length() > 0) {
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/both.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/both.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/both.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/both.properties Thu
Sep 4 12:40:15 2014
@@ -60,8 +60,5 @@ ofbiz.auto.shutdown=false
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=false
Modified:
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/install.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/install.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/install.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/install.properties Thu
Sep 4 12:40:15 2014
@@ -54,9 +54,6 @@ ofbiz.auto.shutdown=true
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=true
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties Thu
Sep 4 12:40:15 2014
@@ -63,8 +63,5 @@ ofbiz.auto.shutdown=false
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=true
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/pos.properties Thu Sep
4 12:40:15 2014
@@ -60,8 +60,5 @@ ofbiz.auto.shutdown=false
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=false
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/rmi.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/rmi.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/rmi.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/rmi.properties Thu Sep
4 12:40:15 2014
@@ -54,8 +54,5 @@ ofbiz.start.loader1.loaders=rmi
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=true
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/setup.properties Thu
Sep 4 12:40:15 2014
@@ -54,8 +54,5 @@ ofbiz.start.loader1.loaders=setup
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=true
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/start.properties Thu
Sep 4 12:40:15 2014
@@ -63,9 +63,6 @@ ofbiz.start.loader1.loaders=main,rmi
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=true
Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties Thu
Sep 4 12:40:15 2014
@@ -57,9 +57,6 @@ ofbiz.instrumenterFile=runtime/logs/cobe
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# -- The default locale for this OFBiz instance.
ofbiz.locale.default=en
Modified:
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/testlist.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/testlist.properties?rev=1622468&r1=1622467&r2=1622468&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/testlist.properties
(original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/testlist.properties
Thu Sep 4 12:40:15 2014
@@ -54,8 +54,5 @@ ofbiz.auto.shutdown=true
# --- Default Derby system home directory
#derby.system.home=runtime/data/derby
-# --- By default we will find base/config/debug.properties and point to there
-#log4j.configuration=log4j.xml
-
# --- Tells AWT (i.e. JasperReports/FOP/etc) to not require a head (X11)
java.awt.headless=true
