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 | 3c110ac0ec200ae998bbbe0ebd474e432bbe98f1 (patch) | |
| tree | 81533f42d7c94f40ac6574404cbbe45264aae93b /java/broker/bin/qpid-server | |
| parent | 744e54e175d17a369ee7af9aecfc5f318f589332 (diff) | |
| download | qpid-python-3c110ac0ec200ae998bbbe0ebd474e432bbe98f1.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/qpid@805188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/bin/qpid-server')
| -rwxr-xr-x | java/broker/bin/qpid-server | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index 7482ad63ef..e5a9e998e2 100755 --- a/java/broker/bin/qpid-server +++ b/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 "$@" |