From edcf5d8707de3b59f46a8e8dde3723d203f3724d Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Thu, 17 Sep 2009 17:33:15 +0000 Subject: [PATCH] merging logging.properties git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@816297 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/release/bin/activemq | 2 +- assembly/src/release/bin/activemq.bat | 2 +- assembly/src/release/bin/linux-x86-32/wrapper.conf | 2 +- assembly/src/release/bin/linux-x86-64/wrapper.conf | 2 +- assembly/src/release/bin/macosx/wrapper.conf | 2 +- assembly/src/release/bin/win32/wrapper.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq index 6909276705..349726ec62 100755 --- a/assembly/src/release/bin/activemq +++ b/assembly/src/release/bin/activemq @@ -127,7 +127,7 @@ if $cygwin; then fi if [ -z "$ACTIVEMQ_OPTS" ] ; then - ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=${ACTIVEMQ_BASE}/logging.properties" + ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties" fi if [ -z "$SUNJMX" ] ; then diff --git a/assembly/src/release/bin/activemq.bat b/assembly/src/release/bin/activemq.bat index 4a3dbc2aae..53c7345deb 100755 --- a/assembly/src/release/bin/activemq.bat +++ b/assembly/src/release/bin/activemq.bat @@ -71,7 +71,7 @@ echo. if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME% -if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=${ACTIVEMQ_BASE}\logging.properties +if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false diff --git a/assembly/src/release/bin/linux-x86-32/wrapper.conf b/assembly/src/release/bin/linux-x86-32/wrapper.conf index e78e4c93d9..4a03382588 100644 --- a/assembly/src/release/bin/linux-x86-32/wrapper.conf +++ b/assembly/src/release/bin/linux-x86-32/wrapper.conf @@ -51,7 +51,7 @@ wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.k wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts wrapper.java.additional.7=-Dcom.sun.management.jmxremote wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true -wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties +wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties # Uncomment to enable jmx #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 diff --git a/assembly/src/release/bin/linux-x86-64/wrapper.conf b/assembly/src/release/bin/linux-x86-64/wrapper.conf index e78e4c93d9..4a03382588 100644 --- a/assembly/src/release/bin/linux-x86-64/wrapper.conf +++ b/assembly/src/release/bin/linux-x86-64/wrapper.conf @@ -51,7 +51,7 @@ wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.k wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts wrapper.java.additional.7=-Dcom.sun.management.jmxremote wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true -wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties +wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties # Uncomment to enable jmx #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 diff --git a/assembly/src/release/bin/macosx/wrapper.conf b/assembly/src/release/bin/macosx/wrapper.conf index 222d9c645c..b2a3f80fc7 100644 --- a/assembly/src/release/bin/macosx/wrapper.conf +++ b/assembly/src/release/bin/macosx/wrapper.conf @@ -51,7 +51,7 @@ wrapper.java.additional.5=-Djavax.net.ssl.keyStore=%ACTIVEMQ_BASE%/conf/broker.k wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts wrapper.java.additional.7=-Dcom.sun.management.jmxremote wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true -wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties +wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties # Uncomment to enable jmx #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 diff --git a/assembly/src/release/bin/win32/wrapper.conf b/assembly/src/release/bin/win32/wrapper.conf index cf774ba5a7..9982d7310d 100644 --- a/assembly/src/release/bin/win32/wrapper.conf +++ b/assembly/src/release/bin/win32/wrapper.conf @@ -51,7 +51,7 @@ wrapper.java.additional.5=-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker. wrapper.java.additional.6=-Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts" wrapper.java.additional.7=-Dcom.sun.management.jmxremote wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true -wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties +wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties # Uncomment to enable remote jmx #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616