[jboss-cvs] JBossAS SVN: r105485 - in trunk: server/src/etc/conf/all/bindingservice.beans/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 1 11:32:51 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-06-01 11:32:50 -0400 (Tue, 01 Jun 2010)
New Revision: 105485
Modified:
trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
Log:
[JBAS-8046] Configure FD_SOCK via the ServiceBindingManager
Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml 2010-06-01 15:17:43 UTC (rev 105484)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml 2010-06-01 15:32:50 UTC (rev 105485)
@@ -56,7 +56,7 @@
oob_thread_pool.rejection_policy="discard"/>
<PING timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.udp.fd_sock_port:54200}"/>
<FD timeout="6000" max_tries="5"/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
@@ -127,7 +127,7 @@
oob_thread_pool.rejection_policy="discard"/>
<PING timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.udp_async.fd_sock_port:54225}"/>
<FD timeout="6000" max_tries="5"/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
@@ -194,7 +194,7 @@
oob_thread_pool.rejection_policy="discard"/>
<PING timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.udp_sync.fd_sock_port:54250}"/>
<FD timeout="6000" max_tries="5"/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
@@ -260,8 +260,8 @@
<!-- Alternative 1: multicast-based automatic discovery. -->
<MPING timeout="3000"
num_initial_members="3"
- mcast_addr="${jgroups.tcp.mping_mcast_addr,jboss.partition.udpGroup:230.11.11.11}"
- mcast_port="${jgroups.tcp.mping_mcast_port:45700}"
+ mcast_addr="${jboss.jgroups.tcp.mping_mcast_addr,jboss.partition.udpGroup:230.11.11.11}"
+ mcast_port="${jboss.jgroups.tcp.mping_mcast_port:45700}"
ip_ttl="${jgroups.udp.ip_ttl:2}"/>
<!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
of *all* possible cluster members.
@@ -271,7 +271,7 @@
num_initial_members="3"/>
-->
<MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.tcp.fd_sock_port:57600}"/>
<FD timeout="6000" max_tries="5"/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
@@ -349,7 +349,7 @@
num_initial_members="3"/>
-->
<MERGE2 max_interval="100000" min_interval="20000"/>
- <FD_SOCK/>
+ <FD_SOCK start_port="${jboss.jgroups.tcp_sync.fd_sock_port:57650}"/>
<FD timeout="6000" max_tries="5"/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
Modified: trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-06-01 15:17:43 UTC (rev 105484)
+++ trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-06-01 15:32:50 UTC (rev 105485)
@@ -449,6 +449,14 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
+ <property name="bindingName">udp-fd_sock</property>
+ <property name="port">54200</property>
+ <property name="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used by the FD_SOCK protocol in the JGroups 'udp' stack</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JGroups</property>
<property name="bindingName">tcp-bind_port</property>
<property name="port">7600</property>
<property name="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
@@ -472,6 +480,14 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">JGroups</property>
+ <property name="bindingName">tcp-fd_sock</property>
+ <property name="port">57600</property>
+ <property name="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used by the FD_SOCK protocol in the JGroups 'udp' stack</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JGroups</property>
<property name="bindingName">diagnostics</property>
<property name="hostName">224.0.75.75</property>
<property name="port">7500</property>
@@ -495,6 +511,14 @@
<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="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used by the FD_SOCK protocol in the JGroups 'udp-async' stack</property>
+ </bean>
+
+ <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="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
@@ -503,6 +527,14 @@
<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="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used by the FD_SOCK protocol in the JGroups 'udp-sync' stack</property>
+ </bean>
+
+ <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="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
@@ -511,10 +543,18 @@
<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="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used by the FD_SOCK protocol in the JGroups 'tcp-sync' stack</property>
+ </bean>
+
+ <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="description">Multicast socket on which JGroups 'udp_async' stack communicates</property>
+ <property name="description">Multicast socket on which JGroups 'udp-async' stack communicates</property>
<property name="fixedHostName">true</property>
<property name="fixedPort">true</property>
</bean>
@@ -524,7 +564,7 @@
<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="description">Multicast socket on which JGroups 'udp_sync' stack communicates</property>
+ <property name="description">Multicast socket on which JGroups 'udp-sync' stack communicates</property>
<property name="fixedHostName">true</property>
<property name="fixedPort">true</property>
</bean>
@@ -534,7 +574,7 @@
<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="description">Multicast socket on which JGroups 'tcp_sync' stack performs discovery</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>
</bean>
@@ -670,10 +710,21 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jboss.jgroups.tcp.bind_port</parameter>
+ <parameter>jboss.jgroups.udp.fd_sock_port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
<parameter>JGroups</parameter>
+ <parameter>udp-fd_sock</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.tcp.tcp_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
<parameter>tcp-bind_port</parameter>
</value-factory>
</parameter>
@@ -681,7 +732,7 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jgroups.tcp.mping_mcast_port</parameter>
+ <parameter>jboss.jgroups.tcp.mping_mcast_port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
<parameter>JGroups</parameter>
@@ -692,7 +743,7 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jgroups.tcp.mping_mcast_addr</parameter>
+ <parameter>jboss.jgroups.tcp.mping_mcast_addr</parameter>
<parameter class="java.lang.String">
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>JGroups</parameter>
@@ -704,6 +755,17 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
+ <parameter>jboss.jgroups.tcp.fd_sock_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp-fd_sock</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
<parameter>jboss.jgroups.diagnostics_port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
@@ -749,7 +811,7 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jboss.jgroups.tcp_sync.bind_port</parameter>
+ <parameter>jboss.jgroups.tcp_sync.tcp_port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
<parameter>JGroups</parameter>
@@ -783,6 +845,17 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
+ <parameter>jboss.jgroups.udp_async.fd_sock_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp_async-fd_sock</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
<parameter>jboss.jgroups.udp_sync.mcast_port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
@@ -806,10 +879,21 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jgroups.tcp_sync.mping_mcast_port</parameter>
+ <parameter>jboss.jgroups.udp_sync.fd_sock_port</parameter>
<parameter class="int">
<value-factory bean="ServiceBindingManager" method="getIntBinding">
<parameter>JGroups</parameter>
+ <parameter>udp_sync-fd_sock</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.tcp_sync.mping_mcast_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
<parameter>tcp_sync-mping</parameter>
</value-factory>
</parameter>
@@ -817,7 +901,7 @@
</bean>
<bean class="org.jboss.services.binding.SystemPropertyBinding">
<constructor>
- <parameter>jgroups.tcp_sync.mping_mcast_addr</parameter>
+ <parameter>jboss.jgroups.tcp_sync.mping_mcast_addr</parameter>
<parameter class="java.lang.String">
<value-factory bean="ServiceBindingManager" method="getStringBinding">
<parameter>JGroups</parameter>
@@ -827,6 +911,17 @@
</parameter>
</constructor>
</bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.tcp_sync.fd_sock_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp_sync-fd_sock</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
-->
</set>
More information about the jboss-cvs-commits
mailing list