From b6dc0084d1ba75116fe832adaea231f2ba71aa1a Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 16 Aug 2009 20:32:47 +0000
Subject: QPID-2051: Update startup scripts to disable the Log4J default
 initialisation process. Add QpidLog4JConfigurator that validates the XML file
 before allowing it to be applied. Alter startup behaviour to shut the broker
 down if the specified log4j XML file is present present but invalid. Uses the
 -Damqj.logging.level(defaults to info) with the log4j.properties file in the
 broker jar if the XML file is not found.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@804765 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/broker/bin/qpid-server     | 8 +++++++-
 qpid/java/broker/bin/qpid-server.bat | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 qpid/java/broker/bin/qpid-server.bat

(limited to 'qpid/java/broker/bin')

diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index e5a9e998e2..7482ad63ef 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -23,6 +23,12 @@ if [ -z "$QPID_HOME" ]; then
     export PATH=${PATH}:${QPID_HOME}/bin
 fi
 
+if [ -z "$QPID_LOG4J_SETTINGS" ]; then
+    # Disable the Log4J default initialization process, allowing the broker to 
+    # perform the configuration using etc/log4j.xml
+    QPID_LOG4J_SETTINGS="-Dlog4j.defaultInitOverride=true"
+fi
+
 # Set classpath to include Qpid jar with all required jars in manifest
 QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar
 
@@ -34,6 +40,6 @@ export JAVA=java \
        QPID_CLASSPATH=$QPID_LIBS \
        QPID_RUN_LOG=2
 
-QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32"
+QPID_OPTS="$QPID_OPTS $QPID_LOG4J_SETTINGS -Damqj.read_write_pool_size=32"
 
 . qpid-run org.apache.qpid.server.Main "$@"
diff --git a/qpid/java/broker/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat
old mode 100755
new mode 100644
index 2687baa111..7fff183192
--- a/qpid/java/broker/bin/qpid-server.bat
+++ b/qpid/java/broker/bin/qpid-server.bat
@@ -20,6 +20,9 @@
 @echo off
 REM Script to run the Qpid Java Broker
 
+rem stop the Log4J default initialisation, let the broker do it using etc/log4j.xml
+if "%QPID_LOG4J_SETTINGS%" == "" set QPID_LOG4J_SETTINGS=-Dlog4j.defaultInitOverride=true
+
 rem Guess QPID_HOME if not defined
 set CURRENT_DIR=%cd%
 if not "%QPID_HOME%" == "" goto gotHome
@@ -194,7 +197,7 @@ rem QPID_OPTS intended to hold any -D props for use
 rem user must enclose any value for QPID_OPTS in double quotes
 :runCommand
 set MODULE_JARS=%QPID_MODULE_JARS%
-set COMMAND="%JAVA_HOME%\bin\java" %JAVA_VM% %JAVA_MEM% %JAVA_GC% %QPID_OPTS% %SYSTEM_PROPS% -cp "%CLASSPATH%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS%
+set COMMAND="%JAVA_HOME%\bin\java" %JAVA_VM% %JAVA_MEM% %JAVA_GC% %QPID_OPTS% %QPID_LOG4J_SETTINGS% %SYSTEM_PROPS% -cp "%CLASSPATH%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS%
 
 if "%debug%" == "true" echo %CLASSPATH%;%LAUNCH_JAR%;%MODULE_JARS%
 if "%debug%" == "true" echo %COMMAND%
-- 
cgit v1.2.1