svn commit: r566177 - /activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java

[js...@apache.org]

Author: jstrachan
Date: Wed Aug 15 07:12:46 2007
New Revision: 566177

URL: http://svn.apache.org/viewvc?view=rev&rev=566177
Log:
Attempt to fix AMQ-1363, to no avail

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

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?view=diff&rev=566177&r1=566176&r2=566177
==============================================================================
--- 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 Aug 15 07:12:46 2007
@@ -61,6 +61,11 @@
         // Parse for extension directory option
         app.parseExtensions(tokens);
 
+		// lets add the conf directory first, to find the log4j.properties just in case its not 
+		// in the activemq.classpath system property or some jar incorrectly includes one
+		File confDir = new File(app.getActiveMQBase(), "conf");
+		app.addClassPath(confDir);
+
         // Add the following to the classpath:
         //
         // ${activemq.base}/conf
@@ -205,6 +210,7 @@
         System.out.println("ACTIVEMQ_BASE: " + getActiveMQBase());
 
         ClassLoader cl = getClassLoader();
+		Thread.currentThread().setContextClassLoader(cl);
 
         // Use reflection to run the task.
         try {