Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-3248 

For backwards compat let the vars ACTIVEMQ_CONFIG_DIR and ACTIVEMQ_DATA_DIR still apply if the new ACTIVEMQ_CONF and ACTIVEMQ_DATA aren't set.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292470 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-02-22 19:41:48 +00:00
parent a7873fc8ce
commit 757107d7aa
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-console/src/main/java/org/apache/activemq/console/Main.java
View File

@ -241,7 +241,7 @@ public class Main {
System.out.println("ACTIVEMQ_HOME: " + getActiveMQHome()); System.out.println("ACTIVEMQ_HOME: " + getActiveMQHome());
System.out.println("ACTIVEMQ_BASE: " + getActiveMQBase()); System.out.println("ACTIVEMQ_BASE: " + getActiveMQBase());
System.out.println("ACTIVEMQ_CONFIG: " + getActiveMQConfig()); System.out.println("ACTIVEMQ_CONF: " + getActiveMQConfig());
System.out.println("ACTIVEMQ_DATA: " + getActiveMQDataDir()); System.out.println("ACTIVEMQ_DATA: " + getActiveMQDataDir());
ClassLoader cl = getClassLoader(); ClassLoader cl = getClassLoader();

16
assembly/src/release/bin/activemq
View File

@ -91,7 +91,13 @@ fi
# Active MQ configuration directory # Active MQ configuration directory
if [ -z "$ACTIVEMQ_CONF" ] ; then if [ -z "$ACTIVEMQ_CONF" ] ; then
ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf"
# For backwards compat with old variables we let ACTIVEMQ_CONFIG_DIR set ACTIVEMQ_CONF
if [ -z "$ACTIVEMQ_CONFIG_DIR" ] ; then
ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf"
else
ACTIVEMQ_CONF="$ACTIVEMQ_CONFIG_DIR"
fi
fi fi
# Configure a user with non root priviledges, if no user is specified do not change user # Configure a user with non root priviledges, if no user is specified do not change user
@ -101,7 +107,13 @@ fi
# Active MQ data directory # Active MQ data directory
if [ -z "$ACTIVEMQ_DATA" ] ; then if [ -z "$ACTIVEMQ_DATA" ] ; then
ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data"
# For backwards compat with old variables we let ACTIVEMQ_DATA_DIR set ACTIVEMQ_DATA
if [ -z "$ACTIVEMQ_DATA_DIR" ] ; then
ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data"
else
ACTIVEMQ_DATA="$ACTIVEMQ_DATA_DIR"
fi
fi fi
if [ -z "$ACTIVEMQ_TMP" ] ; then if [ -z "$ACTIVEMQ_TMP" ] ; then