Author: rajdavies
Date: Tue Jan 31 08:25:17 2006
New Revision: 373858
URL: http://svn.apache.org/viewcvs?rev=373858&view=rev
Log:
Changed api to setBrokerName() on DemandForwardBridge instead of setClientId
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java?rev=373858&r1=373857&r2=373858&view=diff
==============================================================================
---
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
(original)
+++
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java
Tue Jan 31 08:25:17 2006
@@ -57,7 +57,7 @@
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();
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java?rev=373858&r1=373857&r2=373858&view=diff
==============================================================================
---
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
(original)
+++
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java
Tue Jan 31 08:25:17 2006
@@ -44,7 +44,7 @@
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();
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java?rev=373858&r1=373857&r2=373858&view=diff
==============================================================================
---
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
(original)
+++
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.java
Tue Jan 31 08:25:17 2006
@@ -47,6 +47,8 @@
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 @@
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 @@
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 @@
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);
@@ -197,6 +206,9 @@
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);
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java?rev=373858&r1=373857&r2=373858&view=diff
==============================================================================
---
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
(original)
+++
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java
Tue Jan 31 08:25:17 2006
@@ -44,7 +44,7 @@
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();
Modified:
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java?rev=373858&r1=373857&r2=373858&view=diff
==============================================================================
---
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
(original)
+++
incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
Tue Jan 31 08:25:17 2006
@@ -125,7 +125,7 @@
super.serviceLocalCommand(command);
}
};
- bridge.setClientId(localBroker.getBrokerName() + "_to_" +
remoteBroker.getBrokerName());
+ bridge.setLocalBrokerName(localBroker.getBrokerName());
bridges.add(bridge);
bridge.start();
