From 039c2310c41349aa7ef82364c6f2621dde50d133 Mon Sep 17 00:00:00 2001 From: "Adrian T. Co" Date: Sat, 30 Sep 2006 11:54:01 +0000 Subject: [PATCH] Backported fix from 4.1 branch for: https://issues.apache.org/activemq/browse/AMQ-948 git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@451583 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/activemq/console/Main.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 1babba68d2..7a036c69a7 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 @@ -201,22 +201,25 @@ public class Main { if(activeMQHome==null){ // guess from the location of the jar - URL url = Main.class.getClassLoader().getResource("org/apache/activemq/broker/Main.class"); + URL url = Main.class.getClassLoader().getResource("org/apache/activemq/console/Main.class"); if (url != null) { try { JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); url = jarConnection.getJarFileURL(); URI baseURI = new URI(url.toString()).resolve(".."); activeMQHome = new File(baseURI).getCanonicalFile(); + System.setProperty("activemq.home",activeMQHome.getAbsolutePath()); } catch (Exception ignored) { } } } if(activeMQHome==null){ - activeMQHome = new File("."); + activeMQHome = new File("../."); + System.setProperty("activemq.home",activeMQHome.getAbsolutePath()); } } + return activeMQHome; } }