[jboss-cvs] JBossAS SVN: r110825 - branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 2 17:54:57 EST 2011
Author: dereed
Date: 2011-03-02 17:54:57 -0500 (Wed, 02 Mar 2011)
New Revision: 110825
Modified:
branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
Log:
[JBPAPP-6011] In binding manager, use the JGroups system properties that were introduced in EAP 5.1.1, remove hard-coded ports, and change default multicast addresses to match EAP 5.0.x.
Modified: branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2011-03-02 21:24:06 UTC (rev 110824)
+++ branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2011-03-02 22:54:57 UTC (rev 110825)
@@ -450,8 +450,8 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">jbm_data-mping</property>
- <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
- <property name="port">45710</property>
+ <property name="hostName">${jboss.jgroups.jbm_data.mping_mcast_addr:228.6.6.6}</property>
+ <property name="port">${jboss.messaging.datachanneludpport:45710}</property>
<property name="description">Multicast socket on which JGroups 'jbm-data' stack performs discovery</property>
<!-- This address should not be changed between different
binding sets; all nodes need to listen on the same
@@ -465,7 +465,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">jbm_data-fd_sock</property>
- <property name="port">57900</property>
+ <property name="port">${jboss.jgroups.jbm_data.fd_sock_port:57900}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used by the FD_SOCK protocol in the JGroups 'jbm-data' stack</property>
</bean>
@@ -473,7 +473,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">jbm_control-fd_sock</property>
- <property name="port">53200</property>
+ <property name="port">${jboss.jgroups.jbm_control.fd_sock_port:53200}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used by the FD_SOCK protocol in the JGroups 'jbm_control' stack</property>
</bean>
@@ -496,7 +496,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">udp_async-bind_port</property>
- <property name="port">55225</property>
+ <property name="port">${jboss.jgroups.udp_async.bind_port:55225}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used for the JGroups 'udp-async' stack</property>
</bean>
@@ -504,7 +504,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">udp_async-fd_sock</property>
- <property name="port">54225</property>
+ <property name="port">${jboss.jgroups.udp_async.fd_sock_port:54225}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used by the FD_SOCK protocol in the JGroups 'udp-async' stack</property>
</bean>
@@ -512,7 +512,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">udp_sync-bind_port</property>
- <property name="port">55250</property>
+ <property name="port">${jboss.jgroups.udp_sync.bind_port:55250}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used for the JGroups 'udp-sync' stack</property>
</bean>
@@ -520,7 +520,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">udp_sync-fd_sock</property>
- <property name="port">54250</property>
+ <property name="port">${jboss.jgroups.udp_sync.fd_sock_port:54250}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used by the FD_SOCK protocol in the JGroups 'udp-sync' stack</property>
</bean>
@@ -528,7 +528,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">tcp_sync-bind_port</property>
- <property name="port">7650</property>
+ <property name="port">${jboss.jgroups.tcp_sync.tcp_port:7650}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used for the JGroups 'tcp-sync' stack</property>
</bean>
@@ -536,7 +536,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">tcp_sync-fd_sock</property>
- <property name="port">57650</property>
+ <property name="port">${jboss.jgroups.tcp_sync.fd_sock_port:57650}</property>
<property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
<property name="description">The port used by the FD_SOCK protocol in the JGroups 'tcp-sync' stack</property>
</bean>
@@ -544,8 +544,8 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">udp_async-mcast</property>
- <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
- <property name="port">45689</property>
+ <property name="hostName">${jboss.jgroups.udp_async.mcast_addr:228.11.11.11}</property>
+ <property name="port">${jboss.jgroups.udp_async.mcast_port:45689}</property>
<property name="description">Multicast socket on which JGroups 'udp-async' stack communicates</property>
<property name="fixedHostName">true</property>
<property name="fixedPort">true</property>
@@ -554,8 +554,8 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">udp_sync-mcast</property>
- <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
- <property name="port">45699</property>
+ <property name="hostName">${jboss.jgroups.udp_sync.mcast_addr:229.11.11.11}</property>
+ <property name="port">${jboss.jgroups.udp_sync.mcast_port:45699}</property>
<property name="description">Multicast socket on which JGroups 'udp-sync' stack communicates</property>
<property name="fixedHostName">true</property>
<property name="fixedPort">true</property>
@@ -564,8 +564,8 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
<property name="bindingName">tcp_sync-mping</property>
- <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
- <property name="port">45701</property>
+ <property name="hostName">${jboss.jgroups.tcp_sync.mping_mcast_addr:231.11.11.11}</property>
+ <property name="port">${jboss.jgroups.tcp_sync.mping_mcast_port:45701}</property>
<property name="description">Multicast socket on which JGroups 'tcp-sync' stack performs discovery</property>
<property name="fixedHostName">true</property>
<property name="fixedPort">true</property>
More information about the jboss-cvs-commits
mailing list