[jboss-cvs] JBoss Messaging SVN: r4173 - in trunk: src/etc and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2008-05-12 10:57:22 -0400 (Mon, 12 May 2008)
New Revision: 4173

Modified:
   trunk/build-messaging.xml
   trunk/src/etc/jbm-standalone-beans.xml
   trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
Log:
changed beans config to inject the hostname into the neaming service from the configuration object. The property java.rmi.server.hostname is also set the same host name.

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-05-12 12:12:45 UTC (rev 4172)
+++ trunk/build-messaging.xml	2008-05-12 14:57:22 UTC (rev 4173)
@@ -373,6 +373,7 @@
             <include name="org/jboss/messaging/core/message/**/*.class"/>
             <include name="org/jboss/messaging/core/version/**/*.class"/>
             <include name="org/jboss/messaging/core/server/JournalType.class"/>
+            <include name="org/jboss/messaging/core/server/ServerMessage.class"/>
          </fileset>
       </jar>
 

Modified: trunk/src/etc/jbm-standalone-beans.xml
===================================================================
--- trunk/src/etc/jbm-standalone-beans.xml	2008-05-12 12:12:45 UTC (rev 4172)
+++ trunk/src/etc/jbm-standalone-beans.xml	2008-05-12 14:57:22 UTC (rev 4173)
@@ -7,9 +7,9 @@
    <bean name="Main" class="org.jnp.server.Main">
       <property name="namingInfo"><inject bean="Naming"/> </property>
       <property name="port">1099</property>
-      <property name="bindAddress">localhost</property>
+      <property name="bindAddress"><inject bean="Configuration" property="host"/></property>
       <property name="rmiPort">1098</property>
-      <property name="rmiBindAddress">localhost</property>
+      <property name="rmiBindAddress"><inject bean="Configuration" property="host"/></property>
    </bean>
 
    <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2008-05-12 12:12:45 UTC (rev 4172)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2008-05-12 14:57:22 UTC (rev 4173)
@@ -65,6 +65,9 @@
       
       host = getString(e, "remoting-host", "localhost");
 
+      if (System.getProperty("java.rmi.server.hostname") == null)
+         System.setProperty("java.rmi.server.hostname", host);
+
       port = getInteger(e, "remoting-bind-address", DEFAULT_REMOTING_PORT);
       
       timeout = getInteger(e, "remoting-timeout", 5);