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@746265 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 24 insertions, 36 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 225042e9ec..9a358d9ba7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -263,6 +263,12 @@ public class ServerConfiguration
         return _config.getBoolean("management.enabled", true);
     }
 
+    public void setManagementEnabled(boolean enabled)
+    {
+        _config.setProperty("management.enabled", enabled);
+    }
+
+
     public int getHeartBeatDelay()
     {
         return _config.getInt("heartbeat.delay", 5);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
index cd0f0c1769..3754b41a3e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
@@ -108,7 +108,7 @@ public class MemoryMessageStore implements TransactionLog, RoutingTable
         }
     }
 
-    public void removeMessage(StoreContext context, Long messageId) throws AMQException
+    private void removeMessage(StoreContext context, Long messageId) throws AMQException
     {
         checkNotClosed();
         if (_log.isDebugEnabled())
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transactionlog/TransactionLog.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transactionlog/TransactionLog.java
index 4fa85dd6cd..97a1ecb38c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transactionlog/TransactionLog.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transactionlog/TransactionLog.java
@@ -78,18 +78,6 @@ public interface TransactionLog
     void close() throws Exception;
 
     /**
-     * Removes the specified message from the store in the given transactional store context.
-     *
-     * @param storeContext The transactional context to remove the message in.
-     * @param messageId    Identifies the message to remove.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void removeMessage(StoreContext storeContext, Long messageId) throws AMQException;
-
-
-
-    /**
      * Places a message onto a specified queue, in a given transactional context.
      *
      * @param context   The transactional context for the operation.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
index 561f998b98..0ca8135f71 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
@@ -160,6 +160,11 @@ public class NonTransactionalContext implements TransactionalContext
             QueueEntry queueEntry;
             queueEntry = unacknowledgedMessageMap.get(deliveryTag);
 
+            if (debug)
+            {
+                _log.debug("Received non-multiple ack for messaging with delivery tag " + deliveryTag);
+            }
+
             if (queueEntry == null)
             {
                 _log.info("Single ack on delivery tag " + deliveryTag + " not known for channel:" +
@@ -185,11 +190,6 @@ public class NonTransactionalContext implements TransactionalContext
             unacknowledgedMessageMap.remove(deliveryTag);
 
 
-            if (debug)
-            {
-                _log.debug("Received non-multiple ack for messaging with delivery tag " + deliveryTag + " msg id " +
-                           queueEntry.getMessage().getMessageId());
-            }
         }
         if(_inTran)
         {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index 1115ed723c..e1b770b1d3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -160,7 +160,11 @@ public class VirtualHost implements Accessable
         _connectionRegistry = new ConnectionRegistry(this);
 
         _houseKeepingTimer = new Timer("Queue-housekeeping-"+_name, true);
-        
+
+        _queueRegistry = new DefaultQueueRegistry(this);
+        _exchangeFactory = new DefaultExchangeFactory(this);
+        _exchangeRegistry = new DefaultExchangeRegistry(this);
+
         if (transactionLog != null)
         {
             _transactionLog = transactionLog;
@@ -175,10 +179,7 @@ public class VirtualHost implements Accessable
             initialiseRoutingTable(hostConfig);
         }
 
-        _queueRegistry = new DefaultQueueRegistry(this);
-        _exchangeFactory = new DefaultExchangeFactory(this);
         _exchangeFactory.initialise(hostConfig);
-        _exchangeRegistry = new DefaultExchangeRegistry(this);
         _exchangeRegistry.initialise();
 
         initialiseModel(hostConfig);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java
index 4551ae5af8..7a944a5399 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/PersistentMessageTest.java
+++ b/qpid/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/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index 882f88b8f3..456e816a52 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/qpid/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);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index a60058be14..c7c2c8b292 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
@@ -158,13 +158,6 @@ public class SlowMessageStore implements TransactionLog, RoutingTable
         doPostDelay("close");
     }
 
-    public void removeMessage(StoreContext storeContext, Long messageId) throws AMQException
-    {
-        doPreDelay("removeMessage");
-        _realTransactionLog.removeMessage(storeContext, messageId);
-        doPostDelay("removeMessage");
-    }
-
     public void createExchange(Exchange exchange) throws AMQException
     {
         doPreDelay("createExchange");