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

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

Author: bstansberry at jboss.com
Date: 2008-12-15 18:19:44 -0500 (Mon, 15 Dec 2008)
New Revision: 82292

Modified:
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
Log:
[JBAS-6307][JBAS-6308] Remove dual-property system property substitution syntax from jgroups-channelfactory-stacks.xml

Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-12-15 23:13:42 UTC (rev 82291)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-12-15 23:19:44 UTC (rev 82292)
@@ -7,7 +7,7 @@
 		<UDP
 		     singleton_name="shared-udp"
 		     mcast_port="${jboss.jgroups.udp.mcast_port:45688}"
-		     mcast_addr="${jboss.jgroups.udp.mcast_addr,jgroups.udp.mcast_addr:228.11.11.11}"
+		     mcast_addr="${jboss.partition.udpGroup: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="${jboss.jgroups.udp_async.mcast_addr,jgroups.udp.mcast_addr:228.11.11.11}"
+             mcast_addr="${jboss.partition.udpGroup:228.11.11.11}"
              tos="8"
              ucast_recv_buf_size="20000000"
              ucast_send_buf_size="640000"
@@ -173,7 +173,7 @@
             <UDP
                  singleton_name="udp_sync"
                  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}"
+                 mcast_addr="${jboss.partition.udpGroup:229.11.11.11}"
                  tos="8"
                  ucast_recv_buf_size="20000000"
                  ucast_send_buf_size="640000"
@@ -270,7 +270,7 @@
 		      <!-- Alternative 1: multicast-based automatic discovery. -->   
             <MPING timeout="3000"
                    num_initial_members="3"
-                   mcast_addr="${jgroups.tcp.mping_mcast_addr,jgroups.udp.mcast_addr:230.11.11.11}"
+                   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
@@ -348,7 +348,7 @@
             <!-- Alternative 1: multicast-based automatic discovery. -->   
             <MPING timeout="3000"
                    num_initial_members="3"
-                   mcast_addr="${jboss.jgroups.tcp_sync.mping_mcast_addr,jgroups.udp.mcast_addr:231.11.11.11}"
+                   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
@@ -457,7 +457,7 @@
                  oob_thread_pool.queue_max_size="100"
                  oob_thread_pool.rejection_policy="run"/>
             <MPING timeout="5000"
-               mcast_addr="${jboss.messaging.datachanneludpaddress,jboss.partition.udpGroup:228.6.6.6}"
+               mcast_addr="${jboss.partition.udpGroup:228.6.6.6}"
                mcast_port="${jboss.messaging.datachanneludpport:45710}"
                ip_ttl="${jboss.messaging.ipttl:8}"
                num_initial_members="5"