activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r693051 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/transport/peer/ test/java/org/apache/activemq/ test/java/org/apache/activemq/broker/ test/java/org/apache/activemq/network/ test/java/org/apache/activemq/transpor...
Date Mon, 08 Sep 2008 10:52:09 GMT
Author: gtully
Date: Mon Sep  8 03:52:06 2008
New Revision: 693051

URL: http://svn.apache.org/viewvc?rev=693051&view=rev
Log:
AMQ-1489 - reflect the new respect of host and port elements of multicast uri and use of group
as query parameter in the tests that specify a group to ensure some test isolation; resolve
unit test failures

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleBrokersTestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/peer/PeerTransportFactory.java
Mon Sep  8 03:52:06 2008
@@ -92,8 +92,8 @@
                     IntrospectionSupport.setProperties(service, brokerOptions);
                     service.setBrokerName(finalBroker);
                     TransportConnector c = service.addConnector("tcp://localhost:0");
-                    c.setDiscoveryUri(new URI("multicast://" + finalGroup));
-                    service.addNetworkConnector("multicast://" + finalGroup);
+                    c.setDiscoveryUri(new URI("multicast://default?group=" + finalGroup));
+                    service.addNetworkConnector("multicast://default?group=" + finalGroup);
                     return service;
                 }
             });

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleBrokersTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleBrokersTestSupport.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleBrokersTestSupport.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleBrokersTestSupport.java
Mon Sep  8 03:52:06 2008
@@ -129,8 +129,8 @@
             }
 
             TransportConnector transport = (TransportConnector)transportConnectors.get(0);
-            transport.setDiscoveryUri(new URI("multicast://" + groupName));
-            broker.addNetworkConnector("multicast://" + groupName);
+            transport.setDiscoveryUri(new URI("multicast://default?group=" + groupName));
+            broker.addNetworkConnector("multicast://default?group=" + groupName);
         }
 
         // Multicasting may take longer to setup

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
Mon Sep  8 03:52:06 2008
@@ -54,7 +54,7 @@
         BrokerService service = new BrokerService();
         service.setPersistent(false);
         service.setUseJmx(true);
-        NetworkConnector connector = service.addNetworkConnector("multicast://group-"+System.currentTimeMillis());
+        NetworkConnector connector = service.addNetworkConnector("multicast://default?group=group-"+System.currentTimeMillis());
         service.start();
 
         service.removeNetworkConnector(connector);
@@ -66,7 +66,7 @@
         BrokerService service = new BrokerService();
         service.setPersistent(false);
         service.setUseJmx(false);
-        NetworkConnector connector = service.addNetworkConnector("multicast://group-"+System.currentTimeMillis());
+        NetworkConnector connector = service.addNetworkConnector("multicast://default?group=group-"+System.currentTimeMillis());
         service.start();
 
         service.removeNetworkConnector(connector);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
Mon Sep  8 03:52:06 2008
@@ -203,11 +203,11 @@
         TransportConnector transportConnector = new TransportConnector();
         transportConnector.setUri(new URI("tcp://localhost:"+(60000+brokerId)));
         
-        transportConnector.setDiscoveryUri(new URI("multicast://"+groupId));        
+        transportConnector.setDiscoveryUri(new URI("multicast://default?group="+groupId));
       
         broker.addConnector(transportConnector);
                         
         DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector();
-        networkConnector.setUri(new URI("multicast://"+groupId));
+        networkConnector.setUri(new URI("multicast://default?group="+groupId));
 	    networkConnector.setBridgeTempDestinations(true);
 	    networkConnector.setPrefetchSize(1);
 	    broker.addNetworkConnector(networkConnector);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
Mon Sep  8 03:52:06 2008
@@ -112,8 +112,8 @@
 
         String url = "tcp://localhost:0";
         TransportConnector connector = container.addConnector(url);
-        connector.setDiscoveryUri(new URI("multicast://"+groupId));
-        container.addNetworkConnector("multicast://"+groupId);
+        connector.setDiscoveryUri(new URI("multicast://default?group="+groupId));
+        container.addNetworkConnector("multicast://default?group="+groupId);
         container.start();
 
         services.add(container);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
Mon Sep  8 03:52:06 2008
@@ -134,7 +134,7 @@
     	if ( groupName == null ) {
     		groupName = "group-"+System.currentTimeMillis();
     	}
-        return "multicast://"+groupName;
+        return "multicast://default?group="+groupName;
     }
 
     protected TransportConnector createRemoteConnector() throws Exception, IOException, URISyntaxException
{

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
Mon Sep  8 03:52:06 2008
@@ -140,43 +140,43 @@
     }
 
     public void testSendReceiveUsingDiscovery() throws Exception {
-        sendUri = "discovery:multicast://"+groupId;
-        recvUri = "discovery:multicast://"+groupId;
+        sendUri = "discovery:multicast://default?group="+groupId;
+        recvUri = "discovery:multicast://default?group="+groupId;
         createMulticastBrokerNetwork();
         doSendReceiveTest();
     }
 
     public void testMultipleConsumersConnectUsingDiscovery() throws Exception {
-        sendUri = "discovery:multicast://"+groupId;
-        recvUri = "discovery:multicast://"+groupId;
+        sendUri = "discovery:multicast://default?group="+groupId;
+        recvUri = "discovery:multicast://default?group="+groupId;
         createMulticastBrokerNetwork();
         doMultipleConsumersConnectTest();
     }
 
     public void testSendReceiveUsingAutoAssignFailover() throws Exception {
-        sendUri = "failover:(discovery:multicast://"+groupId+")";
-        recvUri = "failover:(discovery:multicast://"+groupId+")";
+        sendUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
+        recvUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
         createAutoAssignMulticastBrokerNetwork();
         doSendReceiveTest();
     }
 
     public void testMultipleConsumersConnectUsingAutoAssignFailover() throws Exception {
-        sendUri = "failover:(discovery:multicast://"+groupId+")";
-        recvUri = "failover:(discovery:multicast://"+groupId+")";
+        sendUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
+        recvUri = "failover:(discovery:multicast:default?group=//"+groupId+")";
         createAutoAssignMulticastBrokerNetwork();
         doMultipleConsumersConnectTest();
     }
 
     public void testSendReceiveUsingAutoAssignDiscovery() throws Exception {
-        sendUri = "discovery:multicast://"+groupId;
-        recvUri = "discovery:multicast://"+groupId;
+        sendUri = "discovery:multicast://default?group="+groupId;
+        recvUri = "discovery:multicast://default?group="+groupId;
         createAutoAssignMulticastBrokerNetwork();
         doSendReceiveTest();
     }
 
     public void testMultipleConsumersConnectUsingAutoAssignDiscovery() throws Exception {
-        sendUri = "discovery:multicast://"+groupId;
-        recvUri = "discovery:multicast://"+groupId;
+        sendUri = "discovery:multicast://default?group="+groupId;
+        recvUri = "discovery:multicast://default?group="+groupId;
         createAutoAssignMulticastBrokerNetwork();
         doMultipleConsumersConnectTest();
     }

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/transport/stomp/stomp-auth-broker.xml
Mon Sep  8 03:52:06 2008
@@ -25,7 +25,7 @@
   		<property name="annotatedClass"><value>org.apache.activemq.transport.stomp.SamplePojo</value></property>
   </bean>
 
-  <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core"
populateJMSXUserID="true">
+  <broker useJmx="true" persistent="false" xmlns="http://activemq.apache.org/schema/core"
populateJMSXUserID="true">
 
 	<transportConnectors>
 		<transportConnector name="stomp"   uri="stomp://localhost:61613"/>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
Mon Sep  8 03:52:06 2008
@@ -21,11 +21,11 @@
 
   <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://${groupId}"/>
+      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default?group=${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://${groupId}"/>
+      <networkConnector uri="multicast://default?group=${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
Mon Sep  8 03:52:06 2008
@@ -21,11 +21,11 @@
 
   <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://${groupId}"/>
+      <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://default?group=${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://${groupId}"/>
+      <networkConnector uri="multicast://default?group=${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
Mon Sep  8 03:52:06 2008
@@ -21,11 +21,11 @@
 
   <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://${groupId}"/>
+      <networkConnector uri="multicast://default?group=${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
Mon Sep  8 03:52:06 2008
@@ -21,11 +21,11 @@
 
   <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://${groupId}"/>
+      <networkConnector uri="multicast://default?group=${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml?rev=693051&r1=693050&r2=693051&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
Mon Sep  8 03:52:06 2008
@@ -21,11 +21,11 @@
 
   <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://${groupId}"/>
+      <networkConnector uri="multicast://default?group=${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>



Mime
View raw message