svn commit: r646205 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ test/java/org/apache/activemq/usecases/

[rajdavies]

Author: rajdavies
Date: Wed Apr  9 00:11:08 2008
New Revision: 646205

URL: http://svn.apache.org/viewvc?rev=646205&view=rev
Log:
updates for https://issues.apache.org/activemq/browse/AMQ-1645

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=646205&r1=646204&r2=646205&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
 Wed Apr  9 00:11:08 2008
@@ -59,7 +59,8 @@
  */
 public class ActiveMQConnectionFactory extends JNDIBaseStorable implements 
ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, 
StatsCapable, Cloneable {
 
-    public static final String DEFAULT_BROKER_URL = "tcp://localhost:61616";
+    public static final String DEFAULT_BROKER_BIND_URL = 
"tcp://localhost:61616";
+    public static final String DEFAULT_BROKER_URL = 
"failover://"+DEFAULT_BROKER_BIND_URL;
     public static final String DEFAULT_USER = null;
     public static final String DEFAULT_PASSWORD = null;
     public static final int DEFAULT_PRODUCER_WINDOW_SIZE = 0;

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?rev=646205&r1=646204&r2=646205&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
 Wed Apr  9 00:11:08 2008
@@ -45,7 +45,7 @@
 public class ReliableReconnectTest extends TestSupport {
     
     protected static final int MESSAGE_COUNT = 100;
-    protected static final String DEFAULT_BROKER_URL = 
ActiveMQConnectionFactory.DEFAULT_BROKER_URL;
+    protected static final String DEFAULT_BROKER_URL = 
ActiveMQConnectionFactory.DEFAULT_BROKER_BIND_URL;
     private static final int RECEIVE_TIMEOUT = 10000;
     
     protected int deliveryMode = DeliveryMode.PERSISTENT;
@@ -78,8 +78,7 @@
     }
 
     public ActiveMQConnectionFactory getConnectionFactory() throws Exception {
-        String url = "failover://" + DEFAULT_BROKER_URL;
-        return new ActiveMQConnectionFactory(url);
+        return new ActiveMQConnectionFactory();
     }
 
     protected void startBroker(boolean deleteOnStart) throws JMSException {

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java?rev=646205&r1=646204&r2=646205&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
 Wed Apr  9 00:11:08 2008
@@ -32,4 +32,9 @@
     protected ActiveMQConnectionFactory createSenderConnectionFactory() throws 
JMSException {
         return 
createConnectionFactory("org/apache/activemq/usecases/sender-discovery.xml", 
"sender", "vm://sender");
     }
+    
+    protected void setUp() throws Exception{
+        messageCount = 100000;
+        super.setUp();
+    }
 }