QPID-3026: remove incomplete support for multiple ApplicationRegistry instances to be active at one time

Applied patch by Keith Wall and myself

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

5 files changed, 10 insertions, 13 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
index ec222ff03d..011700d634 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
@@ -20,15 +20,12 @@
  */
 package org.apache.qpid.server.failover;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.AMQDisconnectedException;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
-import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.util.InternalBrokerBaseCase;
 import org.apache.qpid.url.URLSyntaxException;
 import org.slf4j.Logger;
@@ -47,13 +44,13 @@ public class FailoverMethodTest extends InternalBrokerBaseCase implements Except
     public void createBroker() throws Exception
     {
         super.createBroker();
-        TransportConnection.createVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
+        TransportConnection.createVMBroker(TransportConnection.DEFAULT_VM_PORT);
     }
 
     @Override
     public void stopBroker()
     {
-        TransportConnection.killVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
+        TransportConnection.killVMBroker(TransportConnection.DEFAULT_VM_PORT);
         super.stopBroker();
     }
 
@@ -71,7 +68,7 @@ public class FailoverMethodTest extends InternalBrokerBaseCase implements Except
         //note: The VM broker has no connect delay and the default 1 retry
         //        while the tcp:localhost broker has 3 retries with a 2s connect delay
         String connectionString = "amqp://guest:guest@/test?brokerlist=" +
-                                  "'vm://:" + ApplicationRegistry.DEFAULT_INSTANCE +
+                                  "'vm://:" + TransportConnection.DEFAULT_VM_PORT +
                                   ";tcp://localhost:5670?connectdelay='2000',retries='3''";
 
         AMQConnectionURL url = new AMQConnectionURL(connectionString);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
index 3e03ad0872..fd86fc8e21 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
@@ -65,6 +65,6 @@ public class CauseFailureInVM implements CauseFailure
         int liveBroker = inVMTest.getLiveBroker();
 
         TransportConnection.killVMBroker(liveBroker);
-        ApplicationRegistry.remove(liveBroker);
+        ApplicationRegistry.remove();
     }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
index b92a72a654..c43318165d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
@@ -88,7 +88,7 @@ public class InVMBrokerDecorator extends WrappedSuiteTestDecorator
                             // Ensure that the in-vm broker is created.
                             try
                             {
-                                ApplicationRegistry.getInstance(1);
+                                ApplicationRegistry.getInstance();
                                 TransportConnection.createVMBroker(1);
                             }
                             catch (AMQVMBrokerCreationException e)
@@ -104,7 +104,7 @@ public class InVMBrokerDecorator extends WrappedSuiteTestDecorator
                         {
                             // Ensure that the in-vm broker is cleaned up so that the next test starts afresh.
                             TransportConnection.killVMBroker(1);
-                            ApplicationRegistry.remove(1);
+                            ApplicationRegistry.remove();
                         }
                     });
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
index 4b45a96c20..23efb656d2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
@@ -23,7 +23,7 @@ package org.apache.qpid.test.unit.ack;
 
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.utils.FailoverBaseCase;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -32,7 +32,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-public class Acknowledge2ConsumersTest extends FailoverBaseCase
+public class Acknowledge2ConsumersTest extends QpidBrokerTestCase
 {
     protected static int NUM_MESSAGES = 100;
     protected Connection _con;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 6fcde7e185..a5d1f4821f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -466,7 +466,7 @@ public class QpidBrokerTestCase extends QpidTestCase
             final ConfigurationFileApplicationRegistry registry = new ConfigurationFileApplicationRegistry(_configFile);
             try
             {
-                ApplicationRegistry.initialise(registry, port);
+                ApplicationRegistry.initialise(registry);
             }
             catch (Exception e)
             {
@@ -692,7 +692,7 @@ public class QpidBrokerTestCase extends QpidTestCase
         else if (_broker.equals(VM))
         {
             TransportConnection.killVMBroker(port);
-            ApplicationRegistry.remove(port);
+            ApplicationRegistry.remove();
         }
     }