[jboss-cvs] JBossAS SVN: r87099 - in trunk: server/src/etc/conf/all/bootstrap and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 9 16:30:39 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-04-09 16:30:39 -0400 (Thu, 09 Apr 2009)
New Revision: 87099
Modified:
trunk/cluster/src/etc/hajndi-jboss-beans.xml
trunk/server/src/etc/conf/all/bootstrap/bindings.xml
Log:
[JBAS-6356] Configure HA-JNDI automatic discovery socket via ServiceBindingManager
Modified: trunk/cluster/src/etc/hajndi-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/hajndi-jboss-beans.xml 2009-04-09 18:28:02 UTC (rev 87098)
+++ trunk/cluster/src/etc/hajndi-jboss-beans.xml 2009-04-09 20:30:39 UTC (rev 87099)
@@ -57,12 +57,29 @@
<!-- A flag to disable the auto discovery via multicast -->
<property name="discoveryDisabled">false</property>
+
<!-- Set the auto-discovery bootstrap multicast bind address. If not
specified and a BindAddress is specified, the BindAddress will be used. -->
+
<property name="autoDiscoveryBindAddress">${jboss.bind.address}</property>
- <!-- Multicast Address and group port used for auto-discovery -->
- <property name="autoDiscoveryAddress">${jboss.partition.udpGroup:230.0.0.4}</property>
- <property name="autoDiscoveryGroup">1102</property>
+
+ <!-- Multicast Address and group port used for auto-discovery -->
+ <property name="autoDiscoveryAddress">
+ <!-- Get the multicast address from the ServiceBindingManager -->
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>jboss:service=HAJNDI</parameter>
+ <parameter>AutoDiscoveryMulticastAddress</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </property>
+ <property name="autoDiscoveryGroup">
+ <!-- Get the port from the ServiceBindingManager -->
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss:service=HAJNDI</parameter>
+ <parameter>AutoDiscoveryPort</parameter>
+ </value-factory>
+ </property>
+
<!-- The TTL (time-to-live) for autodiscovery IP multicast packets -->
<property name="autoDiscoveryTTL">16</property>
Modified: trunk/server/src/etc/conf/all/bootstrap/bindings.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/bindings.xml 2009-04-09 18:28:02 UTC (rev 87098)
+++ trunk/server/src/etc/conf/all/bootstrap/bindings.xml 2009-04-09 20:30:39 UTC (rev 87099)
@@ -170,6 +170,25 @@
<property name="port">1101</property>
</bean>
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">jboss:service=HAJNDI</property>
+ <property name="bindingName">AutoDiscoveryMulticastAddress</property>
+ <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
+ <!-- This address should not be changed between different
+ binding sets; all nodes need to listen on the same
+ multicast address -->
+ <property name="fixedHostName">true</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">jboss:service=HAJNDI</property>
+ <property name="bindingName">AutoDiscoveryPort</property>
+ <property name="port">1102</property>
+ <!-- This port should not be changed between different
+ binding sets; all nodes need to listen on the same port -->
+ <property name="fixedPort">true</property>
+ </bean>
+
<!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
<!-- HA RMI/JRMP invoker -->
More information about the jboss-cvs-commits
mailing list