diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-08-17 22:28:01 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-08-17 22:28:01 +0000 |
| commit | d2a98d4dfc63fd606418f5bd433be514bbe20d01 (patch) | |
| tree | 7bc30cafe91f9c9e8f5c749502f052b3c68f0c24 /qpid/java/broker/bin | |
| parent | 37be358e76234f085ff5d6527acea5499e43cb12 (diff) | |
| download | qpid-python-d2a98d4dfc63fd606418f5bd433be514bbe20d01.tar.gz | |
QPID-2051: relax the parser validation to only halt startup on fatal-errors in the xml file, and relax the level-check to allow undefined system properties. Move the Log4J initialisation override inside Main instead of the startup scripts, and have it check for -Dlog4j.configuration first before engaging.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@805188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/bin')
| -rwxr-xr-x | qpid/java/broker/bin/qpid-server | 8 | ||||
| -rw-r--r-- | qpid/java/broker/bin/qpid-server.bat | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server index 7482ad63ef..e5a9e998e2 100755 --- a/qpid/java/broker/bin/qpid-server +++ b/qpid/java/broker/bin/qpid-server @@ -23,12 +23,6 @@ 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 @@ -40,6 +34,6 @@ export JAVA=java \ QPID_CLASSPATH=$QPID_LIBS \ QPID_RUN_LOG=2 -QPID_OPTS="$QPID_OPTS $QPID_LOG4J_SETTINGS -Damqj.read_write_pool_size=32" +QPID_OPTS="$QPID_OPTS -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 index 7fff183192..2687baa111 100644 --- a/qpid/java/broker/bin/qpid-server.bat +++ b/qpid/java/broker/bin/qpid-server.bat @@ -20,9 +20,6 @@ @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
@@ -197,7 +194,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% %QPID_LOG4J_SETTINGS% %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% %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%
|