[jboss-cvs] JBoss Messaging SVN: r1910 - in trunk: src/etc/META-INF src/etc/server/default/deploy tests tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Jan 6 01:27:39 EST 2007


Author: clebert.suconic at jboss.com
Date: 2007-01-06 01:27:32 -0500 (Sat, 06 Jan 2007)
New Revision: 1910

Added:
   trunk/src/etc/server/default/deploy/multiplexer-stacks.xml
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/NamedJChannelFactory.java
Removed:
   trunk/src/etc/META-INF/multiplexer-stacks.xml
Modified:
   trunk/src/etc/server/default/deploy/multiplexer-service.xml
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java
   trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-578 - Refactoring packages

Deleted: trunk/src/etc/META-INF/multiplexer-stacks.xml
===================================================================
--- trunk/src/etc/META-INF/multiplexer-stacks.xml	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/src/etc/META-INF/multiplexer-stacks.xml	2007-01-06 06:27:32 UTC (rev 1910)
@@ -1,330 +0,0 @@
-
-<!--
-  Sample file that defines a number of stacks, used by the multiplexer
-  Author: Bela Ban
-  Version: $Id: multiplexer-stacks.xml 56961 2006-09-19 03:55:11 +0000 (Tue, 19 Sep 2006) bstansberry at jboss.com $
--->
-<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="false"
-             discard_incompatible_packets="true"
-             max_bundle_size="64000"
-             max_bundle_timeout="30"
-             use_incoming_packet_handler="true"
-             use_outgoing_packet_handler="false"
-             ip_ttl="${jgroups.udp.ip_ttl:2}"
-             down_thread="false" up_thread="false"
-             enable_bundling="true"/>
-          <PING timeout="2000"
-             down_thread="false" up_thread="false" num_initial_members="3"/>
-          <MERGE2 max_interval="100000"
-             down_thread="false" up_thread="false" min_interval="20000"/>
-          <FD_SOCK down_thread="false" up_thread="false"/>
-          <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-          <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-          <pbcast.NAKACK max_xmit_size="60000"
-                   use_mcast_xmit="false" gc_lag="0"
-                   retransmit_timeout="300,600,1200,2400,4800"
-                   down_thread="false" up_thread="false"
-                   discard_delivered_msgs="true"/>
-          <UNICAST timeout="300,600,1200,2400,3600"
-             down_thread="false" up_thread="false"/>
-          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                   down_thread="false" up_thread="false"
-                   max_bytes="400000"/>
-          <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                   down_thread="false" up_thread="false"
-                   join_retry_timeout="2000" shun="true"
-                   view_bundling="true"/>
-          <FC max_credits="2000000" down_thread="false" up_thread="false"
-              min_threshold="0.10"/>
-          <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-          <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                   use_flush="true" use_reading_thread="true"/ -->
-          <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-          <pbcast.FLUSH down_thread="false" up_thread="false"/>
-        </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.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="false"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 use_outgoing_packet_handler="false"
-                 ip_ttl="${jgroups.udp.ip_ttl:2}"
-                 down_thread="false" up_thread="false"
-                 enable_bundling="false"/>
-            <PING timeout="2000"
-                  down_thread="false" up_thread="false" num_initial_members="3"/>
-            <MERGE2 max_interval="100000"
-                    down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-            <pbcast.NAKACK max_xmit_size="60000"
-                    use_mcast_xmit="false" gc_lag="0"
-                    retransmit_timeout="300,600,1200,2400,4800"
-                    down_thread="false" up_thread="false"
-                    discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"
-                    down_thread="false" up_thread="false"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                    down_thread="false" up_thread="false"
-                    max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                    down_thread="false" up_thread="false"
-                    join_retry_timeout="2000" shun="true"
-                    view_bundling="true"/>
-            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-            <!--pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                    use_flush="true" use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-        </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"
-                 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"
-                 use_outgoing_packet_handler="false"
-                 down_thread="false" up_thread="false"
-                 enable_bundling="true"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"/>
-            <TCPPING timeout="3000"
-                     down_thread="false" up_thread="false"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
-                     port_range="1"
-                     num_initial_members="3"/>
-            <MERGE2 max_interval="100000"
-                    down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-            <pbcast.NAKACK max_xmit_size="60000"
-                           use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           down_thread="false" up_thread="false"
-                           discard_delivered_msgs="true"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           down_thread="false" up_thread="false"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        down_thread="false" up_thread="false"
-                        join_retry_timeout="2000" shun="true"
-                        view_bundling="true"/>
-            <FC max_credits="2000000" down_thread="false" up_thread="false"
-                min_threshold="0.10"/>
-            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                      use_flush="true" use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-        </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"
-                 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"
-                 use_outgoing_packet_handler="false"
-                 down_thread="false" up_thread="false"
-                 enable_bundling="false"
-                 use_send_queues="false"
-                 sock_conn_timeout="300"
-                 skip_suspected_members="true"/>
-            <TCPPING timeout="3000"
-                     down_thread="false" up_thread="false"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7650],localhost[7651]}"
-                     port_range="1"
-                     num_initial_members="3"/>
-            <MERGE2 max_interval="100000"
-                    down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-            <pbcast.NAKACK max_xmit_size="60000"
-                           use_mcast_xmit="false" gc_lag="0"
-                           retransmit_timeout="300,600,1200,2400,4800"
-                           down_thread="false" up_thread="false"
-                           discard_delivered_msgs="true"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                           down_thread="false" up_thread="false"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        down_thread="false" up_thread="false"
-                        join_retry_timeout="2000" shun="true"
-                        view_bundling="true"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                         use_flush="true" use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-        </config>
-    </stack>
-
-
-    <stack name="tcp_nio"
-           description="TCP_NIO 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_NIO
-                   recv_buf_size="20000000"
-                   send_buf_size="640000"
-                   loopback="false"
-                   discard_incompatible_packets="true"
-                   max_bundle_size="64000"
-                   max_bundle_timeout="30"
-                   use_incoming_packet_handler="true"
-                   use_outgoing_packet_handler="false"
-                   down_thread="false" up_thread="false"
-                   enable_bundling="true"
-                   start_port="7700"
-                   use_send_queues="false"
-                   sock_conn_timeout="300" skip_suspected_members="true"
-                   reader_threads="8"
-                   writer_threads="8"
-                   processor_threads="8"
-                   processor_minThreads="8"
-                   processor_maxThreads="8"
-                   processor_queueSize="100"
-                   processor_keepAliveTime="-1"/>
-            <TCPPING timeout="3000"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7700],localhost[7701]}"
-                     port_range="1"
-                     num_initial_members="3"
-                     down_thread="false" up_thread="false"/>
-            <MERGE2 max_interval="100000"
-                  down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-            <pbcast.NAKACK max_xmit_size="60000"
-                   use_mcast_xmit="false" gc_lag="0"
-                   retransmit_timeout="300,600,1200,2400,4800"
-                   down_thread="false" up_thread="false"
-                   discard_delivered_msgs="true"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                   down_thread="false" up_thread="false"
-                   max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                   down_thread="false" up_thread="false"
-                   join_retry_timeout="2000" shun="true"
-                   view_bundling="true"/>
-            <FC max_credits="2000000" down_thread="false" up_thread="false"
-                min_threshold="0.10"/>
-            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                   use_flush="true" use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-        </config>
-    </stack>
-
-
-    <stack name="tcp_nio-sync"
-           description="TCP_NIO 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). 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_NIO
-                     recv_buf_size="20000000"
-                     send_buf_size="640000"
-                     loopback="false"
-                     discard_incompatible_packets="true"
-                     max_bundle_size="64000"
-                     max_bundle_timeout="30"
-                     use_incoming_packet_handler="true"
-                     use_outgoing_packet_handler="false"
-                     down_thread="false" up_thread="false"
-                     enable_bundling="false"
-                     start_port="7750"
-                     use_send_queues="false"
-                     sock_conn_timeout="300" skip_suspected_members="true"
-                     reader_threads="8"
-                     writer_threads="8"
-                     processor_threads="8"
-                     processor_minThreads="8"
-                     processor_maxThreads="8"
-                     processor_queueSize="100"
-                     processor_keepAliveTime="-1"/>
-            <TCPPING timeout="3000"
-                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7750],localhost[7751]}"
-                     port_range="1"
-                     num_initial_members="3"
-                     down_thread="false" up_thread="false"/>
-            <MERGE2 max_interval="100000"
-                    down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-            <pbcast.NAKACK max_xmit_size="60000"
-                        use_mcast_xmit="false" gc_lag="0"
-                        retransmit_timeout="300,600,1200,2400,4800"
-                        down_thread="false" up_thread="false"
-                        discard_delivered_msgs="true"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                        down_thread="false" up_thread="false"
-                        max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        down_thread="false" up_thread="false"
-                        join_retry_timeout="2000" shun="true"
-                        view_bundling="true"/>
-            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
-                        use_flush="true" use_reading_thread="true"/ -->
-            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-            <pbcast.FLUSH down_thread="false" up_thread="false"/>
-        </config>
-    </stack>
-
-</protocol_stacks>
-
-

Modified: trunk/src/etc/server/default/deploy/multiplexer-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/multiplexer-service.xml	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/src/etc/server/default/deploy/multiplexer-service.xml	2007-01-06 06:27:32 UTC (rev 1910)
@@ -15,7 +15,7 @@
     <mbean code="org.jgroups.jmx.JChannelFactory" name="jgroups.mux:name=Multiplexer">
     <!--mbean code="org.jgroups.JChannelFactory" name="jgroups.mux:name=Multiplexer" xmbean-dd="resource:META-INF/multiplexer-xmbean.xml" -->
         <attribute name="Domain">jgroups.mux</attribute>
-        <attribute name="MultiplexerConfig">META-INF/multiplexer-stacks.xml</attribute>
+        <attribute name="MultiplexerConfig">multiplexer-stacks.xml</attribute>
         <attribute name="ExposeChannels">true</attribute>
         <attribute name="ExposeProtocols">true</attribute>
 


Property changes on: trunk/src/etc/server/default/deploy/multiplexer-service.xml
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Copied: trunk/src/etc/server/default/deploy/multiplexer-stacks.xml (from rev 1892, trunk/src/etc/META-INF/multiplexer-stacks.xml)
===================================================================
--- trunk/src/etc/META-INF/multiplexer-stacks.xml	2007-01-04 22:02:16 UTC (rev 1892)
+++ trunk/src/etc/server/default/deploy/multiplexer-stacks.xml	2007-01-06 06:27:32 UTC (rev 1910)
@@ -0,0 +1,330 @@
+
+<!--
+  Sample file that defines a number of stacks, used by the multiplexer
+  Author: Bela Ban
+  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="false"
+             discard_incompatible_packets="true"
+             max_bundle_size="64000"
+             max_bundle_timeout="30"
+             use_incoming_packet_handler="true"
+             use_outgoing_packet_handler="false"
+             ip_ttl="${jgroups.udp.ip_ttl:2}"
+             down_thread="false" up_thread="false"
+             enable_bundling="true"/>
+          <PING timeout="2000"
+             down_thread="false" up_thread="false" num_initial_members="3"/>
+          <MERGE2 max_interval="100000"
+             down_thread="false" up_thread="false" min_interval="20000"/>
+          <FD_SOCK down_thread="false" up_thread="false"/>
+          <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+          <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+          <pbcast.NAKACK max_xmit_size="60000"
+                   use_mcast_xmit="false" gc_lag="0"
+                   retransmit_timeout="300,600,1200,2400,4800"
+                   down_thread="false" up_thread="false"
+                   discard_delivered_msgs="true"/>
+          <UNICAST timeout="300,600,1200,2400,3600"
+             down_thread="false" up_thread="false"/>
+          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                   down_thread="false" up_thread="false"
+                   max_bytes="400000"/>
+          <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                   down_thread="false" up_thread="false"
+                   join_retry_timeout="2000" shun="true"
+                   view_bundling="true"/>
+          <FC max_credits="2000000" down_thread="false" up_thread="false"
+              min_threshold="0.10"/>
+          <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+          <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+                   use_flush="true" use_reading_thread="true"/ -->
+          <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+          <pbcast.FLUSH down_thread="false" up_thread="false"/>
+        </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.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="false"
+                 discard_incompatible_packets="true"
+                 max_bundle_size="64000"
+                 max_bundle_timeout="30"
+                 use_incoming_packet_handler="true"
+                 use_outgoing_packet_handler="false"
+                 ip_ttl="${jgroups.udp.ip_ttl:2}"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"/>
+            <PING timeout="2000"
+                  down_thread="false" up_thread="false" num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                    use_mcast_xmit="false" gc_lag="0"
+                    retransmit_timeout="300,600,1200,2400,4800"
+                    down_thread="false" up_thread="false"
+                    discard_delivered_msgs="true"/>
+            <UNICAST timeout="300,600,1200,2400,3600"
+                    down_thread="false" up_thread="false"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                    down_thread="false" up_thread="false"
+                    max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                    down_thread="false" up_thread="false"
+                    join_retry_timeout="2000" shun="true"
+                    view_bundling="true"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <!--pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+                    use_flush="true" use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false"/>
+        </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"
+                 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"
+                 use_outgoing_packet_handler="false"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="true"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"/>
+            <TCPPING timeout="3000"
+                     down_thread="false" up_thread="false"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7600],localhost[7601]}"
+                     port_range="1"
+                     num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="true"
+                        view_bundling="true"/>
+            <FC max_credits="2000000" down_thread="false" up_thread="false"
+                min_threshold="0.10"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+                      use_flush="true" use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false"/>
+        </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"
+                 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"
+                 use_outgoing_packet_handler="false"
+                 down_thread="false" up_thread="false"
+                 enable_bundling="false"
+                 use_send_queues="false"
+                 sock_conn_timeout="300"
+                 skip_suspected_members="true"/>
+            <TCPPING timeout="3000"
+                     down_thread="false" up_thread="false"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7650],localhost[7651]}"
+                     port_range="1"
+                     num_initial_members="3"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                           use_mcast_xmit="false" gc_lag="0"
+                           retransmit_timeout="300,600,1200,2400,4800"
+                           down_thread="false" up_thread="false"
+                           discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                           down_thread="false" up_thread="false"
+                           max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="true"
+                        view_bundling="true"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+                         use_flush="true" use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false"/>
+        </config>
+    </stack>
+
+
+    <stack name="tcp_nio"
+           description="TCP_NIO 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_NIO
+                   recv_buf_size="20000000"
+                   send_buf_size="640000"
+                   loopback="false"
+                   discard_incompatible_packets="true"
+                   max_bundle_size="64000"
+                   max_bundle_timeout="30"
+                   use_incoming_packet_handler="true"
+                   use_outgoing_packet_handler="false"
+                   down_thread="false" up_thread="false"
+                   enable_bundling="true"
+                   start_port="7700"
+                   use_send_queues="false"
+                   sock_conn_timeout="300" skip_suspected_members="true"
+                   reader_threads="8"
+                   writer_threads="8"
+                   processor_threads="8"
+                   processor_minThreads="8"
+                   processor_maxThreads="8"
+                   processor_queueSize="100"
+                   processor_keepAliveTime="-1"/>
+            <TCPPING timeout="3000"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7700],localhost[7701]}"
+                     port_range="1"
+                     num_initial_members="3"
+                     down_thread="false" up_thread="false"/>
+            <MERGE2 max_interval="100000"
+                  down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                   use_mcast_xmit="false" gc_lag="0"
+                   retransmit_timeout="300,600,1200,2400,4800"
+                   down_thread="false" up_thread="false"
+                   discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                   down_thread="false" up_thread="false"
+                   max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                   down_thread="false" up_thread="false"
+                   join_retry_timeout="2000" shun="true"
+                   view_bundling="true"/>
+            <FC max_credits="2000000" down_thread="false" up_thread="false"
+                min_threshold="0.10"/>
+            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+                   use_flush="true" use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false"/>
+        </config>
+    </stack>
+
+
+    <stack name="tcp_nio-sync"
+           description="TCP_NIO 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). 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_NIO
+                     recv_buf_size="20000000"
+                     send_buf_size="640000"
+                     loopback="false"
+                     discard_incompatible_packets="true"
+                     max_bundle_size="64000"
+                     max_bundle_timeout="30"
+                     use_incoming_packet_handler="true"
+                     use_outgoing_packet_handler="false"
+                     down_thread="false" up_thread="false"
+                     enable_bundling="false"
+                     start_port="7750"
+                     use_send_queues="false"
+                     sock_conn_timeout="300" skip_suspected_members="true"
+                     reader_threads="8"
+                     writer_threads="8"
+                     processor_threads="8"
+                     processor_minThreads="8"
+                     processor_maxThreads="8"
+                     processor_queueSize="100"
+                     processor_keepAliveTime="-1"/>
+            <TCPPING timeout="3000"
+                     initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7750],localhost[7751]}"
+                     port_range="1"
+                     num_initial_members="3"
+                     down_thread="false" up_thread="false"/>
+            <MERGE2 max_interval="100000"
+                    down_thread="false" up_thread="false" min_interval="20000"/>
+            <FD_SOCK down_thread="false" up_thread="false"/>
+            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+            <pbcast.NAKACK max_xmit_size="60000"
+                        use_mcast_xmit="false" gc_lag="0"
+                        retransmit_timeout="300,600,1200,2400,4800"
+                        down_thread="false" up_thread="false"
+                        discard_delivered_msgs="true"/>
+            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                        down_thread="false" up_thread="false"
+                        max_bytes="400000"/>
+            <pbcast.GMS print_local_addr="true" join_timeout="3000"
+                        down_thread="false" up_thread="false"
+                        join_retry_timeout="2000" shun="true"
+                        view_bundling="true"/>
+            <!-- pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
+                        use_flush="true" use_reading_thread="true"/ -->
+            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+            <pbcast.FLUSH down_thread="false" up_thread="false"/>
+        </config>
+    </stack>
+
+</protocol_stacks>
+
+


Property changes on: trunk/src/etc/server/default/deploy/multiplexer-stacks.xml
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/build.xml	2007-01-06 06:27:32 UTC (rev 1910)
@@ -189,6 +189,7 @@
       <pathelement location="${tests.root}/etc"/>
       <pathelement location="${build.tests.classes}"/>
       <pathelement location="${project.root}/src/etc"/> <!-- server's configuration files -->
+      <pathelement location="${project.root}/src/etc/server/default/deploy"/>
       <path refid="test.compilation.classpath"/>
       <path refid="dom4j.dom4j.classpath"/>
       <path refid="apache.log4j.classpath"/>

Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java	2007-01-06 06:27:32 UTC (rev 1910)
@@ -40,7 +40,6 @@
 import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
 import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
 import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.channelfactory.NameChannelFactory;
 import org.jboss.messaging.core.tx.Transaction;
 import org.jboss.test.messaging.core.SimpleCondition;
 import org.jboss.test.messaging.core.SimpleConditionFactory;
@@ -57,7 +56,7 @@
  * A DefaultClusteredPostOfficeTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision$</tt>
  *
  * $Id$
  *
@@ -2282,7 +2281,7 @@
             sc.getClusteredPostOfficeSQLProperties(), true, nodeId,
             "Clustered", ms, pm, tr, ff, cf, pool,
             groupName,
-            new NameChannelFactory(JGroupsUtil.getControlStackProperties(),
+            new NamedJChannelFactory(JGroupsUtil.getControlStackProperties(),
                JGroupsUtil.getDataStackProperties()),
             5000, 5000, pullPolicy, rf, mapper, 1000);
 


Property changes on: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java	2007-01-06 06:27:32 UTC (rev 1910)
@@ -35,7 +35,6 @@
 import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
 import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
 import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.channelfactory.NameChannelFactory;
 import org.jboss.test.messaging.core.SimpleCondition;
 import org.jboss.test.messaging.core.SimpleConditionFactory;
 import org.jboss.test.messaging.core.SimpleFilterFactory;
@@ -49,7 +48,7 @@
  * A DefaultClusteredPostOfficeWithDefaultRouterTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision$</tt>
  *
  * $Id$
  *
@@ -393,7 +392,7 @@
             sc.getClusteredPostOfficeSQLProperties(), true, nodeId,
             "Clustered", ms, pm, tr, ff, cf, pool,
             groupName,
-            new NameChannelFactory(JGroupsUtil.getControlStackProperties(),
+            new NamedJChannelFactory(JGroupsUtil.getControlStackProperties(),
                JGroupsUtil.getDataStackProperties()),
             5000, 5000, redistPolicy, rf, mapper, 1000);
 


Property changes on: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java	2007-01-06 06:27:32 UTC (rev 1910)
@@ -47,7 +47,7 @@
 import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
 import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
 import org.jboss.messaging.core.plugin.postoffice.cluster.QueueStats;
-import org.jboss.messaging.core.plugin.postoffice.cluster.channelfactory.NameChannelFactory;
+import org.jboss.test.messaging.core.plugin.postoffice.cluster.NamedJChannelFactory;
 import org.jboss.messaging.core.tx.Transaction;
 import org.jboss.test.messaging.core.SimpleConditionFactory;
 import org.jboss.test.messaging.core.SimpleFilterFactory;
@@ -60,7 +60,7 @@
  * A DefaultRouterTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision$</tt>
  *
  * $Id$
  *
@@ -367,7 +367,7 @@
             sc.getClusteredPostOfficeSQLProperties(), true, nodeId,
             "Clustered", ms, pm, tr, ff, cf, pool,
             groupName,
-            new NameChannelFactory(JGroupsUtil.getControlStackProperties(),
+            new NamedJChannelFactory(JGroupsUtil.getControlStackProperties(),
                JGroupsUtil.getDataStackProperties()),
             5000, 5000, redistPolicy, rf, mapper, 1000);
 


Property changes on: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Added: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/NamedJChannelFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/NamedJChannelFactory.java	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/NamedJChannelFactory.java	2007-01-06 06:27:32 UTC (rev 1910)
@@ -0,0 +1,97 @@
+/*
+   * JBoss, Home of Professional Open Source
+   * Copyright 2005, JBoss Inc., and individual contributors as indicated
+   * by the @authors tag. See the copyright.txt in the distribution for a
+   * full listing of individual contributors.
+   *
+   * This is free software; you can redistribute it and/or modify it
+   * under the terms of the GNU Lesser General Public License as
+   * published by the Free Software Foundation; either version 2.1 of
+   * the License, or (at your option) any later version.
+   *
+   * This software is distributed in the hope that it will be useful,
+   * but WITHOUT ANY WARRANTY; without even the implied warranty of
+   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   * Lesser General Public License for more details.
+   *
+   * You should have received a copy of the GNU Lesser General Public
+   * License along with this software; if not, write to the Free
+   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+   */
+
+package org.jboss.test.messaging.core.plugin.postoffice.cluster;
+
+import org.jgroups.JChannel;
+import org.jboss.messaging.core.plugin.postoffice.cluster.jchannelfactory.JChannelFactory;
+
+/**
+ * A JChannelFactory that will use config names (from jchannelfactory)
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ * @version <tt>$Revision$</tt>
+ *          <p/>
+ *          $Id$
+ */
+public class NamedJChannelFactory implements JChannelFactory
+{
+
+   // Constants
+
+   // Attributes
+
+   String asyncConfig;
+   String syncConfig;
+
+   // Static
+
+   // Constructors
+
+   public NamedJChannelFactory(String syncConfig, String asyncConfig)
+   {
+      this.syncConfig = syncConfig;
+      this.asyncConfig = asyncConfig;
+   }
+
+   // Public
+
+   public String getAsyncConfig()
+   {
+      return asyncConfig;
+   }
+
+   public void setAsyncConfig(String asyncConfig)
+   {
+      this.asyncConfig = asyncConfig;
+   }
+
+   public String getSyncConfig()
+   {
+      return syncConfig;
+   }
+
+   public void setSyncConfig(String syncConfig)
+   {
+      this.syncConfig = syncConfig;
+   }
+
+   // JChannelFactory implementation
+
+   public JChannel createSyncChannel() throws Exception
+   {
+      return new JChannel(syncConfig);
+   }
+
+   public JChannel createASyncChannel() throws Exception
+   {
+      return new JChannel(asyncConfig);
+   }
+
+   // Package protected
+
+   // Protected
+
+   // Private
+
+   // Inner classes
+
+}


Property changes on: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/NamedJChannelFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java	2007-01-06 06:27:32 UTC (rev 1910)
@@ -37,7 +37,6 @@
 import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
 import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
 import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.channelfactory.NameChannelFactory;
 import org.jboss.messaging.core.tx.Transaction;
 import org.jboss.messaging.core.tx.TransactionException;
 import org.jboss.test.messaging.core.SimpleCondition;
@@ -53,7 +52,7 @@
  * A RecoveryTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision$</tt>
  *          <p/>
  *          $Id$
  */
@@ -366,7 +365,7 @@
             sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "Clustered",
             ms, pm, tr, ff, cf, pool,
             groupName,
-            new NameChannelFactory(JGroupsUtil.getControlStackProperties(),
+            new NamedJChannelFactory(JGroupsUtil.getControlStackProperties(),
                JGroupsUtil.getDataStackProperties()),
             5000, 5000, redistPolicy, rf, mapper, 1000);
 


Property changes on: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java	2007-01-06 06:08:03 UTC (rev 1909)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java	2007-01-06 06:27:32 UTC (rev 1910)
@@ -44,7 +44,6 @@
 import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory;
 import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
 import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.channelfactory.NameChannelFactory;
 import org.jboss.messaging.core.tx.Transaction;
 import org.jboss.test.messaging.core.SimpleCondition;
 import org.jboss.test.messaging.core.SimpleConditionFactory;
@@ -60,7 +59,7 @@
  * A RedistributionWithDefaultMessagePullPolicyTest
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision$</tt>
  *          <p/>
  *          $Id$
  */
@@ -1165,7 +1164,7 @@
             sc.getClusteredPostOfficeSQLProperties(), true, nodeId,
             "Clustered", ms, pm, tr, ff, cf, pool,
             groupName,
-            new NameChannelFactory(JGroupsUtil.getControlStackProperties(),
+            new NamedJChannelFactory(JGroupsUtil.getControlStackProperties(),
                JGroupsUtil.getDataStackProperties()),
             10000, 10000, pullPolicy, rf, mapper, 1000);
 


Property changes on: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision




More information about the jboss-cvs-commits mailing list