geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r745252 - /geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
Date Tue, 17 Feb 2009 20:43:52 GMT
Author: gdamour
Date: Tue Feb 17 20:43:52 2009
New Revision: 745252

URL: http://svn.apache.org/viewvc?rev=745252&view=rev
Log:
Set system property 'activemq.geronimo.home.url' to the root server instance. This is more
handy as this system property is used to locate the resource 'var/config/config-substitutions.properties'
which is a per server instance resource.

Modified:
    geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java?rev=745252&r1=745251&r2=745252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
(original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
Tue Feb 17 20:43:52 2009
@@ -81,7 +81,9 @@
                 System.setProperty("activemq.brokerName", brokerName);
                 System.setProperty("activemq.home", new File(baseDir).toString());
                 System.setProperty("activemq.data", new File(dataDir).toString());
-                System.setProperty("activemq.geronimo.home.url", new File(serverInfo.getBaseDirectory()).toURI().toURL().toString());
+                
+                File geronimoHomeURL = serverInfo.resolveServer("./");
+                System.setProperty("activemq.geronimo.home.url", geronimoHomeURL.toURI().toURL().toString());
                 brokerFactory.afterPropertiesSet();                
             }
             brokerService = brokerFactory.getBroker();



Mime
View raw message