[hornetq-commits] JBoss hornetq SVN: r10022 - in trunk: examples/common and 12 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Dec 9 11:55:57 EST 2010


Author: ataylor
Date: 2010-12-09 11:55:56 -0500 (Thu, 09 Dec 2010)
New Revision: 10022

Modified:
   trunk/docs/user-manual/en/clusters.xml
   trunk/examples/common/build.xml
   trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java
   trunk/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java
   trunk/src/config/common/schema/hornetq-configuration.xsd
   trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java
   trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
   trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
   trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
   trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
   trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
   trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java
Log:
added flag for one way clusters

Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/docs/user-manual/en/clusters.xml	2010-12-09 16:55:56 UTC (rev 10022)
@@ -306,8 +306,8 @@
             one server that you know will always be available or a list of servers where at least one will
             be available.</para>
             <para>This doesn't mean that you have to know where all your servers are going to be hosted, you
-            can configure these server to use the reliable servers to connect to. Once they are connected and
-            there where abouts will be propagated via the server it connects to</para>
+            can configure these servers to use the reliable servers to connect to. Once they are connected
+            there connection details will be propagated via the server it connects to</para>
             <section>
                 <title>Configuring a Cluster Connection</title>
             </section>

Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/examples/common/build.xml	2010-12-09 16:55:56 UTC (rev 10022)
@@ -146,6 +146,7 @@
          <jvmarg value="-Dhornetq.example.server.args=${server.args}"/>
          <jvmarg value="-Dhornetq.example.logserveroutput=${hornetq.example.logserveroutput}"/>
          <jvmarg value="-Dhornetq.example.runServer=${hornetq.example.runServer}"/>
+         <!--<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
          <!--<jvmarg value="-Dserver1=true"/>-->
          <arg line="${hornetq.example.beans.file}"/>
          <sysproperty key="java.library.path" value="${java.library.path}${path.separator}${aio.library.path}"/>

Modified: trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java
===================================================================
--- trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -12,11 +12,16 @@
  */
 package org.hornetq.common.example;
 
+import org.hornetq.api.core.TransportConfiguration;
+import org.hornetq.core.client.impl.DelegatingSession;
+import org.hornetq.jms.client.HornetQConnection;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Properties;
 import java.util.logging.Logger;
 
+import javax.jms.Connection;
 import javax.naming.InitialContext;
 
 /**
@@ -214,6 +219,15 @@
       server.destroy();
    }
 
+
+   protected int getServer(Connection connection)
+   {
+      DelegatingSession session = (DelegatingSession) ((HornetQConnection) connection).getInitialSession();
+      TransportConfiguration transportConfiguration = session.getSessionFactory().getConnectorConfiguration();
+      String port = (String) transportConfiguration.getParams().get("port");
+      return Integer.valueOf(port) - 5445;
+   }
+   
    private void reportResultAndExit()
    {
       if (failure)

Modified: trunk/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java
===================================================================
--- trunk/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -160,11 +160,4 @@
       }
    }
 
-   private int getServer(Connection connection)
-   {
-      DelegatingSession session = (DelegatingSession) ((HornetQConnection) connection).getInitialSession();
-      TransportConfiguration transportConfiguration = session.getSessionFactory().getConnectorConfiguration();
-      String port = (String) transportConfiguration.getParams().get("port");
-      return Integer.valueOf(port) - 5445;
-   }
 }

Modified: trunk/src/config/common/schema/hornetq-configuration.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-configuration.xsd	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/src/config/common/schema/hornetq-configuration.xsd	2010-12-09 16:55:56 UTC (rev 10022)
@@ -366,6 +366,7 @@
                         <xsd:sequence>
                             <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"/>
                         </xsd:sequence>
+                        <xsd:attribute name="allow-direct-connections" type="xsd:boolean" use="optional"/>
                     </xsd:complexType>
                 </xsd:element>	
 				<xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref">

Modified: trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -49,6 +49,8 @@
 
    private final int confirmationWindowSize;
 
+   private final boolean allowDirectConnectionsOnly;
+
    public ClusterConnectionConfiguration(final String name,
                                          final String address,
                                          final String connectorName,
@@ -57,7 +59,8 @@
                                          final boolean forwardWhenNoConsumers,
                                          final int maxHops,
                                          final int confirmationWindowSize,
-                                         final List<String> staticConnectors)
+                                         final List<String> staticConnectors,
+                                         final boolean allowDirectConnectionsOnly)
    {
       this.name = name;
       this.address = address;
@@ -69,6 +72,7 @@
       discoveryGroupName = null;
       this.maxHops = maxHops;
       this.confirmationWindowSize = confirmationWindowSize;
+      this.allowDirectConnectionsOnly = allowDirectConnectionsOnly;
    }
 
    public ClusterConnectionConfiguration(final String name,
@@ -91,6 +95,7 @@
       this.staticConnectors = null;
       this.maxHops = maxHops;
       this.confirmationWindowSize = confirmationWindowSize;
+      allowDirectConnectionsOnly = false;
    }
 
    public String getName()
@@ -142,4 +147,9 @@
    {
       return retryInterval;
    }
+
+   public boolean isAllowDirectConnectionsOnly()
+   {
+      return allowDirectConnectionsOnly;
+   }
 }

Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -1002,6 +1002,8 @@
       String discoveryGroupName = null;
 
       List<String> staticConnectorNames = new ArrayList<String>();
+
+      boolean allowDirectConnectionsOnly = false;;
       
       NodeList children = e.getChildNodes();
 
@@ -1015,6 +1017,9 @@
          }
          else if (child.getNodeName().equals("static-connectors"))
          {
+            Node attr = child.getAttributes().getNamedItem("allow-direct-connections-only");
+
+            allowDirectConnectionsOnly = "true".equalsIgnoreCase(attr.getNodeValue()) || allowDirectConnectionsOnly;
             getStaticConnectors(staticConnectorNames, child);
          }
       }
@@ -1031,7 +1036,8 @@
                                                      forwardWhenNoConsumers,
                                                      maxHops,
                                                      confirmationWindowSize,
-                                                     staticConnectorNames);
+                                                     staticConnectorNames,
+                                                     allowDirectConnectionsOnly);
       }
       else
       {

Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -45,6 +45,7 @@
 import org.hornetq.core.server.group.impl.Response;
 import org.hornetq.core.server.management.ManagementService;
 import org.hornetq.core.server.management.Notification;
+import org.hornetq.utils.ExecutorFactory;
 import org.hornetq.utils.TypedProperties;
 import org.hornetq.utils.UUID;
 
@@ -98,7 +99,7 @@
    
    private final TransportConfiguration connector;
 
-   private final boolean allowsDirectConnectionsOnly;
+   private final boolean allowDirectConnectionsOnly;
 
    private final Set<TransportConfiguration> allowableConnections = new HashSet<TransportConfiguration>();
    
@@ -110,7 +111,7 @@
                                 final boolean useDuplicateDetection,
                                 final boolean routeWhenNoConsumers,
                                 final int confirmationWindowSize,
-                                final org.hornetq.utils.ExecutorFactory executorFactory,
+                                final ExecutorFactory executorFactory,
                                 final HornetQServer server,
                                 final PostOffice postOffice,
                                 final ManagementService managementService,
@@ -119,7 +120,8 @@
                                 final UUID nodeUUID,
                                 final boolean backup,
                                 final String clusterUser,
-                                final String clusterPassword) throws Exception
+                                final String clusterPassword,
+                                final boolean allowDirectConnectionsOnly) throws Exception
    {
 
       if (nodeUUID == null)
@@ -131,6 +133,7 @@
       
       this.serverLocator = serverLocator;
 
+      this.allowDirectConnectionsOnly = allowDirectConnectionsOnly;
       if (this.serverLocator != null)
       {
          this.serverLocator.setClusterConnection(true);
@@ -145,8 +148,7 @@
          // a cluster connection will connect to other nodes only if they are directly connected
          // through a static list of connectors or broadcasting using UDP.
          TransportConfiguration[] transportConfigurations = serverLocator.getStaticTransportConfigurations();
-         allowsDirectConnectionsOnly = (transportConfigurations != null);
-         if(allowsDirectConnectionsOnly)
+         if(this.allowDirectConnectionsOnly)
          {
             for (TransportConfiguration transportConfiguration : transportConfigurations)
             {
@@ -154,10 +156,6 @@
             }
          }
       }
-      else
-      {
-         allowsDirectConnectionsOnly = false;
-      }
 
       this.connector = connector;
 
@@ -370,7 +368,7 @@
       server.getClusterManager().notifyNodeUp(nodeID, connectorPair, last, distance);
 
       // if the node is more than 1 hop away, we do not create a bridge for direct cluster connection
-      if (allowsDirectConnectionsOnly && distance > 1 && !allowableConnections.contains(connectorPair.a))
+      if (allowDirectConnectionsOnly && distance > 1 && !allowableConnections.contains(connectorPair.a))
       {
          return;
       }

Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -783,7 +783,8 @@
                                                                       nodeUUID,
                                                                       backup,
                                                                       server.getConfiguration().getClusterUser(),
-                                                                      server.getConfiguration().getClusterPassword());
+                                                                      server.getConfiguration().getClusterPassword(),
+                                                                      config.isAllowDirectConnectionsOnly());
 
       managementService.registerCluster(clusterConnection, config);
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -55,8 +55,8 @@
    
    public void testHeadersRemoved() throws Exception
    {
-      setupClusterConnection("cluster1", 0, 1, "queues", false, 1, isNetty());
-      setupClusterConnection("clusterX", 1, -1, "queues", false, 1, isNetty());
+      setupClusterConnection("cluster1", 0, 1, "queues", false, 1, isNetty(), false);
+      setupClusterConnection("clusterX", 1, -1, "queues", false, 1, isNetty(), false);
       startServers(1, 0);
 
       setupSessionFactory(0, isNetty());

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -1619,7 +1619,8 @@
                                          final String address,
                                          final boolean forwardWhenNoConsumers,
                                          final int maxHops,
-                                         final boolean netty)
+                                         final boolean netty,
+                                         final boolean allowDirectConnectionsOnly)
    {
       HornetQServer serverFrom = servers[nodeFrom];
 
@@ -1649,7 +1650,7 @@
                                                                                       forwardWhenNoConsumers,
                                                                                       maxHops,
                                                                                       1024,
-                                                                                      pairs);
+                                                                                      pairs, allowDirectConnectionsOnly);
       serverFrom.getConfiguration().getClusterConfigurations().add(clusterConf);
    }
 
@@ -1688,7 +1689,7 @@
                                                                                       forwardWhenNoConsumers,
                                                                                       maxHops,
                                                                                       1024,
-                                                                                      pairs);
+                                                                                      pairs, false);
 
       serverFrom.getConfiguration().getClusterConfigurations().add(clusterConf);
    }
@@ -1727,7 +1728,7 @@
                                                                                       forwardWhenNoConsumers,
                                                                                       maxHops,
                                                                                       1024,
-                                                                                      pairs);
+                                                                                      pairs, false);
 
       serverFrom.getConfiguration().getClusterConfigurations().add(clusterConf);
    }

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OneWayChainClusterTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -67,16 +67,16 @@
 
    public void testBasicRoundRobin() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -104,16 +104,16 @@
 
    public void testBasicNonLoadBalanced() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -137,16 +137,16 @@
 
    public void testRoundRobinForwardWhenNoConsumersTrue() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", true, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", true, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", true, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", true, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", true, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", true, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", true, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", true, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -168,16 +168,16 @@
 
    public void testRoundRobinForwardWhenNoConsumersFalseNoLocalQueue() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(4, "queues.testaddress", "queue0", null, false);
 
@@ -194,16 +194,16 @@
 
    public void testRoundRobinForwardWhenNoConsumersFalse() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -227,16 +227,16 @@
 
    public void testRoundRobinForwardWhenNoConsumersFalseLocalConsumer() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -260,16 +260,16 @@
 
    public void testHopsTooLow() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 3, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 3, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 3, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 3, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 3, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 3, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 3, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 3, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -288,16 +288,16 @@
 
    public void testStartStopMiddleOfChain() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
 
       setupSessionFactory(0, isNetty());
-      setupSessionFactory(4, isNetty());
+      setupSessionFactory(4, isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -347,11 +347,11 @@
 
    public void testChainClusterConnections() throws Exception
    {
-      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty());
-      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty());
+      setupClusterConnection("cluster0-1", 0, 1, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster1-2", 1, 2, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster2-3", 2, 3, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster3-4", 3, 4, "queues", false, 4, isNetty(), true);
+      setupClusterConnection("cluster4-X", 4, -1, "queues", false, 4, isNetty(), true);
 
       startServers(0, 1, 2, 3, 4);
       Thread.sleep(2000);

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -39,9 +39,9 @@
       setupServer(1, isFileStorage(), isNetty());
       
       // server #0 is connected to server #1
-      setupClusterConnection("cluster1", 0, 1, "queues", false, 1, isNetty());
+      setupClusterConnection("cluster1", 0, 1, "queues", false, 1,  isNetty(), true);
       // server #1 is connected to nobody
-      setupClusterConnection("clusterX", 1, -1, "queues", false, 1, isNetty());
+      setupClusterConnection("clusterX", 1, -1, "queues", false, 1,  isNetty(), true);
    }
 
    @Override
@@ -58,7 +58,7 @@
       super.tearDown();
    }
 
-   protected boolean isNetty()
+   protected boolean  isNetty()
    {
       return false;
    }
@@ -80,8 +80,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String myFilter = "zebra";
 
@@ -102,8 +102,8 @@
    {
       startServers(0, 1);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String myFilter = "bison";
 
@@ -124,8 +124,8 @@
    {
       startServers(0, 1);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String myFilter = "bison";
 
@@ -161,7 +161,7 @@
 
       Assert.assertTrue("Took too long to restart", end - start <= 5000);
 
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(1,  isNetty(), true);
 
       waitForBindings(0, "queues.testaddress", 0, 0, false);
 
@@ -185,8 +185,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       addConsumer(0, 0, "queue0", null);
@@ -205,8 +205,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
 
@@ -234,8 +234,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(1, "queues.testaddress", "queue0", null, false);
@@ -273,8 +273,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -314,8 +314,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -377,8 +377,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -457,7 +457,7 @@
    {
       startServers(1);
 
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(1, "queues.testaddress", "queue5", null, false);
       createQueue(1, "queues.testaddress", "queue6", null, false);
@@ -483,7 +483,7 @@
 
       waitForBindings(0, "queues.testaddress", 8, 8, false);
 
-      setupSessionFactory(0, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -520,7 +520,7 @@
    {
       startServers(0);
 
-      setupSessionFactory(0, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -544,7 +544,7 @@
 
       startServers(1);
 
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(1, "queues.testaddress", "queue5", null, false);
       createQueue(1, "queues.testaddress", "queue6", null, false);
@@ -583,8 +583,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(1, "queues.testaddress", "queue1", null, false);
@@ -618,8 +618,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String filter1 = "giraffe";
       String filter2 = "aardvark";
@@ -679,8 +679,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String filter1 = "giraffe";
       String filter2 = "aardvark";
@@ -743,8 +743,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -775,14 +775,14 @@
    public void testRouteWhenNoConsumersTrueNonBalancedQueues() throws Exception
    {
       // server #0 is connected to server #1
-      setupClusterConnection("cluster1", 0, 1, "queues", true, 1, isNetty());
+      setupClusterConnection("cluster1", 0, 1, "queues", true, 1,  isNetty(), true);
       // server #1 is connected to nobody
-      setupClusterConnection("clusterX", 1, -1, "queues", false, 1, isNetty());
+      setupClusterConnection("clusterX", 1, -1, "queues", false, 1,  isNetty(), true);
    
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -814,8 +814,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -853,8 +853,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -888,8 +888,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -918,8 +918,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -953,12 +953,12 @@
    {
       servers[0].getConfiguration().getClusterConfigurations().clear();
       // server #0 is connected to server #1
-      setupClusterConnection("cluster1", 0, 1, "queues", true, 1, isNetty());
+      setupClusterConnection("cluster1", 0, 1, "queues", true, 1,  isNetty(), true);
 
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -992,12 +992,12 @@
    {
       servers[0].getConfiguration().getClusterConfigurations().clear();
       // server #0 is connected to server #1
-      setupClusterConnection("cluster1", 0, 1, "queues", true, 1, isNetty());
+      setupClusterConnection("cluster1", 0, 1, "queues", true, 1,  isNetty(), true);
 
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       createQueue(0, "queues.testaddress", "queue0", null, false);
       createQueue(0, "queues.testaddress", "queue1", null, false);
@@ -1026,8 +1026,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String filter1 = "giraffe";
       String filter2 = "aardvark";
@@ -1083,8 +1083,8 @@
    {
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       String filter1 = "giraffe";
       String filter2 = "aardvark";
@@ -1146,13 +1146,13 @@
 
    public void testMultipleClusterConnections() throws Exception
    {
-      setupClusterConnection("cluster2", 0, 1, "q2", false, 1, isNetty());
-      setupClusterConnection("cluster3", 0, 1, "q3", false, 1, isNetty());
+      setupClusterConnection("cluster2", 0, 1, "q2", false, 1,  isNetty(), true);
+      setupClusterConnection("cluster3", 0, 1, "q3", false, 1,  isNetty(), true);
 
       startServers(1, 0);
 
-      setupSessionFactory(0, isNetty());
-      setupSessionFactory(1, isNetty());
+      setupSessionFactory(0,  isNetty(), true);
+      setupSessionFactory(1,  isNetty(), true);
 
       // Make sure the different connections don't conflict
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -45,8 +45,8 @@
 
    protected void setupClusters()
    {
-      setupClusterConnection("cluster0", 0, 1, "queues", false, 1, isNetty());
-      setupClusterConnection("cluster1", 1, 0, "queues", false, 1, isNetty());
+      setupClusterConnection("cluster0", 0, 1, "queues", false, 1, isNetty(), false);
+      setupClusterConnection("cluster1", 1, 0, "queues", false, 1, isNetty(), false);
    }
 
    @Override

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -139,7 +139,7 @@
       ArrayList<String> staticConnectors = new ArrayList<String>();
       staticConnectors.add(liveConnector.getName());
       ClusterConnectionConfiguration cccLive = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1,
-               staticConnectors);
+               staticConnectors, false);
       backupConfig.getClusterConfigurations().add(cccLive);
       backupServer = createBackupServer();
       
@@ -174,7 +174,7 @@
       liveConfig.setClustered(true);
        List<String> pairs = null;
       ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1,
-               pairs);
+               pairs, false);
       liveConfig.getClusterConfigurations().add(ccc0);
       liveConfig.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
       liveServer = createLiveServer();

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -149,7 +149,7 @@
          config1.getConnectorConfigurations().put(connector.getName(), connector);
          clusterNodes.add(connector.getName());
       }
-      ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, clusterNodes);
+      ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, clusterNodes, false);
       config1.getClusterConfigurations().add(ccc1);
 
       config1.setBindingsDirectory(config1.getBindingsDirectory() + "_" + liveNode);
@@ -178,7 +178,7 @@
 
       }
       ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1,
-            pairs);
+            pairs, false);
       config0.getClusterConfigurations().add(ccc0);
       config0.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -63,7 +63,7 @@
                                                                                   false,
                                                                                   1,
                                                                                   1,
-                                                                                  new ArrayList<String>()));
+                                                                                  new ArrayList<String>(), false));
          return config;
       }
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteMultipleLivesMultipleBackupsFailoverTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -174,7 +174,7 @@
          config1.getConnectorConfigurations().put(connector.getName(), connector);
          clusterNodes.add(connector.getName());
       }
-      ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, clusterNodes);
+      ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, clusterNodes, false);
       config1.getClusterConfigurations().add(ccc1);
 
 
@@ -206,7 +206,7 @@
 
       }
       ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1,
-            pairs);
+            pairs, false);
       config0.getClusterConfigurations().add(ccc0);
       config0.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -183,7 +183,7 @@
 
          }
          ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1,
-               pairs);
+               pairs, false);
          config0.getClusterConfigurations().add(ccc0);
          config0.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
 
@@ -270,7 +270,7 @@
       TransportConfiguration backupConnector = createTransportConfiguration(true, false, generateParams(nodeid, true));
       List<String> pairs = null;
       ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1,
-           createClusterConnections? staticConnectors:pairs);
+           createClusterConnections? staticConnectors:pairs, false);
       config1.getClusterConfigurations().add(ccc1);
       config1.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -116,7 +116,7 @@
          staticConnectors.add(liveConnector.getName());
       }
       TransportConfiguration backupConnector = createTransportConfiguration(isNetty(), false, generateParams(nodeid, isNetty()));
-      ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, staticConnectors);
+      ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, staticConnectors, false);
       config1.getClusterConfigurations().add(ccc1);
       config1.getConnectorConfigurations().put(backupConnector.getName(), backupConnector);
 
@@ -146,7 +146,7 @@
 
       }
       ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1,
-            pairs);
+            pairs, false);
       config0.getClusterConfigurations().add(ccc0);
       config0.getConnectorConfigurations().put(liveConnector.getName(), liveConnector);
 

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -77,7 +77,7 @@
                                                                                   false,
                                                                                   1,
                                                                                   1,
-                                                                                  new ArrayList<String>()));
+                                                                                  new ArrayList<String>(), false));
          return config;
       }
 
@@ -111,7 +111,7 @@
                                                                                   false,
                                                                                   1,
                                                                                   1,
-                                                                                  connectors));
+                                                                                  connectors, false));
          return config;
       }
 

Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -363,7 +363,7 @@
       ArrayList<String> staticConnectors = new ArrayList<String>();
       staticConnectors.add(livetc.getName());
       ClusterConnectionConfiguration cccBackup = new ClusterConnectionConfiguration("cluster1", "jms", backuptc.getName(), -1, false, false, 1, 1,
-               staticConnectors);
+               staticConnectors, false);
 
       backupConf.getClusterConfigurations().add(cccBackup);
       backupConf.setSecurityEnabled(false);
@@ -396,7 +396,7 @@
               .add(liveAcceptortc);
        List<String> pairs = null;
       ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", livetc.getName(), -1, false, false, 1, 1,
-               pairs);
+               pairs, false);
       liveConf.getClusterConfigurations().add(ccc0);
       liveConf.setSharedStore(true);
       liveConf.setJournalType(getDefaultJournalType());

Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -211,7 +211,7 @@
                                                                     RandomUtil.randomBoolean(),
                                                                     RandomUtil.randomPositiveInt(),
                                                                     RandomUtil.randomPositiveInt(),
-                                                                    connectors);
+                                                                    connectors, false);
 
       String discoveryGroupName = RandomUtil.randomString();
       DiscoveryGroupConfiguration discoveryGroupConfig = new DiscoveryGroupConfiguration(discoveryGroupName, null, "230.1.2.3", 6745, 500, 0);

Modified: trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java	2010-12-09 16:47:56 UTC (rev 10021)
+++ trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java	2010-12-09 16:55:56 UTC (rev 10022)
@@ -154,7 +154,7 @@
                                                                               true,
                                                                               MAX_HOPS,
                                                                               1024,
-                                                                              toOtherServerPair));
+                                                                              toOtherServerPair, false));
 
 
       JMSConfigurationImpl jmsconfig = new JMSConfigurationImpl();
@@ -199,7 +199,7 @@
                                                                               true,
                                                                               MAX_HOPS,
                                                                               1024,
-                                                                              toOtherServerPair));
+                                                                              toOtherServerPair, false));
 
       
       JMSConfigurationImpl jmsconfig = new JMSConfigurationImpl();



More information about the hornetq-commits mailing list