[jboss-cvs] JBossAS SVN: r110828 - branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF.

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

Author: dereed
Date: 2011-03-03 10:32:03 -0500 (Thu, 03 Mar 2011)
New Revision: 110828

Modified:
   branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
Log:
[JBPAPP-6011] The rest of the fixes for JGroups configuration in Service Binding Manager


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-03 12:59:00 UTC (rev 110827)
+++ branches/JBPAPP_5_1/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml	2011-03-03 15:32:03 UTC (rev 110828)
@@ -380,7 +380,7 @@
             <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="port">${jboss.jgroups.udp.bind_port:55200}</property>
                <property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
                <property name="description">The port used for the JGroups 'udp' stack</property>
             </bean>
@@ -388,8 +388,8 @@
             <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="hostName">${jboss.jgroups.udp.mcast_addr:228.11.11.11}</property>
+               <property name="port">${jboss.jgroups.udp.mcast_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 
@@ -403,7 +403,7 @@
             <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="port">${jboss.jgroups.udp.fd_sock_port:54200}</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' stack</property>
             </bean>
@@ -411,7 +411,7 @@
             <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="port">${jboss.jgroups.tcp.tcp_port:7600}</property>
                <property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
                <property name="description">The port used for the JGroups 'tcp' stack</property>
             </bean>
@@ -419,8 +419,8 @@
             <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="hostName">${jboss.jgroups.tcp.mping_mcast_addr:230.11.11.11}</property>
+               <property name="port">${jgroups.tcp.mping_mcast_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 
@@ -434,7 +434,7 @@
             <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="port">${jboss.jgroups.tcp.fd_sock_port:57600}</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' stack</property>
             </bean>
@@ -442,7 +442,7 @@
             <bean class="org.jboss.services.binding.ServiceBindingMetadata">
                <property name="serviceName">JGroups</property>
                <property name="bindingName">jbm_data-bind_port</property>
-               <property name="port">7900</property>
+               <property name="port">${jboss.messaging.datachanneltcpport:7900}</property>
                <property name="hostName">${jboss.jgroups.bind.address,jboss.bind.address}</property>
                <property name="description">The port used for the JGroups 'jbm-data' stack</property>
             </bean>