svn commit: r1292470 - in /activemq/trunk: activemq-console/src/main/java/org/apache/activemq/console/Main.java assembly/src/release/bin/activemq

[tabish]

Author: tabish
Date: Wed Feb 22 19:41:48 2012
New Revision: 1292470

URL: http://svn.apache.org/viewvc?rev=1292470&view=rev
Log:
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.

Modified:
    
activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java
    activemq/trunk/assembly/src/release/bin/activemq

Modified: 
activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java?rev=1292470&r1=1292469&r2=1292470&view=diff
==============================================================================
--- 
activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java
 (original)
+++ 
activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java
 Wed Feb 22 19:41:48 2012
@@ -241,7 +241,7 @@ public class Main {
 
         System.out.println("ACTIVEMQ_HOME: " + getActiveMQHome());
         System.out.println("ACTIVEMQ_BASE: " + getActiveMQBase());
-        System.out.println("ACTIVEMQ_CONFIG: " + getActiveMQConfig());
+        System.out.println("ACTIVEMQ_CONF: " + getActiveMQConfig());
         System.out.println("ACTIVEMQ_DATA: " + getActiveMQDataDir());
 
         ClassLoader cl = getClassLoader();

Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: 
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1292470&r1=1292469&r2=1292470&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Wed Feb 22 19:41:48 2012
@@ -91,7 +91,13 @@ fi
 
 # Active MQ configuration directory
 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
 
 # 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
 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
 
 if [ -z "$ACTIVEMQ_TMP" ] ; then