[jboss-cvs] JBossAS SVN: r71313 - in trunk: testsuite/src/main/org/jboss/test/cluster/defaultcfg/test and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Mar 26 15:46:59 EDT 2008


Author: bstansberry at jboss.com
Date: 2008-03-26 15:46:59 -0400 (Wed, 26 Mar 2008)
New Revision: 71313

Added:
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-beans.xml
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
Removed:
   trunk/cluster/src/resources/jgroups/multiplexer-beans.xml
   trunk/cluster/src/resources/jgroups/multiplexer-stacks.xml
Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
Log:
[JBAS-5343] Get rid of unneeded references to "multiplexer"

Copied: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-beans.xml (from rev 71308, trunk/cluster/src/resources/jgroups/multiplexer-beans.xml)
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-beans.xml	                        (rev 0)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-beans.xml	2008-03-26 19:46:59 UTC (rev 71313)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- The pojo ChannelFactory.  We use a JBoss AS subclass of the standard
+         JGroups JChannelFactory in order to ensure additional_data is set
+         on any shared channel -->
+	<bean name="JChannelFactory" class="org.jboss.ha.framework.server.JChannelFactory">
+	
+		  <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jgroups:service=ChannelFactory", exposedInterface=org.jgroups.jmx.JChannelFactoryMBean.class, registerDirectly=false)</annotation>
+        
+        <property name="multiplexerConfig">META-INF/jgroups-channelfactory-stacks.xml</property>
+        
+        <!--  JMX Registration of channels and protocols -->
+        <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
+        <property name="domain">jboss.jgroups</property>
+        <property name="exposeChannels">true</property>
+        <property name="exposeProtocols">true</property>
+        
+        <!-- The address used to determine the node name  -->
+        <property name="nodeAddress">${jboss.bind.address}</property>
+        
+        <!-- Naming Service Port is used to generate a unique node name -->
+        <property name="namingServicePort"><inject bean="jboss:service=Naming" property="Port"/></property>
+        
+	</bean>
+   
+</deployment>

Copied: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml (from rev 71310, trunk/cluster/src/resources/jgroups/multiplexer-stacks.xml)
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	                        (rev 0)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-03-26 19:46:59 UTC (rev 71313)
@@ -0,0 +1,610 @@
+<!--
+  Standard JGroups protocol stacks definitions, used by the JChannelFactory bean.
+  Author: Bela Ban, Brian Stansberry
+  Version: $Id$
+-->
+<protocol_stacks>
+    <stack name="udp"
+           description="Default: IP multicast based stack, with flow control and message bundling">
+        <config>
+          <UDP
+             mcast_port="${jgroups.udp.mcast_port:45688}"
+             mcast_addr="${jgroups.udp.mcast_addr:228.11.11.11}"
+             tos="8"
+             ucast_recv_buf_size="20000000"
+             ucast_send_buf_size="640000"
+             mcast_recv_buf_size="25000000"
+             mcast_send_buf_size="640000"
+             loopback="true"
+             discard_incompatible_packets="true"
+             max_bundle_size="64000"
+             max_bundle_timeout="30"
+             use_incoming_packet_handler="true"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             enable_bundling="true"
+                 
+             use_concurrent_stack="true"
+
+		     thread_pool.enabled="true"
+		     thread_pool.min_threads="1"
+		     thread_pool.max_threads="25"
+		     thread_pool.keep_alive_time="5000"
+		     thread_pool.queue_enabled="false"
+		     thread_pool.queue_max_size="100"
+		     thread_pool.rejection_policy="Run"
+		
+		     oob_thread_pool.enabled="true"
+		     oob_thread_pool.min_threads="1"
+		     oob_thread_pool.max_threads="8"
+		     oob_thread_pool.keep_alive_time="5000"
+		     oob_thread_pool.queue_enabled="false"
+		     oob_thread_pool.queue_max_size="100"
+		     oob_thread_pool.rejection_policy="Run"/>
+          <PING timeout="2000" num_initial_members="3"/>
+          <MERGE2 max_interval="100000" min_interval="20000"/>
+          <FD_SOCK/>
+          <FD timeout="10000" max_tries="5" shun="true"/>
+          <VERIFY_SUSPECT timeout="1500"/>
+          <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                   retransmit_timeout="300,600,1200,2400,4800"
+                   discard_delivered_msgs="true"/>
+          <UNICAST timeout="300,600,1200,2400,3600"/>
+          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                   max_bytes="400000"/>
+          <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                   shun="true"
+                   view_bundling="true"
+                   view_ack_collection_timeout="5000"/>
+          <FC max_credits="2000000" min_threshold="0.10"/>
+          <FRAG2 frag_size="60000"/>
+          <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+          <pbcast.STATE_TRANSFER/>
+          <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+    
+
+    <stack name="udp-sync"
+           description="IP multicast based stack, without flow control and without message bundling. This should be used
+           instead of udp if (1) synchronous calls are used and (2) the message volume (rate and size)
+            is not that large. Don't use this configuration if you send messages at a high sustained rate, or you might
+            run out of memory">
+        <config>
+            <UDP
+                 mcast_port="${jgroups.udp_sync.mcast_port:45699}"
+                 mcast_addr="${jgroups.udp.mcast_addr:229.11.11.11}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="true"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 ip_ttl="${jgroups.udp.ip_ttl:2}"
+                 enable_bundling="false"
+                 
+                 use_concurrent_stack="true"
+
+		         thread_pool.enabled="true"
+		         thread_pool.min_threads="1"
+		         thread_pool.max_threads="25"
+    		     thread_pool.keep_alive_time="5000"
+    		     thread_pool.queue_enabled="false"
+    		     thread_pool.queue_max_size="100"
+    		     thread_pool.rejection_policy="Run"
+    		
+    		     oob_thread_pool.enabled="true"
+    		     oob_thread_pool.min_threads="1"
+    		     oob_thread_pool.max_threads="8"
+    		     oob_thread_pool.keep_alive_time="5000"
+    		     oob_thread_pool.queue_enabled="false"
+    		     oob_thread_pool.queue_max_size="100"
+    		     oob_thread_pool.rejection_policy="Run"/>
+            <PING timeout="2000" num_initial_members="3"/>
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                    retransmit_timeout="300,600,1200,2400,4800"
+                    discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                    max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                    shun="true"
+                    view_bundling="true"
+                    view_ack_collection_timeout="5000"/>
+            <FRAG2 frag_size="60000"/>
+            <!--pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+
+
+    <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 (routers discard multicast)">
+        <config>
+            <TCP start_port="7600"
+                 tcp_nodelay="true"
+                 loopback="false"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 enable_bundling="true"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"
+                 
+                 use_concurrent_stack="true"
+	
+		         thread_pool.enabled="true"
+		         thread_pool.min_threads="1"
+		         thread_pool.max_threads="25"
+		         thread_pool.keep_alive_time="5000"
+		         thread_pool.queue_enabled="false"
+		         thread_pool.queue_max_size="100"
+		         thread_pool.rejection_policy="run"
+		
+		         oob_thread_pool.enabled="true"
+		         oob_thread_pool.min_threads="1"
+		         oob_thread_pool.max_threads="8"
+		         oob_thread_pool.keep_alive_time="5000"
+		         oob_thread_pool.queue_enabled="false"
+		         oob_thread_pool.queue_max_size="100"
+		         oob_thread_pool.rejection_policy="run"/>
+		    <!-- 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}"
+                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>            
+            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
+                 of all possible cluster members.
+            <TCPPING timeout="3000"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
+                     port_range="1"
+                     num_initial_members="3"/>
+             -->
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        shun="true"
+                        view_bundling="true"
+                        view_ack_collection_timeout="5000"/>
+            <FC max_credits="2000000" min_threshold="0.10"/>
+            <FRAG2 frag_size="60000"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+
+
+    <stack name="tcp-sync"
+           description="TCP based stack, without flow control and without message bundling. This is usually used when IP
+           multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast). This
+           configuration should be used instead of tcp when (1) synchronous calls are used and (2) the message volume
+           (rate and size) is not that large">
+        <config>
+            <TCP start_port="7650"
+                 tcp_nodelay="true"
+                 loopback="false"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 enable_bundling="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"
+                 
+                 use_concurrent_stack="true"
+                 
+                 thread_pool.enabled="true"
+		         thread_pool.min_threads="1"
+		         thread_pool.max_threads="25"
+		         thread_pool.keep_alive_time="5000"
+		         thread_pool.queue_enabled="false"
+		         thread_pool.queue_max_size="100"
+		         thread_pool.rejection_policy="run"
+		
+		         oob_thread_pool.enabled="true"
+		         oob_thread_pool.min_threads="1"
+		         oob_thread_pool.max_threads="8"
+		         oob_thread_pool.keep_alive_time="5000"
+		         oob_thread_pool.queue_enabled="false"
+		         oob_thread_pool.queue_max_size="100"
+		         oob_thread_pool.rejection_policy="run"/>
+            <!-- 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}"
+                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>           
+            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
+                 of all possible cluster members.
+            <TCPPING timeout="3000"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7650],localhost[7651]}"
+                     port_range="1"
+                     num_initial_members="3"/>
+            -->
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        shun="true"
+                        view_bundling="true"
+                        view_ack_collection_timeout="5000"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+    
+    <stack name="jbm-control"
+           description="Stack optimized for the JBoss Messaging Control Channel">
+       <config>
+            <UDP
+                 mcast_addr="${jboss.messaging.controlchanneludpaddress,jboss.partition.udpGroup:228.7.7.7}"
+                 mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="false"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 ip_ttl="${jboss.messaging.ipttl:8}"
+                 enable_bundling="false"
+                 enable_diagnostics="true"
+                 thread_naming_pattern="cl"
+
+                 use_concurrent_stack="true"
+
+                 thread_pool.enabled="true"
+                 thread_pool.min_threads="1"
+                 thread_pool.max_threads="200"
+                 thread_pool.keep_alive_time="5000"
+                 thread_pool.queue_enabled="true"
+                 thread_pool.queue_max_size="1000"
+                 thread_pool.rejection_policy="Run"
+
+                 oob_thread_pool.enabled="true"
+                 oob_thread_pool.min_threads="1"
+                 oob_thread_pool.max_threads="8"
+                 oob_thread_pool.keep_alive_time="5000"
+                 oob_thread_pool.queue_enabled="false"
+                 oob_thread_pool.queue_max_size="100"
+                 oob_thread_pool.rejection_policy="Run"/>
+            <PING timeout="2000"
+                  num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    min_interval="20000"/>
+            <FD_SOCK />
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" />
+            <BARRIER />
+            <pbcast.NAKACK use_stats_for_retransmission="false"
+                   exponential_backoff="150"
+                   use_mcast_xmit="true" gc_lag="0"
+                   retransmit_timeout="50,300,600,1200"
+                   discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           max_bytes="400000"/>
+            <VIEW_SYNC avg_send_interval="10000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                shun="false"
+                view_bundling="true"/>
+            <FC max_credits="500000"
+                    min_threshold="0.20"/>
+            <FRAG2 frag_size="60000"  />
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="20000"/>
+        </config>
+    </stack>
+    
+    <stack name="jbm-data"
+           description="Stack optimized for the JBoss Messaging Data Channel">
+        <config>
+            <TCP start_port="7900"
+                 loopback="true"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 enable_bundling="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"
+                 use_concurrent_stack="true" 
+                 thread_pool.enabled="true"
+                 thread_pool.min_threads="1"
+                 thread_pool.max_threads="200"
+                 thread_pool.keep_alive_time="5000"
+                 thread_pool.queue_enabled="true" 
+                 thread_pool.queue_max_size="500"
+                 thread_pool.rejection_policy="run"
+                 oob_thread_pool.enabled="true"
+                 oob_thread_pool.min_threads="1"
+                 oob_thread_pool.max_threads="100" 
+                 oob_thread_pool.keep_alive_time="5000"
+                 oob_thread_pool.queue_enabled="false"
+                 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_port="${jboss.messaging.datachanneludpport:45567}"
+               ip_ttl="${jboss.messaging.ipttl:8}"
+               num_initial_members="5"
+               num_ping_requests="3"/>
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <BARRIER/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           max_bytes="400000"/>
+            <VIEW_SYNC avg_send_interval="10000"/>
+
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                shun="false" view_bundling="true"/>
+        </config>
+    </stack>
+           
+    
+    <stack name="tunnel"
+           description="Used with a GossipRouter">
+        <config>
+            <TUNNEL router_port="12001" router_host="127.0.0.1"/>
+            <PING timeout="2000"
+                  num_initial_members="3"
+                  gossip_refresh="10000"
+                  gossip_host="127.0.0.1"
+                  gossip_port="12001"/>
+            <MERGE2 max_interval="20000" min_interval="5000"/>
+            <FD_SOCK/>
+            <FD timeout="2000" max_tries="3" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="5000"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        shun="false"
+                        view_bundling="true"
+                        view_ack_collection_timeout="5000"/>
+            <FC max_credits="2000000" min_threshold="0.10"/>
+            <FRAG2 frag_size="60000"/>
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+    
+    <stack name="udp-nonconcurrent"
+           description="UDP based stack with the concurrent stack disabled. Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
+        <config>
+          <UDP
+             mcast_port="${jgroups.udp_nonconcurrent.mcast_port:55688}"
+             mcast_addr="${jgroups.udp.mcast_addr:228.12.12.12}"
+             tos="8"
+             ucast_recv_buf_size="20000000"
+             ucast_send_buf_size="640000"
+             mcast_recv_buf_size="25000000"
+             mcast_send_buf_size="640000"
+             loopback="true"
+             discard_incompatible_packets="true"
+             max_bundle_size="64000"
+             max_bundle_timeout="30"
+             use_incoming_packet_handler="true"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             enable_bundling="true"                 
+             use_concurrent_stack="false"/>
+          <PING timeout="2000" num_initial_members="3"/>
+          <MERGE2 max_interval="100000" min_interval="20000"/>
+          <FD_SOCK/>
+          <FD timeout="10000" max_tries="5" shun="true"/>
+          <VERIFY_SUSPECT timeout="1500"/>
+          <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                   retransmit_timeout="300,600,1200,2400,4800"
+                   discard_delivered_msgs="true"/>
+          <UNICAST timeout="300,600,1200,2400,3600"/>
+          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                   max_bytes="400000"/>
+          <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                   shun="true"
+                   view_bundling="true"
+                   view_ack_collection_timeout="5000"/>
+          <FC max_credits="2000000" min_threshold="0.10"/>
+          <FRAG2 frag_size="60000"/>
+          <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+          <pbcast.STATE_TRANSFER/>
+          <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+    
+
+    <stack name="udp-sync-nonconcurrent"
+           description="UDP based stack for sycnhronous communication with the concurrent stack disabled. 
+                        Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
+        <config>
+            <UDP
+                 mcast_port="${jgroups.udp_sync_nonconcurrent.mcast_port:55699}"
+                 mcast_addr="${jgroups.udp.mcast_addr:229.12.12.12}"
+                 tos="8"
+                 ucast_recv_buf_size="20000000"
+                 ucast_send_buf_size="640000"
+                 mcast_recv_buf_size="25000000"
+                 mcast_send_buf_size="640000"
+                 loopback="true"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 ip_ttl="${jgroups.udp.ip_ttl:2}"
+                 enable_bundling="false"                 
+                 use_concurrent_stack="false"/>
+            <PING timeout="2000" num_initial_members="3"/>
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                    retransmit_timeout="300,600,1200,2400,4800"
+                    discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                    max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                    shun="true"
+                    view_bundling="true"
+                    view_ack_collection_timeout="5000"/>
+            <FRAG2 frag_size="60000"/>
+            <!--pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+
+    <stack name="tcp-nonconcurrent"
+           description="TCP based stack, with flow control and message bundling but the concurrent stack disabled. 
+                        Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
+        <config>
+            <TCP start_port="7700"
+                 tcp_nodelay="true"
+                 loopback="false"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 enable_bundling="true"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"                 
+                 use_concurrent_stack="false"/>
+            <!-- Alternative 1: multicast-based automatic discovery. -->   
+            <MPING timeout="3000"
+                   num_initial_members="3"
+                   mcast_addr="${jgroups.udp.mcast_addr:230.12.12.12}"
+                   mcast_port="${jgroups.tcp_mping_nonconcurrent.mcast_port:55700}"
+                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>           
+            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
+                 of all possible cluster members.
+            <TCPPING timeout="3000"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
+                     port_range="1"
+                     num_initial_members="3"/>
+            -->
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        shun="true"
+                        view_bundling="true"
+                        view_ack_collection_timeout="5000"/>
+            <FC max_credits="2000000" min_threshold="0.10"/>
+            <FRAG2 frag_size="60000"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+
+
+    <stack name="tcp-sync-nonconcurrent"
+           description="TCP based stack, without flow control and without message bundling and the concurrent stack disabled. 
+                        Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
+        <config>
+            <TCP start_port="7650"
+                 tcp_nodelay="true"
+                 loopback="false"
+                 recv_buf_size="20000000"
+                 send_buf_size="640000"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 enable_bundling="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"
+                 use_concurrent_stack="false"/>
+            <!-- Alternative 1: multicast-based automatic discovery. -->   
+            <MPING timeout="3000"
+                   num_initial_members="3"
+                   mcast_addr="${jgroups.udp.mcast_addr:231.12.12.12}"
+                   mcast_port="${jgroups.tcp_sync_nonconcurrent_mping.mcast_port:55701}"
+                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>           
+            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
+                 of all possible cluster members.
+            <TCPPING timeout="3000"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7650],localhost[7651]}"
+                     port_range="1"
+                     num_initial_members="3"/>
+            -->
+            <MERGE2 max_interval="100000" min_interval="20000"/>
+            <FD_SOCK/>
+            <FD timeout="10000" max_tries="5" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500"/>
+            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        shun="true"
+                        view_bundling="true"
+                        view_ack_collection_timeout="5000"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER/>
+            <pbcast.FLUSH timeout="0"/>
+        </config>
+    </stack>
+
+</protocol_stacks>
+
+

Deleted: trunk/cluster/src/resources/jgroups/multiplexer-beans.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/multiplexer-beans.xml	2008-03-26 19:34:40 UTC (rev 71312)
+++ trunk/cluster/src/resources/jgroups/multiplexer-beans.xml	2008-03-26 19:46:59 UTC (rev 71313)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-    <!-- The pojo ChannelFactory.  We use a JBoss AS subclass of the standard
-         JGroups JChannelFactory in order to ensure additional_data is set
-         on any shared channel -->
-	<bean name="JChannelFactory" class="org.jboss.ha.framework.server.JChannelFactory">
-	
-		  <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jgroups:service=MultiplexerChannelFactory", exposedInterface=org.jgroups.jmx.JChannelFactoryMBean.class, registerDirectly=false)</annotation>
-        
-        <property name="multiplexerConfig">META-INF/multiplexer-stacks.xml</property>
-        
-        <!--  JMX Registration of channels and protocols -->
-        <property name="server"><inject bean="JMXKernel" property="mbeanServer"/></property>
-        <property name="domain">jboss.jgroups</property>
-        <property name="exposeChannels">true</property>
-        <property name="exposeProtocols">true</property>
-        
-        <!-- The address used to determine the node name  -->
-        <property name="nodeAddress">${jboss.bind.address}</property>
-        
-        <!-- Naming Service Port is used to generate a unique node name -->
-        <property name="namingServicePort"><inject bean="jboss:service=Naming" property="Port"/></property>
-        
-	</bean>
-   
-</deployment>

Deleted: trunk/cluster/src/resources/jgroups/multiplexer-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/multiplexer-stacks.xml	2008-03-26 19:34:40 UTC (rev 71312)
+++ trunk/cluster/src/resources/jgroups/multiplexer-stacks.xml	2008-03-26 19:46:59 UTC (rev 71313)
@@ -1,610 +0,0 @@
-<!--
-  Standard JGroups protocol stacks definitions, used by the JChannelFactory bean.
-  Author: Bela Ban, Brian Stansberry
-  Version: $Id$
--->
-<protocol_stacks>
-    <stack name="udp"
-           description="Default: IP multicast based stack, with flow control and message bundling">
-        <config>
-          <UDP
-             mcast_port="${jgroups.udp.mcast_port:45688}"
-             mcast_addr="${jgroups.udp.mcast_addr:228.11.11.11}"
-             tos="8"
-             ucast_recv_buf_size="20000000"
-             ucast_send_buf_size="640000"
-             mcast_recv_buf_size="25000000"
-             mcast_send_buf_size="640000"
-             loopback="true"
-             discard_incompatible_packets="true"
-             max_bundle_size="64000"
-             max_bundle_timeout="30"
-             use_incoming_packet_handler="true"
-             ip_ttl="${jgroups.udp.ip_ttl:2}"
-             enable_bundling="true"
-                 
-             use_concurrent_stack="true"
-
-		     thread_pool.enabled="true"
-		     thread_pool.min_threads="1"
-		     thread_pool.max_threads="25"
-		     thread_pool.keep_alive_time="5000"
-		     thread_pool.queue_enabled="false"
-		     thread_pool.queue_max_size="100"
-		     thread_pool.rejection_policy="Run"
-		
-		     oob_thread_pool.enabled="true"
-		     oob_thread_pool.min_threads="1"
-		     oob_thread_pool.max_threads="8"
-		     oob_thread_pool.keep_alive_time="5000"
-		     oob_thread_pool.queue_enabled="false"
-		     oob_thread_pool.queue_max_size="100"
-		     oob_thread_pool.rejection_policy="Run"/>
-          <PING timeout="2000" num_initial_members="3"/>
-          <MERGE2 max_interval="100000" min_interval="20000"/>
-          <FD_SOCK/>
-          <FD timeout="10000" max_tries="5" shun="true"/>
-          <VERIFY_SUSPECT timeout="1500"/>
-          <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                   retransmit_timeout="300,600,1200,2400,4800"
-                   discard_delivered_msgs="true"/>
-          <UNICAST timeout="300,600,1200,2400,3600"/>
-          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                   max_bytes="400000"/>
-          <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                   shun="true"
-                   view_bundling="true"
-                   view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
-          <FRAG2 frag_size="60000"/>
-          <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-          <pbcast.STATE_TRANSFER/>
-          <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-    
-
-    <stack name="udp-sync"
-           description="IP multicast based stack, without flow control and without message bundling. This should be used
-           instead of udp if (1) synchronous calls are used and (2) the message volume (rate and size)
-            is not that large. Don't use this configuration if you send messages at a high sustained rate, or you might
-            run out of memory">
-        <config>
-            <UDP
-                 mcast_port="${jgroups.udp_sync.mcast_port:45699}"
-                 mcast_addr="${jgroups.udp.mcast_addr:229.11.11.11}"
-                 tos="8"
-                 ucast_recv_buf_size="20000000"
-                 ucast_send_buf_size="640000"
-                 mcast_recv_buf_size="25000000"
-                 mcast_send_buf_size="640000"
-                 loopback="true"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 ip_ttl="${jgroups.udp.ip_ttl:2}"
-                 enable_bundling="false"
-                 
-                 use_concurrent_stack="true"
-
-		         thread_pool.enabled="true"
-		         thread_pool.min_threads="1"
-		         thread_pool.max_threads="25"
-    		     thread_pool.keep_alive_time="5000"
-    		     thread_pool.queue_enabled="false"
-    		     thread_pool.queue_max_size="100"
-    		     thread_pool.rejection_policy="Run"
-    		
-    		     oob_thread_pool.enabled="true"
-    		     oob_thread_pool.min_threads="1"
-    		     oob_thread_pool.max_threads="8"
-    		     oob_thread_pool.keep_alive_time="5000"
-    		     oob_thread_pool.queue_enabled="false"
-    		     oob_thread_pool.queue_max_size="100"
-    		     oob_thread_pool.rejection_policy="Run"/>
-            <PING timeout="2000" num_initial_members="3"/>
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                    retransmit_timeout="300,600,1200,2400,4800"
-                    discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                    max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                    shun="true"
-                    view_bundling="true"
-                    view_ack_collection_timeout="5000"/>
-            <FRAG2 frag_size="60000"/>
-            <!--pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-
-
-    <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 (routers discard multicast)">
-        <config>
-            <TCP start_port="7600"
-                 tcp_nodelay="true"
-                 loopback="false"
-                 recv_buf_size="20000000"
-                 send_buf_size="640000"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 enable_bundling="true"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"
-                 
-                 use_concurrent_stack="true"
-	
-		         thread_pool.enabled="true"
-		         thread_pool.min_threads="1"
-		         thread_pool.max_threads="25"
-		         thread_pool.keep_alive_time="5000"
-		         thread_pool.queue_enabled="false"
-		         thread_pool.queue_max_size="100"
-		         thread_pool.rejection_policy="run"
-		
-		         oob_thread_pool.enabled="true"
-		         oob_thread_pool.min_threads="1"
-		         oob_thread_pool.max_threads="8"
-		         oob_thread_pool.keep_alive_time="5000"
-		         oob_thread_pool.queue_enabled="false"
-		         oob_thread_pool.queue_max_size="100"
-		         oob_thread_pool.rejection_policy="run"/>
-		    <!-- 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}"
-                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>            
-            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
-                 of all possible cluster members.
-            <TCPPING timeout="3000"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
-                     port_range="1"
-                     num_initial_members="3"/>
-             -->
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        shun="true"
-                        view_bundling="true"
-                        view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
-            <FRAG2 frag_size="60000"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-
-
-    <stack name="tcp-sync"
-           description="TCP based stack, without flow control and without message bundling. This is usually used when IP
-           multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast). This
-           configuration should be used instead of tcp when (1) synchronous calls are used and (2) the message volume
-           (rate and size) is not that large">
-        <config>
-            <TCP start_port="7650"
-                 tcp_nodelay="true"
-                 loopback="false"
-                 recv_buf_size="20000000"
-                 send_buf_size="640000"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 enable_bundling="false"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"
-                 
-                 use_concurrent_stack="true"
-                 
-                 thread_pool.enabled="true"
-		         thread_pool.min_threads="1"
-		         thread_pool.max_threads="25"
-		         thread_pool.keep_alive_time="5000"
-		         thread_pool.queue_enabled="false"
-		         thread_pool.queue_max_size="100"
-		         thread_pool.rejection_policy="run"
-		
-		         oob_thread_pool.enabled="true"
-		         oob_thread_pool.min_threads="1"
-		         oob_thread_pool.max_threads="8"
-		         oob_thread_pool.keep_alive_time="5000"
-		         oob_thread_pool.queue_enabled="false"
-		         oob_thread_pool.queue_max_size="100"
-		         oob_thread_pool.rejection_policy="run"/>
-            <!-- 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}"
-                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>           
-            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
-                 of all possible cluster members.
-            <TCPPING timeout="3000"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7650],localhost[7651]}"
-                     port_range="1"
-                     num_initial_members="3"/>
-            -->
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        shun="true"
-                        view_bundling="true"
-                        view_ack_collection_timeout="5000"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-    
-    <stack name="jbm-control"
-           description="Stack optimized for the JBoss Messaging Control Channel">
-       <config>
-            <UDP
-                 mcast_addr="${jboss.messaging.controlchanneludpaddress,jboss.partition.udpGroup:228.7.7.7}"
-                 mcast_port="${jboss.messaging.controlchanneludpport:45568}"
-                 tos="8"
-                 ucast_recv_buf_size="20000000"
-                 ucast_send_buf_size="640000"
-                 mcast_recv_buf_size="25000000"
-                 mcast_send_buf_size="640000"
-                 loopback="false"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 ip_ttl="${jboss.messaging.ipttl:8}"
-                 enable_bundling="false"
-                 enable_diagnostics="true"
-                 thread_naming_pattern="cl"
-
-                 use_concurrent_stack="true"
-
-                 thread_pool.enabled="true"
-                 thread_pool.min_threads="1"
-                 thread_pool.max_threads="200"
-                 thread_pool.keep_alive_time="5000"
-                 thread_pool.queue_enabled="true"
-                 thread_pool.queue_max_size="1000"
-                 thread_pool.rejection_policy="Run"
-
-                 oob_thread_pool.enabled="true"
-                 oob_thread_pool.min_threads="1"
-                 oob_thread_pool.max_threads="8"
-                 oob_thread_pool.keep_alive_time="5000"
-                 oob_thread_pool.queue_enabled="false"
-                 oob_thread_pool.queue_max_size="100"
-                 oob_thread_pool.rejection_policy="Run"/>
-            <PING timeout="2000"
-                  num_initial_members="3"/>
-            <MERGE2 max_interval="100000"
-                    min_interval="20000"/>
-            <FD_SOCK />
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" />
-            <BARRIER />
-            <pbcast.NAKACK use_stats_for_retransmission="false"
-                   exponential_backoff="150"
-                   use_mcast_xmit="true" gc_lag="0"
-                   retransmit_timeout="50,300,600,1200"
-                   discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           max_bytes="400000"/>
-            <VIEW_SYNC avg_send_interval="10000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                shun="false"
-                view_bundling="true"/>
-            <FC max_credits="500000"
-                    min_threshold="0.20"/>
-            <FRAG2 frag_size="60000"  />
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="20000"/>
-        </config>
-    </stack>
-    
-    <stack name="jbm-data"
-           description="Stack optimized for the JBoss Messaging Data Channel">
-        <config>
-            <TCP start_port="7900"
-                 loopback="true"
-                 recv_buf_size="20000000"
-                 send_buf_size="640000"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 enable_bundling="false"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"
-                 use_concurrent_stack="true" 
-                 thread_pool.enabled="true"
-                 thread_pool.min_threads="1"
-                 thread_pool.max_threads="200"
-                 thread_pool.keep_alive_time="5000"
-                 thread_pool.queue_enabled="true" 
-                 thread_pool.queue_max_size="500"
-                 thread_pool.rejection_policy="run"
-                 oob_thread_pool.enabled="true"
-                 oob_thread_pool.min_threads="1"
-                 oob_thread_pool.max_threads="100" 
-                 oob_thread_pool.keep_alive_time="5000"
-                 oob_thread_pool.queue_enabled="false"
-                 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_port="${jboss.messaging.datachanneludpport:45567}"
-               ip_ttl="${jboss.messaging.ipttl:8}"
-               num_initial_members="5"
-               num_ping_requests="3"/>
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <BARRIER/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           max_bytes="400000"/>
-            <VIEW_SYNC avg_send_interval="10000"/>
-
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                shun="false" view_bundling="true"/>
-        </config>
-    </stack>
-           
-    
-    <stack name="tunnel"
-           description="Used with a GossipRouter">
-        <config>
-            <TUNNEL router_port="12001" router_host="127.0.0.1"/>
-            <PING timeout="2000"
-                  num_initial_members="3"
-                  gossip_refresh="10000"
-                  gossip_host="127.0.0.1"
-                  gossip_port="12001"/>
-            <MERGE2 max_interval="20000" min_interval="5000"/>
-            <FD_SOCK/>
-            <FD timeout="2000" max_tries="3" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="5000"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        shun="false"
-                        view_bundling="true"
-                        view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
-            <FRAG2 frag_size="60000"/>
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-    
-    <stack name="udp-nonconcurrent"
-           description="UDP based stack with the concurrent stack disabled. Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
-        <config>
-          <UDP
-             mcast_port="${jgroups.udp_nonconcurrent.mcast_port:55688}"
-             mcast_addr="${jgroups.udp.mcast_addr:228.12.12.12}"
-             tos="8"
-             ucast_recv_buf_size="20000000"
-             ucast_send_buf_size="640000"
-             mcast_recv_buf_size="25000000"
-             mcast_send_buf_size="640000"
-             loopback="true"
-             discard_incompatible_packets="true"
-             max_bundle_size="64000"
-             max_bundle_timeout="30"
-             use_incoming_packet_handler="true"
-             ip_ttl="${jgroups.udp.ip_ttl:2}"
-             enable_bundling="true"                 
-             use_concurrent_stack="false"/>
-          <PING timeout="2000" num_initial_members="3"/>
-          <MERGE2 max_interval="100000" min_interval="20000"/>
-          <FD_SOCK/>
-          <FD timeout="10000" max_tries="5" shun="true"/>
-          <VERIFY_SUSPECT timeout="1500"/>
-          <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                   retransmit_timeout="300,600,1200,2400,4800"
-                   discard_delivered_msgs="true"/>
-          <UNICAST timeout="300,600,1200,2400,3600"/>
-          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                   max_bytes="400000"/>
-          <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                   shun="true"
-                   view_bundling="true"
-                   view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
-          <FRAG2 frag_size="60000"/>
-          <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-          <pbcast.STATE_TRANSFER/>
-          <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-    
-
-    <stack name="udp-sync-nonconcurrent"
-           description="UDP based stack for sycnhronous communication with the concurrent stack disabled. 
-                        Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
-        <config>
-            <UDP
-                 mcast_port="${jgroups.udp_sync_nonconcurrent.mcast_port:55699}"
-                 mcast_addr="${jgroups.udp.mcast_addr:229.12.12.12}"
-                 tos="8"
-                 ucast_recv_buf_size="20000000"
-                 ucast_send_buf_size="640000"
-                 mcast_recv_buf_size="25000000"
-                 mcast_send_buf_size="640000"
-                 loopback="true"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 ip_ttl="${jgroups.udp.ip_ttl:2}"
-                 enable_bundling="false"                 
-                 use_concurrent_stack="false"/>
-            <PING timeout="2000" num_initial_members="3"/>
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                    retransmit_timeout="300,600,1200,2400,4800"
-                    discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                    max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                    shun="true"
-                    view_bundling="true"
-                    view_ack_collection_timeout="5000"/>
-            <FRAG2 frag_size="60000"/>
-            <!--pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-
-    <stack name="tcp-nonconcurrent"
-           description="TCP based stack, with flow control and message bundling but the concurrent stack disabled. 
-                        Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
-        <config>
-            <TCP start_port="7700"
-                 tcp_nodelay="true"
-                 loopback="false"
-                 recv_buf_size="20000000"
-                 send_buf_size="640000"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 enable_bundling="true"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"                 
-                 use_concurrent_stack="false"/>
-            <!-- Alternative 1: multicast-based automatic discovery. -->   
-            <MPING timeout="3000"
-                   num_initial_members="3"
-                   mcast_addr="${jgroups.udp.mcast_addr:230.12.12.12}"
-                   mcast_port="${jgroups.tcp_mping_nonconcurrent.mcast_port:55700}"
-                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>           
-            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
-                 of all possible cluster members.
-            <TCPPING timeout="3000"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
-                     port_range="1"
-                     num_initial_members="3"/>
-            -->
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           discard_delivered_msgs="true"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        shun="true"
-                        view_bundling="true"
-                        view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
-            <FRAG2 frag_size="60000"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-
-
-    <stack name="tcp-sync-nonconcurrent"
-           description="TCP based stack, without flow control and without message bundling and the concurrent stack disabled. 
-                        Temporarily available until JBoss Messaging certifies usage of the concurrent stack.">
-        <config>
-            <TCP start_port="7650"
-                 tcp_nodelay="true"
-                 loopback="false"
-                 recv_buf_size="20000000"
-                 send_buf_size="640000"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 enable_bundling="false"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"
-                 use_concurrent_stack="false"/>
-            <!-- Alternative 1: multicast-based automatic discovery. -->   
-            <MPING timeout="3000"
-                   num_initial_members="3"
-                   mcast_addr="${jgroups.udp.mcast_addr:231.12.12.12}"
-                   mcast_port="${jgroups.tcp_sync_nonconcurrent_mping.mcast_port:55701}"
-                   ip_ttl="${jgroups.udp.ip_ttl:2}"/>           
-            <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration
-                 of all possible cluster members.
-            <TCPPING timeout="3000"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7650],localhost[7651]}"
-                     port_range="1"
-                     num_initial_members="3"/>
-            -->
-            <MERGE2 max_interval="100000" min_interval="20000"/>
-            <FD_SOCK/>
-            <FD timeout="10000" max_tries="5" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500"/>
-            <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           discard_delivered_msgs="true"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        shun="true"
-                        view_bundling="true"
-                        view_ack_collection_timeout="5000"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
-    </stack>
-
-</protocol_stacks>
-
-

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java	2008-03-26 19:34:40 UTC (rev 71312)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java	2008-03-26 19:46:59 UTC (rev 71313)
@@ -507,7 +507,7 @@
       try
       {  
          String partitionName = "DRMTestCasePartition";
-         String muxFile = "jgroups-channelfactory.sar/META-INF/multiplexer-stacks.xml";
+         String muxFile = "jgroups-channelfactory.sar/META-INF/jgroups-channelfactory-stacks.xml";
          String stackName = "tunnel";
          
          log.info("DRMTestCase.testIsMasterReplica() - starting GossipRouter");




More information about the jboss-cvs-commits mailing list