activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: Move directory variables up (AMQ-6189)
Date Mon, 14 Mar 2016 21:48:06 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 69c5fd7d5 -> 8a44c08b1


Move directory variables up (AMQ-6189)

Setting ACTIVEMQ_CONF to a different value and not moving it up will result in login.config
being taken from the old location.
This commit fixes this by moving these variables above all places they are used in.

This closes #172


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8a44c08b
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8a44c08b
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8a44c08b

Branch: refs/heads/master
Commit: 8a44c08b137fd1b591a9fabd4760bd64938a4d17
Parents: 69c5fd7
Author: TomyLobo <stabelweb@gmx.de>
Authored: Thu Mar 3 20:26:48 2016 +0100
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Mon Mar 14 17:45:52 2016 -0400

----------------------------------------------------------------------
 assembly/src/release/bin/env | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8a44c08b/assembly/src/release/bin/env
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env
index 5825080..e467d7d 100644
--- a/assembly/src/release/bin/env
+++ b/assembly/src/release/bin/env
@@ -23,6 +23,13 @@
 # invoke the init-script without a argument an review help section "Configuration of this
script"
 # /etc/default/activemq <activemq user home>/.activemqrc <activemq installation
dir>/bin/env
 
+# Active MQ installation dirs
+# ACTIVEMQ_HOME="<Installationdir>/"
+# ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
+# ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf"
+# ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data"
+# ACTIVEMQ_TMP="$ACTIVEMQ_BASE/tmp"
+
 # Set jvm memory configuration (minimal/maximum amount of memory)
 ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
 
@@ -87,13 +94,6 @@ if [ -z "$ACTIVEMQ_KILL_MAXSECONDS" ]; then
     ACTIVEMQ_KILL_MAXSECONDS=30
 fi
 
-# Active MQ installation dirs
-# ACTIVEMQ_HOME="<Installationdir>/"
-# ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
-# ACTIVEMQ_CONF="$ACTIVEMQ_BASE/conf"
-# ACTIVEMQ_DATA="$ACTIVEMQ_BASE/data"
-# ACTIVEMQ_TMP="$ACTIVEMQ_BASE/tmp"
-
 # Configure a user with non root privileges, if no user is specified do not change user
 # (the entire activemq installation should be owned by this user)
 ACTIVEMQ_USER=""


Mime
View raw message