Repository: activemq Updated Branches: refs/heads/activemq-5.13.x ef965b5b4 -> b47d544f3
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. (cherry picked from commit e0ad700f2c886527614a7591f4ca68a897bb8063) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b47d544f Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b47d544f Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b47d544f Branch: refs/heads/activemq-5.13.x Commit: b47d544f3f64b28748d6e7edee1b153a3dbfde37 Parents: ef965b5 Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Thu Jan 28 21:09:52 2016 +0000 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Thu Jan 28 21:12:55 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/b47d544f/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/b47d544f/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
