[hornetq-commits] JBoss hornetq SVN: r8935 - in trunk/src: config/jboss-6/non-clustered and 1 other directories.
Author: clebert.suconic(a)jboss.com
Date: 2010-03-18 14:37:05 -0400 (Thu, 18 Mar 2010)
New Revision: 8935
Modified:
trunk/src/config/jboss-6/clustered/hornetq-jboss-beans.xml
trunk/src/config/jboss-6/non-clustered/hornetq-jboss-beans.xml
trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java
Log:
AS6 integration changes
Modified: trunk/src/config/jboss-6/clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/jboss-6/clustered/hornetq-jboss-beans.xml 2010-03-18 15:25:10 UTC
(rev 8934)
+++ trunk/src/config/jboss-6/clustered/hornetq-jboss-beans.xml 2010-03-18 18:37:05 UTC
(rev 8935)
@@ -9,7 +9,9 @@
</bean>
<!-- The core configuration -->
- <bean name="Configuration"
class="org.hornetq.core.config.impl.FileConfiguration"/>
+ <bean name="Configuration"
class="org.hornetq.core.config.impl.FileConfiguration">
+ <property
name="configurationUrl">${jboss.server.home.url}${/}deploy${/}hornetq${/}hornetq-configuration.xml</property>
+ </bean>
<!-- The security manager -->
<bean name="HornetQSecurityManager"
class="org.hornetq.integration.jboss.security.JBossASSecurityManager">
Modified: trunk/src/config/jboss-6/non-clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/jboss-6/non-clustered/hornetq-jboss-beans.xml 2010-03-18 15:25:10 UTC
(rev 8934)
+++ trunk/src/config/jboss-6/non-clustered/hornetq-jboss-beans.xml 2010-03-18 18:37:05 UTC
(rev 8935)
@@ -9,7 +9,9 @@
</bean>
<!-- The core configuration -->
- <bean name="Configuration"
class="org.hornetq.core.config.impl.FileConfiguration"/>
+ <bean name="Configuration"
class="org.hornetq.core.config.impl.FileConfiguration">
+ <property
name="configurationUrl">${jboss.server.home.url}${/}deploy${/}hornetq${/}hornetq-configuration.xml</property>
+ </bean>
<!-- The security manager -->
<bean name="HornetQSecurityManager"
class="org.hornetq.integration.jboss.security.JBossASSecurityManager">
Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-03-18 15:25:10
UTC (rev 8934)
+++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-03-18 18:37:05
UTC (rev 8935)
@@ -16,6 +16,7 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
+import java.util.Properties;
import org.hornetq.core.deployers.impl.FileConfigurationParser;
import org.hornetq.core.logging.Logger;
@@ -59,8 +60,16 @@
{
return;
}
-
+
+
URL url = getClass().getClassLoader().getResource(configurationUrl);
+
+ if (url == null)
+ {
+ // The URL is outside of the classloader. Trying a pure url now
+ url = new URL(configurationUrl);
+ }
+
FileConfiguration.log.debug("Loading server configuration from " + url);
Reader reader = new InputStreamReader(url.openStream());