mirror of https://github.com/apache/activemq.git
Allow defeat of auto include of $ACTIVEMQ_HOME/conf in classpath
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@368924 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
eef9202675
commit
4d7ea5ef6e
|
@ -54,6 +54,8 @@ public class Main {
|
||||||
private ClassLoader classLoader;
|
private ClassLoader classLoader;
|
||||||
private List extensions = new ArrayList(5);
|
private List extensions = new ArrayList(5);
|
||||||
|
|
||||||
|
private static boolean useDefExt = true;
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
Main app = new Main();
|
Main app = new Main();
|
||||||
|
|
||||||
|
@ -67,7 +69,7 @@ public class Main {
|
||||||
app.parseExtensions(tokens);
|
app.parseExtensions(tokens);
|
||||||
|
|
||||||
// Add default extension directories
|
// Add default extension directories
|
||||||
if(app.canUseExtdir()) {
|
if(useDefExt && app.canUseExtdir()) {
|
||||||
app.addExtensionDirectory(new File(app.getActiveMQHome(), "conf"));
|
app.addExtensionDirectory(new File(app.getActiveMQHome(), "conf"));
|
||||||
app.addExtensionDirectory(new File(app.getActiveMQHome(), "lib"));
|
app.addExtensionDirectory(new File(app.getActiveMQHome(), "lib"));
|
||||||
app.addExtensionDirectory(new File(new File(app.getActiveMQHome(), "lib"), "optional"));
|
app.addExtensionDirectory(new File(new File(app.getActiveMQHome(), "lib"), "optional"));
|
||||||
|
@ -147,7 +149,10 @@ public class Main {
|
||||||
}
|
}
|
||||||
|
|
||||||
addExtensionDirectory(extDir);
|
addExtensionDirectory(extDir);
|
||||||
|
} else if (token.equals("--noDefExt")) { // If token is --noDefExt option
|
||||||
|
useDefExt = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void runTaskClass(String taskClass, List tokens) throws Throwable {
|
public void runTaskClass(String taskClass, List tokens) throws Throwable {
|
||||||
|
|
Loading…
Reference in New Issue