QPID-1621,QPID-1632 : Added a setManagementEnabled option to allow the MC to be disabled. Updates as a result of merging configuration changes.

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

2 files changed, 7 insertions, 7 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java
index 4551ae5af8..7a944a5399 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java
@@ -28,11 +28,13 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
 import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.store.StoreContext;
 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.commons.configuration.PropertiesConfiguration;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -55,7 +57,9 @@ public class PersistentMessageTest extends TransientMessageTest
         _messageStore = new TestableMemoryMessageStore();
 
         _storeContext = new StoreContext();
-        VirtualHost vhost = new VirtualHost(PersistentMessageTest.class.getName(), _messageStore);
+        VirtualHost vhost = new VirtualHost(new VirtualHostConfiguration(PersistentMessageTest.class.getName(),
+                                                                         new PropertiesConfiguration()),
+                                            _messageStore);
         _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(_q1name, false, _owner, false, vhost, null);
         // Create IncomingMessage and nondurable queue
         _messageDeliveryContext = new NonTransactionalContext(_messageStore, new StoreContext(), null, _returnMessages);
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index 882f88b8f3..456e816a52 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
@@ -27,6 +27,7 @@ import org.apache.qpid.server.routing.RoutingTable;
 import org.apache.qpid.server.transactionlog.TransactionLog;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
@@ -72,7 +73,7 @@ public class TestableMemoryMessageStore implements TestTransactionLog, Transacti
         return _mms._messageEnqueueMap.get(messageId);
     }
 
-    public void configure(VirtualHost virtualHost, String base, Configuration config) throws Exception
+    public void configure(VirtualHost virtualHost, String base, VirtualHostConfiguration config) throws Exception
     {
         _mms.configure(virtualHost,base,config);
     }
@@ -117,11 +118,6 @@ public class TestableMemoryMessageStore implements TestTransactionLog, Transacti
         _mms.removeQueue(queue);
     }
 
-    public void removeMessage(StoreContext storeContext, Long messageId) throws AMQException
-    {
-        _mms.removeMessage(storeContext, messageId);
-    }
-
     public void enqueueMessage(StoreContext context, AMQQueue queue, Long messageId) throws AMQException
     {
         _mms.enqueueMessage(context,queue,messageId);