updated qpid.0-10/java to match trunk/qpid/java@686835

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-10@686843 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 58 insertions, 3 deletions

diff --git a/java/broker/bin/qpid-passwd b/java/broker/bin/qpid-passwd
index f425eed72b..f425eed72b 100644..100755
--- a/java/broker/bin/qpid-passwd
+++ b/java/broker/bin/qpid-passwd
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
index b8d6c8e3fd..b8d6c8e3fd 100644..100755
--- a/java/broker/bin/qpid-server
+++ b/java/broker/bin/qpid-server
diff --git a/java/broker/bin/qpid-server-bdb.bat b/java/broker/bin/qpid-server-bdb.bat
index 8964e577df..8964e577df 100644..100755
--- a/java/broker/bin/qpid-server-bdb.bat
+++ b/java/broker/bin/qpid-server-bdb.bat
diff --git a/java/broker/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat
index 6af214f939..6af214f939 100644..100755
--- a/java/broker/bin/qpid-server.bat
+++ b/java/broker/bin/qpid-server.bat
diff --git a/java/broker/bin/qpid.start b/java/broker/bin/qpid.start
index 78c34e70b4..78c34e70b4 100644..100755
--- a/java/broker/bin/qpid.start
+++ b/java/broker/bin/qpid.start
diff --git a/java/broker/bin/qpid.stop b/java/broker/bin/qpid.stop
index 6482fc3293..6482fc3293 100644..100755
--- a/java/broker/bin/qpid.stop
+++ b/java/broker/bin/qpid.stop
diff --git a/java/broker/bin/qpid.stopall b/java/broker/bin/qpid.stopall
index d71f591de8..d71f591de8 100644..100755
--- a/java/broker/bin/qpid.stopall
+++ b/java/broker/bin/qpid.stopall
diff --git a/java/broker/bin/runAll b/java/broker/bin/runAll
index 4ced1d263b..4ced1d263b 100644..100755
--- a/java/broker/bin/runAll
+++ b/java/broker/bin/runAll
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
index 2a2bc72950..8ce7b4c0e1 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
@@ -129,11 +129,17 @@ public class ExchangeMBeanTest  extends TestCase
     {
         super.setUp();
 
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
+        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
         _queueRegistry = _virtualHost.getQueueRegistry();
         _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _virtualHost,
                                                     null);
         _queueRegistry.registerQueue(_queue);
     }
+
+    protected void tearDown()
+    {
+        ApplicationRegistry.remove(1);
+    }
+
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index dca6d9f613..5eafc18378 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
@@ -294,12 +294,18 @@ public class AMQQueueAlertTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
+        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
         _protocolSession = new InternalTestProtocolSession();
 
     }
 
+    protected void tearDown()
+    {
+        ApplicationRegistry.remove(1);
+    }
+
+
     private void sendMessages(long messageCount, final long size) throws AMQException
     {
         IncomingMessage[] messages = new IncomingMessage[(int) messageCount];
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index 50bee71d59..eab8ad3e2e 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -301,7 +301,7 @@ public class AMQQueueMBeanTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
+        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1);
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
         _messageStore = _virtualHost.getMessageStore();
 
@@ -317,6 +317,11 @@ public class AMQQueueMBeanTest extends TestCase
         _protocolSession = new InternalTestProtocolSession();
     }
 
+    public void tearDown()
+    {
+        ApplicationRegistry.remove(1);
+    }
+
     private void sendMessages(int messageCount, boolean persistent) throws AMQException
     {
         for (int i = 0; i < messageCount; i++)
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index c69ca507ef..aa6ee6ff12 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -12,6 +12,7 @@ import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.registry.ApplicationRegistry;
 
 import junit.framework.TestCase;
 
@@ -56,11 +57,20 @@ public class SimpleAMQQueueTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
+        //Create Application Registry for test
+        ApplicationRegistry.getInstance(1);
+
         AMQShortString qname = new AMQShortString("qname");
         AMQShortString owner = new AMQShortString("owner");
         _queue = new SimpleAMQQueue(qname, false, owner, false, new VirtualHost("vhost", store));
     }
 
+    @Override
+    protected void tearDown()
+    {
+        ApplicationRegistry.remove(1);
+    }
+
     public void testGetFirstMessageId() throws Exception
     {
         // Create message
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 932486d954..0524494bfd 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -37,6 +37,7 @@ import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.queue.ExchangeBinding;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
+import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -130,6 +131,16 @@ public class MessageStoreTest extends TestCase
     AMQShortString directRouting = new AMQShortString("MST-direct");
     AMQShortString topicRouting = new AMQShortString("MST-topic");
 
+    protected void setUp()
+    {
+        ApplicationRegistry.getInstance(1);
+    }
+
+    protected void tearDown()
+    {
+        ApplicationRegistry.remove(1);
+    }
+
     protected void runTestWithStore(Configuration configuration)
     {
         //Ensure Environment Path is empty
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
index fb616e2b59..11ab6af064 100644
--- a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
+++ b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
@@ -55,6 +55,12 @@ public class ManagementConsoleTest extends TestCase
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
     }
 
+    @Override
+    protected void tearDown() throws Exception
+    {
+        ApplicationRegistry.removeAll();
+    }
+
     /**
      * Test for AMQQueueMBean attribute and operation names, which are used in the management console
      * @throws Exception
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
index 417b9b75f0..7c0147b786 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
@@ -79,6 +79,8 @@ public class AMQSessionTest extends QpidTestCase
 
         subscriber = _session.createDurableSubscriber(_topic, "mysubname2", "abc", false);
         assertEquals("Topic names should match from durable TopicSubscriber with selector", _topic.getTopicName(), subscriber.getTopic().getTopicName());
+        _session.unsubscribe("mysubname");
+        _session.unsubscribe("mysubname2");
     }
 
     public void testCreateQueueReceiver() throws JMSException
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index 2d3a98977f..fe7b97a47d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
@@ -188,6 +188,8 @@ public class DurableSubscriptionTest extends QpidTestCase
         consumer1.close();
         consumer3.close();
 
+        session3.unsubscribe("MySubscription");
+
         con.close();
     }
 
@@ -266,6 +268,8 @@ public class DurableSubscriptionTest extends QpidTestCase
         consumer1.close();
         consumer3.close();
 
+        session3.unsubscribe("MySubscription");
+
         con0.close();
         con1.close();
         con3.close();
@@ -305,6 +309,7 @@ public class DurableSubscriptionTest extends QpidTestCase
     	assertNotNull ("Message should have been received", msg);
     	assertEquals ("testDurableWithInvalidSelector2", ((TextMessage) msg).getText());
     	assertNull("Should not receive subsequent message", liveSubscriber.receive(200));
+        session.unsubscribe("testDurableWithInvalidSelectorSub");
     }
     
     /***
@@ -339,6 +344,8 @@ public class DurableSubscriptionTest extends QpidTestCase
     	assertNotNull ("Message should have been received", msg);
     	assertEquals ("testDurableWithInvalidSelector2", ((TextMessage) msg).getText());
     	assertNull("Should not receive subsequent message", liveSubscriber.receive(200));
+
+        session.unsubscribe("testDurableWithInvalidDestinationsub");
     }
     
     public static junit.framework.Test suite()
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 7a20b1058b..9f4c9e53aa 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -134,6 +134,7 @@ public class TopicSessionTest extends QpidTestCase
         m = (TextMessage) sub2.receive(2000);
         assertNotNull(m);
         assertEquals("goodbye", m.getText());
+        session1.unsubscribe("subscription0");
         con.close();
     }
 
@@ -163,6 +164,7 @@ public class TopicSessionTest extends QpidTestCase
         tm = (TextMessage) sub.receive(2000);
         assertNotNull(tm);
         assertEquals("Hello2", tm.getText());
+        session2.unsubscribe("subscription0");
         con1.close();
         con2.close();
     }