[jboss-cvs] JBossAS SVN: r103875 - 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 Apr 13 00:00:31 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-04-13 00:00:31 -0400 (Tue, 13 Apr 2010)
New Revision: 103875
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-6260] Configure JGroups via SBM
Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml 2010-04-13 03:54:28 UTC (rev 103874)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml 2010-04-13 04:00:31 UTC (rev 103875)
@@ -23,7 +23,8 @@
<UDP
singleton_name="udp"
mcast_port="${jboss.jgroups.udp.mcast_port:45688}"
- mcast_addr="${jboss.partition.udpGroup:228.11.11.11}"
+ mcast_addr="${jboss.jgroups.udp.mcast_addr,jboss.partition.udpGroup:228.11.11.11}"
+ bind_port="${jboss.jgroups.udp.bind_port:55200}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -92,7 +93,8 @@
<UDP
singleton_name="udp-async"
mcast_port="${jboss.jgroups.udp_async.mcast_port:45689}"
- mcast_addr="${jboss.partition.udpGroup:228.11.11.11}"
+ mcast_addr="${jboss.jgroups.udp_async.mcast_addr,jboss.partition.udpGroup:228.11.11.11}"
+ bind_port="${jboss.jgroups.udp_async.bind_port:55225}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -163,7 +165,8 @@
<UDP
singleton_name="udp_sync"
mcast_port="${jboss.jgroups.udp_sync.mcast_port:45699}"
- mcast_addr="${jboss.partition.udpGroup:229.11.11.11}"
+ mcast_addr="${jboss.jgroups.udp_sync.mcast_addr,jboss.partition.udpGroup:229.11.11.11}"
+ bind_port="${jboss.jgroups.udp_sync.bind_port:55250}"
tos="8"
ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000"
@@ -260,7 +263,7 @@
<!-- Alternative 1: multicast-based automatic discovery. -->
<MPING timeout="3000"
num_initial_members="3"
- mcast_addr="${jboss.partition.udpGroup:230.11.11.11}"
+ mcast_addr="${jgroups.tcp.mping_mcast_addr,jboss.partition.udpGroup:230.11.11.11}"
mcast_port="${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
@@ -339,7 +342,7 @@
<!-- Alternative 1: multicast-based automatic discovery. -->
<MPING timeout="3000"
num_initial_members="3"
- mcast_addr="${jboss.partition.udpGroup:231.11.11.11}"
+ mcast_addr="${jboss.jgroups.tcp_sync.mping_mcast_addr,jboss.partition.udpGroup:231.11.11.11}"
mcast_port="${jboss.jgroups.tcp_sync.mping_mcast_port:45701}"
ip_ttl="${jgroups.udp.ip_ttl:2}"/>
<!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
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-04-13 03:54:28 UTC (rev 103874)
+++ trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml 2010-04-13 04:00:31 UTC (rev 103875)
@@ -335,8 +335,6 @@
<property name="description">Socket for throughput connection factory</property>
</bean>
-
-
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">HornetQ</property>
<property name="bindingName">netty-ssl-port</property>
@@ -423,6 +421,124 @@
<property name="hostName">${jboss.bind.address}</property>
<property name="description">The port used for SSL (encrypted) Remoting connections</property>
</bean>
+
+ <!-- ******** deploy/cluster/jgroups-channelfactory.sar ******** -->
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JGroups</property>
+ <property name="bindingName">udp-bind_port</property>
+ <property name="port">55200</property>
+ <property name="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used for the JGroups 'udp' stack</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JGroups</property>
+ <property name="bindingName">udp-mcast</property>
+ <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
+ <property name="port">45688</property>
+ <property name="description">Multicast socket on which JGroups 'udp' stack communicates</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>
+ <!-- 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>
+
+ <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>
+ <property name="description">The port used for the JGroups 'tcp' stack</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JGroups</property>
+ <property name="bindingName">tcp-mping</property>
+ <property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
+ <property name="port">45700</property>
+ <property name="description">Multicast socket on which JGroups 'tcp' stack performs discovery</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>
+ <!-- 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>
+
+ <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>
+ <property name="description">Multicast socket on which JGroups listens for diagnostic requests from its Probe utility</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>
+ <!-- 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>
+<!--
+ <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="hostName">${jboss.jgroups.bind.address,jgroups.bind_addr,jboss.bind.address}</property>
+ <property name="description">The port used for 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>
+ <property name="description">The port used for 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>
+ <property name="description">The port used for 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="fixedHostName">true</property>
+ <property name="fixedPort">true</property>
+ </bean>
+
+ <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="description">Multicast socket on which JGroups 'udp_sync' stack communicates</property>
+ <property name="fixedHostName">true</property>
+ <property name="fixedPort">true</property>
+ </bean>
+
+ <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="description">Multicast socket on which JGroups 'tcp_sync' stack performs discovery</property>
+ <property name="fixedHostName">true</property>
+ <property name="fixedPort">true</property>
+ </bean>
+-->
</set>
</parameter>
</constructor>
@@ -516,6 +632,203 @@
</parameter>
</constructor>
</bean>
+
+ <!-- JGroups -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp.bind_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp-bind_port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp.mcast_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp-mcast</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp.mcast_addr</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp-mcast</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.tcp.bind_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp-bind_port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jgroups.tcp.mping_mcast_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp-mping</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jgroups.tcp.mping_mcast_addr</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp-mping</parameter>
+ <parameter><null/></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">
+ <parameter>JGroups</parameter>
+ <parameter>diagnostics</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.diagnostics_addr</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>JGroups</parameter>
+ <parameter>diagnostics</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+<!-- <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp_async.bind_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp_async-bind_port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp_sync.bind_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp_sync-bind_port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.tcp_sync.bind_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp_sync-bind_port</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp_async.mcast_port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp_async-mcast</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp_async.mcast_addr</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp_async-mcast</parameter>
+ <parameter><null/></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">
+ <parameter>JGroups</parameter>
+ <parameter>udp_sync-mcast</parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.jgroups.udp_sync.mcast_addr</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>JGroups</parameter>
+ <parameter>udp_sync-mcast</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>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>
+ </constructor>
+ </bean>
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jgroups.tcp_sync.mping_mcast_addr</parameter>
+ <parameter class="java.lang.String">
+ <value-factory bean="ServiceBindingManager" method="getStringBinding">
+ <parameter>JGroups</parameter>
+ <parameter>tcp_sync-mping</parameter>
+ <parameter><null/></parameter>
+ </value-factory>
+ </parameter>
+ </constructor>
+ </bean>
+-->
+
</set>
</parameter>
</constructor>
More information about the jboss-cvs-commits
mailing list