[jboss-cvs] JBossAS SVN: r81807 - trunk/cluster/src/resources/jgroups.

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

Author: bstansberry at jboss.com
Date: 2008-11-29 09:38:05 -0500 (Sat, 29 Nov 2008)
New Revision: 81807

Modified:
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
Log:
[JBAS-6260] Add individual system properties for the address/port configs

Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-11-29 14:25:37 UTC (rev 81806)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-11-29 14:38:05 UTC (rev 81807)
@@ -7,7 +7,7 @@
 		<UDP
 		     singleton_name="shared-udp"
 		     mcast_port="${jboss.jgroups.udp.mcast_port:45688}"
-		     mcast_addr="${jgroups.udp.mcast_addr:228.11.11.11}"
+		     mcast_addr="${jboss.jgroups.udp.mcast_addr,jgroups.udp.mcast_addr:228.11.11.11}"
 		     tos="8"
 		     ucast_recv_buf_size="20000000"
 		     ucast_send_buf_size="640000"
@@ -105,7 +105,7 @@
           <UDP
              singleton_name="udp-async"
              mcast_port="${jboss.jgroups.udp_async.mcast_port:45689}"
-             mcast_addr="${jgroups.udp.mcast_addr:228.11.11.11}"
+             mcast_addr="${jboss.jgroups.udp_async.mcast_addr,jgroups.udp.mcast_addr:228.11.11.11}"
              tos="8"
              ucast_recv_buf_size="20000000"
              ucast_send_buf_size="640000"
@@ -172,8 +172,8 @@
         <config>
             <UDP
                  singleton_name="udp_sync"
-                 mcast_port="${jgroups.udp_sync.mcast_port:45699}"
-                 mcast_addr="${jgroups.udp.mcast_addr:229.11.11.11}"
+                 mcast_port="${jboss.jgroups.udp_sync.mcast_port:45699}"
+                 mcast_addr="${jboss.jgroups.udp_sync.mcast_addr,jgroups.udp.mcast_addr:229.11.11.11}"
                  tos="8"
                  ucast_recv_buf_size="20000000"
                  ucast_send_buf_size="640000"
@@ -229,13 +229,13 @@
 
     <stack name="tcp"
            description="TCP based stack, with flow control and message bundling. 
-                        This is usually used when IP multicasting cannot be used 
-                        in a network, e.g. because it is disabled (e.g. routers 
-                        discard multicast)">
+                        TCP stacks are usually used when IP multicasting cannot 
+                        be used in a network, e.g. because it is disabled (e.g. 
+                        routers discard multicast)">
         <config>
             <TCP
                  singleton_name="tcp"
-                 start_port="7600"
+                 start_port="${jboss.jgroups.tcp.tcp_port:7600}"
                  tcp_nodelay="true"
                  loopback="false"
                  recv_buf_size="20000000"
@@ -270,8 +270,8 @@
 		      <!-- Alternative 1: multicast-based automatic discovery. -->   
             <MPING timeout="3000"
                    num_initial_members="3"
-                   mcast_addr="${jgroups.udp.mcast_addr:230.11.11.11}"
-                   mcast_port="${jgroups.tcp_mping.mcast_port:45700}"
+                   mcast_addr="${jgroups.tcp.mping_mcast_addr,jgroups.udp.mcast_addr: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
                  of *all* possible cluster members.
@@ -305,7 +305,7 @@
 
     <stack name="tcp-sync"
            description="TCP based stack, without flow control and without 
-                        message bundling. This is usually used when IP 
+                        message bundling. TCP stacks are usually used when IP 
                         multicasting cannot be used in a network (e.g.routers 
                         discard multicast). This configuration should be used 
                         instead of 'tcp' above when (1) synchronous calls are 
@@ -314,7 +314,7 @@
         <config>
             <TCP
                  singleton_name="tcp_sync"
-                 start_port="7650"
+                 start_port="${jboss.jgroups.tcp_sync.tcp_port:7650}"
                  tcp_nodelay="true"
                  loopback="false"
                  recv_buf_size="20000000"
@@ -348,8 +348,8 @@
             <!-- Alternative 1: multicast-based automatic discovery. -->   
             <MPING timeout="3000"
                    num_initial_members="3"
-                   mcast_addr="${jgroups.udp.mcast_addr:231.11.11.11}"
-                   mcast_port="${jgroups.tcp_sync_mping.mcast_port:45701}"
+                   mcast_addr="${jboss.jgroups.tcp_sync.mping_mcast_addr,jgroups.udp.mcast_addr: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
                  of all possible cluster members.
@@ -426,7 +426,7 @@
            description="Stack optimized for the JBoss Messaging Data Channel">
         <config>
             <TCP singleton_name="jbm-data"
-                 start_port="7900"
+                 start_port="${jboss.messaging.datachanneltcpport:7900}"
                  loopback="true"
                  recv_buf_size="20000000"
                  send_buf_size="640000"