Changed api to setBrokerName() on DemandForwardBridge instead of setClientId

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@373858 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java

@@ -57,7 +57,7 @@ public class MultiBrokersMultiClientsUsingTcpTest extends MultiBrokersMultiClien
             if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) {
                 DemandForwardingBridge bridge = new DemandForwardingBridge(TransportFactory.connect(localURI),
                                                                            TransportFactory.connect(remoteURI));
-                bridge.setClientId(localBroker.getBrokerName() + "_to_" + remoteBroker.getBrokerName());
+                bridge.setLocalBrokerName(localBroker.getBrokerName());
                 bridges.add(bridge);
 
                 bridge.start();

assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java

@@ -44,7 +44,7 @@ public class ThreeBrokerQueueNetworkUsingTcpTest extends ThreeBrokerQueueNetwork
             if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) {
                 DemandForwardingBridge bridge = new DemandForwardingBridge(TransportFactory.connect(localURI),
                                                                            TransportFactory.connect(remoteURI));
-                bridge.setClientId(localBroker.getBrokerName() + "_to_" + remoteBroker.getBrokerName());
+                bridge.setLocalBrokerName(localBroker.getBrokerName());
                 bridges.add(bridge);
 
                 bridge.start();

assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java

@@ -47,6 +47,8 @@ public class ThreeBrokerTopicNetworkTest extends JmsMultipleBrokersTestSupport {
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
 
+//      let consumers propogate around the network
+        Thread.sleep(2000);
         // Send messages
         sendMessages("BrokerA", dest, MESSAGE_COUNT);
         sendMessages("BrokerB", dest, MESSAGE_COUNT);
@@ -84,6 +86,8 @@ public class ThreeBrokerTopicNetworkTest extends JmsMultipleBrokersTestSupport {
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
 
+//      let consumers propogate around the network
+        Thread.sleep(2000);
         // Send messages
         sendMessages("BrokerA", dest, MESSAGE_COUNT);
         sendMessages("BrokerB", dest, MESSAGE_COUNT);
@@ -121,6 +125,9 @@ public class ThreeBrokerTopicNetworkTest extends JmsMultipleBrokersTestSupport {
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
 
+//      let consumers propogate around the network
+        Thread.sleep(2000);
+        
         // Send messages
         sendMessages("BrokerA", dest, MESSAGE_COUNT);
         sendMessages("BrokerB", dest, MESSAGE_COUNT);
@@ -161,6 +168,8 @@ public class ThreeBrokerTopicNetworkTest extends JmsMultipleBrokersTestSupport {
         MessageConsumer clientA = createConsumer("BrokerA", dest);
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
+        //let consumers propogate around the network
+        Thread.sleep(2000);
 
         // Send messages
         sendMessages("BrokerA", dest, MESSAGE_COUNT);
@@ -198,6 +207,9 @@ public class ThreeBrokerTopicNetworkTest extends JmsMultipleBrokersTestSupport {
         MessageConsumer clientB = createConsumer("BrokerB", dest);
         MessageConsumer clientC = createConsumer("BrokerC", dest);
         
+        //let consumers propogate around the network
+        Thread.sleep(2000);
+
         // Send messages
         sendMessages("BrokerA", dest, MESSAGE_COUNT);
         sendMessages("BrokerB", dest, MESSAGE_COUNT);

assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java

@@ -44,7 +44,7 @@ public class ThreeBrokerTopicNetworkUsingTcpTest extends ThreeBrokerTopicNetwork
             if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) {
                 DemandForwardingBridge bridge = new DemandForwardingBridge(TransportFactory.connect(localURI),
                                                                            TransportFactory.connect(remoteURI));
-                bridge.setClientId(localBroker.getBrokerName() + "_to_" + remoteBroker.getBrokerName());
+                bridge.setLocalBrokerName(localBroker.getBrokerName());
                 bridges.add(bridge);
 
                 bridge.start();

assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java

@@ -125,7 +125,7 @@ public class TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest extends JmsMultip
                         super.serviceLocalCommand(command);
                     }
                 };
-                bridge.setClientId(localBroker.getBrokerName() + "_to_" + remoteBroker.getBrokerName());
+                bridge.setLocalBrokerName(localBroker.getBrokerName());
                 bridges.add(bridge);
 
                 bridge.start();