You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2016/01/28 22:12:23 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6138
Repository: activemq
Updated Branches:
refs/heads/master eac005a37 -> e0ad700f2
https://issues.apache.org/jira/browse/AMQ-6138
Adding ACTIVEMQ_USER_CLASSPATH to make the ActiveMQ classpath more
extendable by users. Also fixinng the classpath parsing to use the
right path separator dependening on the environment.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e0ad700f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e0ad700f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e0ad700f
Branch: refs/heads/master
Commit: e0ad700f2c886527614a7591f4ca68a897bb8063
Parents: eac005a
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Thu Jan 28 21:09:52 2016 +0000
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Thu Jan 28 21:12:10 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/activemq/console/Main.java | 3 ++-
assembly/src/release/bin/activemq | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/e0ad700f/activemq-console/src/main/java/org/apache/activemq/console/Main.java
----------------------------------------------------------------------
diff --git a/activemq-console/src/main/java/org/apache/activemq/console/Main.java b/activemq-console/src/main/java/org/apache/activemq/console/Main.java
index 67c2562..4be67a1 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/Main.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/Main.java
@@ -271,7 +271,7 @@ public class Main {
public void addClassPathList(String fileList) {
if (fileList != null && fileList.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(fileList, ";");
+ StringTokenizer tokenizer = new StringTokenizer(fileList, File.pathSeparator);
while (tokenizer.hasMoreTokens()) {
addClassPath(new File(tokenizer.nextToken()));
}
@@ -320,6 +320,7 @@ public class Main {
// Sort the jars so that classpath built is consistently in the same
// order. Also allows us to use jar names to control classpath order.
Arrays.sort(files, new Comparator<File>() {
+ @Override
public int compare(File f1, File f2) {
return f1.getName().compareTo(f2.getName());
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/e0ad700f/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index e7904a1..261493b 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -109,7 +109,14 @@ if [ -z "$ACTIVEMQ_BASE" ] ; then
ACTIVEMQ_BASE="$ACTIVEMQ_HOME"
fi
-ACTIVEMQ_CLASSPATH="$ACTIVEMQ_BASE/../lib/"
+# Configure user specified classpath here or externally using this variable
+if [ -z "$ACTIVEMQ_USER_CLASSPATH" ] ; then
+ ACTIVEMQ_USER_CLASSPATH=""
+fi
+
+# ActiveMQ Classpath configuration
+ACTIVEMQ_CLASSPATH="$ACTIVEMQ_BASE/../lib/:$ACTIVEMQ_USER_CLASSPATH"
+
# Active MQ configuration directory
if [ -z "$ACTIVEMQ_CONF" ] ; then