Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 62789 invoked from network); 21 Mar 2007 09:19:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Mar 2007 09:19:22 -0000 Received: (qmail 20240 invoked by uid 500); 21 Mar 2007 09:19:30 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 20220 invoked by uid 500); 21 Mar 2007 09:19:29 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 20211 invoked by uid 99); 21 Mar 2007 09:19:29 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 02:19:29 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 02:19:20 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2331B1A9838; Wed, 21 Mar 2007 02:19:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r520814 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/ main/java/org/apache/activemq/network/ main/java/org/apache/activemq/transport/discovery/simple/ test/java/org/apache/activemq/ test/java/org/apache/activ... Date: Wed, 21 Mar 2007 09:18:59 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070321091900.2331B1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Wed Mar 21 02:18:56 2007 New Revision: 520814 URL: http://svn.apache.org/viewvc?view=rev&rev=520814 Log: fix for broker name not being registered with the network connector Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AMQDeadlockTest3.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Wed Mar 21 02:18:56 2007 @@ -1084,11 +1084,14 @@ try{ Properties props = MarshallingSupport.stringToProperties(info.getNetworkProperties()); NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); - IntrospectionSupport.setProperties(config,props,null); - config.setLocalBrokerName(broker.getBrokerName()); + IntrospectionSupport.setProperties(config,props,""); + config.setBrokerName(broker.getBrokerName()); Transport localTransport = TransportFactory.connect(broker.getVmConnectorURI()); - localTransport.start(); duplexBridge = NetworkBridgeFactory.createBridge(config,localTransport,transport); + //now turn duplex off this side + duplexBridge.setCreatedByDuplex(true); + duplexBridge.start(); + log.info("Created Duplex Bridge back to " + info.getBrokerName()); }catch(Exception e){ log.error("Creating duplex network bridge",e); } @@ -1096,6 +1099,7 @@ // We only expect to get one broker info command per connection if(this.brokerInfo!=null){ log.warn("Unexpected extra broker info command received: "+info); + Thread.dumpStack(); } this.brokerInfo=info; broker.addBroker(this,info); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Wed Mar 21 02:18:56 2007 @@ -84,7 +84,6 @@ protected ProducerInfo producerInfo; protected String remoteBrokerName = "Unknown"; protected String localClientId; - protected String name = "bridge"; protected ConsumerInfo demandConsumerInfo; protected int demandConsumerDispatched; protected final AtomicBoolean localBridgeStarted = new AtomicBoolean(false); @@ -104,6 +103,7 @@ protected final AtomicBoolean lastConnectSucceeded = new AtomicBoolean(false); protected NetworkBridgeConfiguration configuration; private NetworkBridgeFailedListener bridgeFailedListener; + private boolean createdByDuplex; public DemandForwardingBridgeSupport(NetworkBridgeConfiguration configuration, Transport localBroker, Transport remoteBroker) { @@ -230,7 +230,7 @@ localConnectionInfo=new ConnectionInfo(); localConnectionInfo.setConnectionId(new ConnectionId(idGenerator.generateId())); - localClientId="NC_"+remoteBrokerName+"_inbound"+name; + localClientId="NC_"+remoteBrokerName+"_inbound"+configuration.getBrokerName(); localConnectionInfo.setClientId(localClientId); localConnectionInfo.setUserName(configuration.getUserName()); localConnectionInfo.setPassword(configuration.getPassword()); @@ -259,21 +259,23 @@ remoteConnectionInfo=new ConnectionInfo(); remoteConnectionInfo.setConnectionId(new ConnectionId(idGenerator.generateId())); - remoteConnectionInfo.setClientId("NC_"+configuration.getLocalBrokerName()+"_outbound"+name); + remoteConnectionInfo.setClientId("NC_"+configuration.getBrokerName()+"_outbound"); remoteConnectionInfo.setUserName(configuration.getUserName()); remoteConnectionInfo.setPassword(configuration.getPassword()); remoteBroker.oneway(remoteConnectionInfo); - + if (isCreatedByDuplex()==false) { BrokerInfo brokerInfo=new BrokerInfo(); - brokerInfo.setBrokerName(configuration.getLocalBrokerName()); + brokerInfo.setBrokerName(configuration.getBrokerName()); brokerInfo.setNetworkConnection(true); brokerInfo.setDuplexConnection(configuration.isDuplex()); + //set our properties Properties props = new Properties(); IntrospectionSupport.getProperties(this,props,null); String str = MarshallingSupport.propertiesToString(props); - brokerInfo.setNetworkProperties(str); + brokerInfo.setNetworkProperties(str); remoteBroker.oneway(brokerInfo); + } SessionInfo remoteSessionInfo=new SessionInfo(remoteConnectionInfo,1); remoteBroker.oneway(remoteSessionInfo); @@ -303,7 +305,7 @@ } public void stop() throws Exception{ - log.debug(" stopping "+configuration.getLocalBrokerName()+" bridge to "+remoteBrokerName+" is disposed already ? "+disposed); + log.debug(" stopping "+configuration.getBrokerName()+" bridge to "+remoteBrokerName+" is disposed already ? "+disposed); boolean wasDisposedAlready=disposed; if(!disposed){ try{ @@ -321,9 +323,9 @@ } } if(wasDisposedAlready){ - log.debug(configuration.getLocalBrokerName()+" bridge to "+remoteBrokerName+" stopped"); + log.debug(configuration.getBrokerName()+" bridge to "+remoteBrokerName+" stopped"); }else{ - log.info(configuration.getLocalBrokerName()+" bridge to "+remoteBrokerName+" stopped"); + log.info(configuration.getBrokerName()+" bridge to "+remoteBrokerName+" stopped"); } } @@ -386,6 +388,7 @@ } private void serviceRemoteConsumerAdvisory(DataStructure data) throws IOException { + final int networkTTL = configuration.getNetworkTTL(); if(data.getClass()==ConsumerInfo.class){ // Create a new local subscription @@ -393,19 +396,19 @@ BrokerId[] path=info.getBrokerPath(); if((path!=null&&path.length>= networkTTL)){ if(log.isDebugEnabled()) - log.debug(configuration.getLocalBrokerName() + " Ignoring Subscription " + info + " restricted to " + networkTTL + " network hops only"); + log.debug(configuration.getBrokerName() + " Ignoring Subscription " + info + " restricted to " + networkTTL + " network hops only"); return; } if(contains(info.getBrokerPath(),localBrokerPath[0])){ // Ignore this consumer as it's a consumer we locally sent to the broker. if(log.isDebugEnabled()) - log.debug(configuration.getLocalBrokerName() + " Ignoring sub " + info + " already routed through this broker once"); + log.debug(configuration.getBrokerName() + " Ignoring sub " + info + " already routed through this broker once"); return; } if (!isPermissableDestination(info.getDestination())){ //ignore if not in the permited or in the excluded list if(log.isDebugEnabled()) - log.debug(configuration.getLocalBrokerName() + " Ignoring sub " + info + " destination " + info.getDestination() + " is not permiited"); + log.debug(configuration.getBrokerName() + " Ignoring sub " + info + " destination " + info.getDestination() + " is not permiited"); return; } // Update the packet to show where it came from. @@ -415,10 +418,10 @@ if (sub != null){ addSubscription(sub); if(log.isDebugEnabled()) - log.debug(configuration.getLocalBrokerName() + " Forwarding sub on "+localBroker+" from "+remoteBrokerName+" : "+info); + log.debug(configuration.getBrokerName() + " Forwarding sub on "+localBroker+" from "+remoteBrokerName+" : "+info); }else { if(log.isDebugEnabled()) - log.debug(configuration.getLocalBrokerName() + " Ignoring sub " + info + " already subscribed to matching destination"); + log.debug(configuration.getBrokerName() + " Ignoring sub " + info + " already subscribed to matching destination"); } } else if (data.getClass()==DestinationInfo.class){ @@ -510,7 +513,7 @@ if(sub!=null){ Message message= configureMessage(md); if(trace) - log.trace("bridging "+configuration.getLocalBrokerName()+" -> "+remoteBrokerName+": "+message); + log.trace("bridging "+configuration.getBrokerName()+" -> "+remoteBrokerName+": "+message); @@ -550,7 +553,7 @@ }else if(command.isBrokerInfo()){ serviceLocalBrokerInfo(command); }else if(command.isShutdownInfo()){ - log.info(configuration.getLocalBrokerName()+" Shutting down"); + log.info(configuration.getBrokerName()+" Shutting down"); // Don't shut down the whole connector if the remote side was interrupted. // the local transport is just shutting down temporarily until the remote side // is restored. @@ -643,19 +646,19 @@ public Transport getRemoteBroker() { return remoteBroker; } - + /** - * @return Returns the name. + * @return the createdByDuplex */ - public String getName() { - return name; + public boolean isCreatedByDuplex(){ + return this.createdByDuplex; } - + /** - * @param name The name to set. + * @param createdByDuplex the createdByDuplex to set */ - public void setName(String name) { - this.name=name; + public void setCreatedByDuplex(boolean createdByDuplex){ + this.createdByDuplex=createdByDuplex; } public static boolean contains(BrokerId[] brokerPath, BrokerId brokerId) { @@ -687,10 +690,10 @@ } protected boolean isPermissableDestination(ActiveMQDestination destination) { - // Are we not bridging temp destinations? - if( destination.isTemporary() && !configuration.isBridgeTempDestinations() ) + if( destination.isTemporary() && !configuration.isBridgeTempDestinations() ) { return false; + } DestinationFilter filter=DestinationFilter.parseFilter(destination); ActiveMQDestination[] dests = excludedDestinations; @@ -767,7 +770,6 @@ .getNextSequenceId())); DemandSubscription result=new DemandSubscription(info); result.getLocalInfo().setPriority(ConsumerInfo.NETWORK_CONSUMER_PRIORITY); - return result; } @@ -820,5 +822,4 @@ l.bridgeFailed(); } } - } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java Wed Mar 21 02:18:56 2007 @@ -84,7 +84,6 @@ URI connectUri = uri; log.info("Establishing network connection between from " + localURI + " to " + connectUri); - Transport remoteTransport; try { remoteTransport = TransportFactory.connect(connectUri); @@ -204,7 +203,7 @@ return configureBridge(result); } - protected String createName() { + public String getName() { return discoveryAgent.toString(); } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java Wed Mar 21 02:18:56 2007 @@ -93,7 +93,7 @@ } protected String getSubscriberName(ActiveMQDestination dest){ - String subscriberName = configuration.getLocalBrokerName()+"_"+dest.getPhysicalName(); + String subscriberName = configuration.getBrokerName()+"_"+dest.getPhysicalName(); return subscriberName; } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java Wed Mar 21 02:18:56 2007 @@ -145,7 +145,7 @@ } } - protected String createName() { + public String getName() { return remoteTransport.toString(); } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java Wed Mar 21 02:18:56 2007 @@ -29,7 +29,7 @@ private boolean bridgeTempDestinations=true; private int prefetchSize=1000; private int networkTTL=1; - private String localBrokerName="Unknow"; + private String brokerName="localhost"; private String userName; private String password; private String destinationFilter = ">"; @@ -128,18 +128,18 @@ /** - * @return the localBrokerName + * @return the brokerName */ - public String getLocalBrokerName(){ - return this.localBrokerName; + public String getBrokerName(){ + return this.brokerName; } /** - * @param localBrokerName the localBrokerName to set + * @param brokerName the localBrokerName to set */ - public void setLocalBrokerName(String localBrokerName){ - this.localBrokerName=localBrokerName; + public void setBrokerName(String brokerName){ + this.brokerName=brokerName; } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java Wed Mar 21 02:18:56 2007 @@ -14,7 +14,6 @@ package org.apache.activemq.network; -import static org.apache.activemq.network.NetworkConnector.log; import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -36,12 +35,10 @@ protected static final Log log=LogFactory.getLog(NetworkConnector.class); protected URI localURI; - private String brokerName="localhost"; private Set durableDestinations; private List excludedDestinations=new CopyOnWriteArrayList(); private List dynamicallyIncludedDestinations=new CopyOnWriteArrayList(); private List staticallyIncludedDestinations=new CopyOnWriteArrayList(); - private String name="bridge"; protected ConnectionFilter connectionFilter; protected ServiceSupport serviceSupport=new ServiceSupport(){ @@ -69,34 +66,7 @@ this.localURI=localURI; } - /** - * @return Returns the name. - */ - public String getName(){ - if(name==null){ - name=createName(); - } - return name; - } - - /** - * @param name The name to set. - */ - public void setName(String name){ - this.name=name; - } - - public String getBrokerName(){ - return brokerName; - } - - /** - * @param brokerName The brokerName to set. - */ - public void setBrokerName(String brokerName){ - this.brokerName=brokerName; - } - + /** * @return Returns the durableDestinations. */ @@ -177,7 +147,6 @@ // Implementation methods // ------------------------------------------------------------------------- protected NetworkBridge configureBridge(DemandForwardingBridgeSupport result){ - result.setName(getBrokerName()); List destsList=getDynamicallyIncludedDestinations(); ActiveMQDestination dests[]=(ActiveMQDestination[])destsList.toArray(new ActiveMQDestination[destsList.size()]); result.setDynamicallyIncludedDestinations(dests); @@ -195,8 +164,6 @@ return result; } - protected abstract String createName(); - protected Transport createLocalTransport() throws Exception{ return TransportFactory.connect(localURI); } @@ -208,6 +175,8 @@ public void stop() throws Exception{ serviceSupport.stop(); } + + public abstract String getName(); protected void handleStart() throws Exception{ if(localURI==null){ Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java Wed Mar 21 02:18:56 2007 @@ -33,7 +33,7 @@ */ public class SimpleDiscoveryAgent implements DiscoveryAgent { - private long initialReconnectDelay = 1000*5; + private long initialReconnectDelay = 1000; private long maxReconnectDelay = 1000 * 30; private long backOffMultiplier = 2; private boolean useExponentialBackOff = false; Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AMQDeadlockTest3.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AMQDeadlockTest3.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AMQDeadlockTest3.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/AMQDeadlockTest3.java Wed Mar 21 02:18:56 2007 @@ -256,7 +256,6 @@ final NetworkConnector nc = new DiscoveryNetworkConnector(new URI("static:" + uri2)); nc.setBridgeTempDestinations(true); nc.setBrokerName(brokerName); - nc.setName(brokerName + ".nc"); brokerService.addNetworkConnector(nc); } Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java Wed Mar 21 02:18:56 2007 @@ -126,7 +126,7 @@ protected void setUp() throws Exception { super.setUp(); NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); - config.setLocalBrokerName("local"); + config.setBrokerName("local"); config.setDispatchAsync(false); bridge = new DemandForwardingBridge(config,createTransport(), createRemoteTransport()); bridge.start(); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java Wed Mar 21 02:18:56 2007 @@ -217,8 +217,7 @@ "static:" + uri2 + "," + uri3 + "," + uri4)); nc.setBridgeTempDestinations(true); nc.setBrokerName(brokerName); - nc.setName(brokerName + ".nc"); - + // When using queue limits set this to 1 nc.setPrefetchSize(1000); nc.setNetworkTTL(1); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java Wed Mar 21 02:18:56 2007 @@ -123,7 +123,6 @@ final NetworkConnector nc=new DiscoveryNetworkConnector(new URI("static:"+uri2)); nc.setBridgeTempDestinations(true); nc.setBrokerName(brokerName); - nc.setName(brokerName+".nc"); nc.setPrefetchSize(1); brokerService.addNetworkConnector(nc); } Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java Wed Mar 21 02:18:56 2007 @@ -145,7 +145,6 @@ "static:" + uri2)); nc.setBridgeTempDestinations(true); nc.setBrokerName(brokerName); - nc.setName(brokerName + ".nc"); nc.setPrefetchSize(1); brokerService.addNetworkConnector(nc); } Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.java Wed Mar 21 02:18:56 2007 @@ -58,7 +58,7 @@ // Ensure that we are connecting using tcp if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) { NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); - config.setLocalBrokerName(localBroker.getBrokerName()); + config.setBrokerName(localBroker.getBrokerName()); DemandForwardingBridge bridge = new DemandForwardingBridge(config,TransportFactory.connect(localURI), TransportFactory.connect(remoteURI)); bridges.add(bridge); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.java Wed Mar 21 02:18:56 2007 @@ -45,7 +45,7 @@ // Ensure that we are connecting using tcp if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) { NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); - config.setLocalBrokerName(localBroker.getBrokerName()); + config.setBrokerName(localBroker.getBrokerName()); DemandForwardingBridge bridge = new DemandForwardingBridge(config,TransportFactory.connect(localURI), TransportFactory.connect(remoteURI)); bridges.add(bridge); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.java Wed Mar 21 02:18:56 2007 @@ -45,7 +45,7 @@ // Ensure that we are connecting using tcp if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) { NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); - config.setLocalBrokerName(localBroker.getBrokerName()); + config.setBrokerName(localBroker.getBrokerName()); DemandForwardingBridge bridge = new DemandForwardingBridge(config,TransportFactory.connect(localURI), TransportFactory.connect(remoteURI)); bridges.add(bridge); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java Wed Mar 21 02:18:56 2007 @@ -117,7 +117,7 @@ // Ensure that we are connecting using tcp if (remoteURI.toString().startsWith("tcp:") && localURI.toString().startsWith("tcp:")) { NetworkBridgeConfiguration config = new NetworkBridgeConfiguration(); - config.setLocalBrokerName(localBroker.getBrokerName()); + config.setBrokerName(localBroker.getBrokerName()); DemandForwardingBridge bridge = new DemandForwardingBridge(config,TransportFactory.connect(localURI), TransportFactory.connect(remoteURI)) { protected void serviceLocalCommand(Command command) { Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml?view=auto&rev=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml (added) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/duplexLocalBroker.xml Wed Mar 21 02:18:56 2007 @@ -0,0 +1,44 @@ + + + + + + + + + + + + + duplex = true + dynamicOnly = false + conduitSubscriptions = true + decreaseNetworkConsumerPriority = false + + + + + + + + + + + + + Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker.xml Wed Mar 21 02:18:56 2007 @@ -24,7 +24,7 @@ - + dynamicOnly = false conduitSubscriptions = true decreaseNetworkConsumerPriority = false Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml?view=diff&rev=520814&r1=520813&r2=520814 ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/remoteBroker.xml Wed Mar 21 02:18:56 2007 @@ -23,7 +23,7 @@ - +