qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1576732 [2/4] - in /qpid/branches/java-broker-bdb-ha2/qpid/java: ./ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/systests/src/main/java/org/apache/...
Date Wed, 12 Mar 2014 13:19:32 GMT
Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java Wed Mar 12 13:19:29 2014
@@ -25,8 +25,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.model.adapter.VirtualHostAdapter;
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.stats.StatisticsGatherer;
@@ -40,15 +38,12 @@ public interface VirtualHostFactory exte
     VirtualHost createVirtualHost(VirtualHostRegistry virtualHostRegistry,
                                   StatisticsGatherer brokerStatisticsGatherer,
                                   SecurityManager parentSecurityManager,
-                                  VirtualHostConfiguration hostConfig,
                                   org.apache.qpid.server.model.VirtualHost virtualHost);
 
     void validateAttributes(Map<String, Object> attributes);
 
     Map<String, Object> createVirtualHostConfiguration(VirtualHostAdapter virtualHostAdapter);
 
-    Map<String,Object> convertVirtualHostConfiguration(Configuration configuration);
-
     static final class TYPES
     {
         private TYPES()

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java Wed Mar 12 13:19:29 2014
@@ -26,11 +26,9 @@ import java.util.UUID;
 
 import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
 import org.apache.qpid.server.exchange.ExchangeImpl;
-import org.apache.qpid.server.model.ExclusivityPolicy;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.configuration.QueueConfiguration;
 import org.apache.qpid.server.exchange.DefaultExchangeFactory;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.UUIDGenerator;
@@ -74,50 +72,10 @@ public class AMQQueueFactory implements 
         return createOrRestoreQueue(attributes, true);
     }
 
-    private AMQQueue createOrRestoreQueue(Map<String, Object> attributes,
-                                          boolean createInStore)
+    private AMQQueue createOrRestoreQueue(Map<String, Object> attributes, boolean createInStore)
     {
-
-
         String queueName = MapValueConverter.getStringAttribute(Queue.NAME,attributes);
-
-        QueueConfiguration config = _virtualHost.getConfiguration().getQueueConfiguration(queueName);
-
-        if (!attributes.containsKey(Queue.ALERT_THRESHOLD_MESSAGE_AGE) && config.getMaximumMessageAge() != 0)
-        {
-            attributes.put(Queue.ALERT_THRESHOLD_MESSAGE_AGE, config.getMaximumMessageAge());
-        }
-        if (!attributes.containsKey(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES) && config.getMaximumQueueDepth() != 0)
-        {
-            attributes.put(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, config.getMaximumQueueDepth());
-        }
-        if (!attributes.containsKey(Queue.ALERT_THRESHOLD_MESSAGE_SIZE) && config.getMaximumMessageSize() != 0)
-        {
-            attributes.put(Queue.ALERT_THRESHOLD_MESSAGE_SIZE, config.getMaximumMessageSize());
-        }
-        if (!attributes.containsKey(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES) && config.getMaximumMessageCount() != 0)
-        {
-            attributes.put(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, config.getMaximumMessageCount());
-        }
-        if (!attributes.containsKey(Queue.ALERT_REPEAT_GAP) && config.getMinimumAlertRepeatGap() != 0)
-        {
-            attributes.put(Queue.ALERT_REPEAT_GAP, config.getMinimumAlertRepeatGap());
-        }
-        if (config.getMaxDeliveryCount() != 0 && !attributes.containsKey(Queue.MAXIMUM_DELIVERY_ATTEMPTS))
-        {
-            attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, config.getMaxDeliveryCount());
-        }
-        if (!attributes.containsKey(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) && config.getCapacity() != 0)
-        {
-            attributes.put(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, config.getCapacity());
-        }
-        if (!attributes.containsKey(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES) && config.getFlowResumeCapacity() != 0)
-        {
-            attributes.put(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, config.getFlowResumeCapacity());
-        }
-
-
-        boolean createDLQ = createDLQ(attributes, config);
+        boolean createDLQ = shouldCreateDLQ(attributes, _virtualHost.getDefaultDeadLetterQueueEnabled());
         if (createDLQ)
         {
             validateDLNames(queueName);
@@ -259,30 +217,7 @@ public class AMQQueueFactory implements 
         queue.setAlternateExchange(dlExchange);
     }
 
-    public AMQQueue createAMQQueueImpl(QueueConfiguration config)
-    {
-
-        Map<String, Object> arguments = createQueueAttributesFromConfig(_virtualHost, config);
-        
-        AMQQueue q = createOrRestoreQueue(arguments, false);
-        return q;
-    }
-
-    /**
-     * Validates DLQ and DLE names
-     * <p>
-     * DLQ name and DLQ exchange name need to be validated in order to keep
-     * integrity in cases when queue name passes validation check but DLQ name
-     * or DL exchange name fails to pass it. Otherwise, we might have situations
-     * when queue is created but DL exchange or/and DLQ creation fail.
-     * <p>
-     *
-     * @param name
-     *            queue name
-     * @throws IllegalArgumentException
-     *             thrown if length of queue name or exchange name exceed 255
-     */
-    protected static void validateDLNames(String name)
+    private static void validateDLNames(String name)
     {
         // check if DLQ name and DLQ exchange name do not exceed 255
         String exchangeName = getDeadLetterExchangeName(name);
@@ -299,16 +234,7 @@ public class AMQQueueFactory implements 
         }
     }
 
-    /**
-     * Checks if DLQ is enabled for the queue.
-     *
-     * @param arguments
-     *            queue arguments
-     * @param qConfig
-     *            queue configuration
-     * @return true if DLQ enabled
-     */
-    protected static boolean createDLQ(Map<String, Object> arguments, QueueConfiguration qConfig)
+    private static boolean shouldCreateDLQ(Map<String, Object> arguments, boolean virtualHostDefaultDeadLetterQueueEnabled)
     {
         boolean autoDelete = MapValueConverter.getEnumAttribute(LifetimePolicy.class,
                                                                 Queue.LIFETIME_POLICY,
@@ -320,7 +246,7 @@ public class AMQQueueFactory implements 
         {
             boolean dlqArgumentPresent = arguments != null
                                          && arguments.containsKey(Queue.CREATE_DLQ_ON_CREATION);
-            if (dlqArgumentPresent || qConfig.isDeadLetterQueueEnabled())
+            if (dlqArgumentPresent)
             {
                 boolean dlqEnabled = true;
                 if (dlqArgumentPresent)
@@ -329,89 +255,21 @@ public class AMQQueueFactory implements 
                     dlqEnabled = (argument instanceof Boolean && ((Boolean)argument).booleanValue())
                                 || (argument instanceof String && Boolean.parseBoolean(argument.toString()));
                 }
-                return dlqEnabled ;
+                return dlqEnabled;
             }
+            return virtualHostDefaultDeadLetterQueueEnabled;
         }
         return false;
     }
 
-    /**
-     * Generates a dead letter queue name for a given queue name
-     *
-     * @param name
-     *            queue name
-     * @return DLQ name
-     */
-    protected static String getDeadLetterQueueName(String name)
+    private static String getDeadLetterQueueName(String name)
     {
         return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, DEFAULT_DLQ_NAME_SUFFIX);
     }
 
-    /**
-     * Generates a dead letter exchange name for a given queue name
-     *
-     * @param name
-     *            queue name
-     * @return DL exchange name
-     */
-    protected static String getDeadLetterExchangeName(String name)
+    private static String getDeadLetterExchangeName(String name)
     {
         return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
     }
 
-    private static Map<String, Object> createQueueAttributesFromConfig(final VirtualHost virtualHost,
-                                                                       QueueConfiguration config)
-    {
-        Map<String,Object> attributes = new HashMap<String,Object>();
-
-        if(config.getArguments() != null && !config.getArguments().isEmpty())
-        {
-            attributes.putAll(QueueArgumentsConverter.convertWireArgsToModel(new HashMap<String, Object>(config.getArguments())));
-        }
-
-        if(config.isLVQ() || config.getLVQKey() != null)
-        {
-            attributes.put(Queue.LVQ_KEY,
-                          config.getLVQKey() == null ? ConflationQueue.DEFAULT_LVQ_KEY : config.getLVQKey());
-        }
-        else if (config.getPriority() || config.getPriorities() > 0)
-        {
-            attributes.put(Queue.PRIORITIES, config.getPriorities() < 0 ? 10 : config.getPriorities());
-        }
-        else if (config.getQueueSortKey() != null && !"".equals(config.getQueueSortKey()))
-        {
-            attributes.put(Queue.SORT_KEY, config.getQueueSortKey());
-        }
-
-        if (!config.getAutoDelete() && config.isDeadLetterQueueEnabled())
-        {
-            attributes.put(Queue.CREATE_DLQ_ON_CREATION, true);
-        }
-
-        if (config.getDescription() != null && !"".equals(config.getDescription()))
-        {
-            attributes.put(Queue.DESCRIPTION, config.getDescription());
-        }
-
-        attributes.put(Queue.DURABLE, config.getDurable());
-        attributes.put(Queue.LIFETIME_POLICY,
-                      config.getAutoDelete() ? LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS : LifetimePolicy.PERMANENT);
-        if(config.getExclusive())
-        {
-            attributes.put(Queue.EXCLUSIVE, ExclusivityPolicy.CONTAINER);
-        }
-        if(config.getOwner() != null)
-        {
-            attributes.put(Queue.OWNER, config.getOwner());
-        }
-        
-        attributes.put(Queue.NAME, config.getName());
-        
-        // we need queues that are defined in config to have deterministic ids.
-        attributes.put(Queue.ID, UUIDGenerator.generateQueueUUID(config.getName(), virtualHost.getName()));
-
-
-        return attributes;
-    }
-
 }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Wed Mar 12 13:19:29 2014
@@ -24,7 +24,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -32,7 +31,6 @@ import java.util.concurrent.ScheduledFut
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.log4j.Logger;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -41,9 +39,6 @@ import org.apache.qpid.server.exchange.E
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.configuration.ExchangeConfiguration;
-import org.apache.qpid.server.configuration.QueueConfiguration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.connection.ConnectionRegistry;
 import org.apache.qpid.server.connection.IConnectionRegistry;
 import org.apache.qpid.server.exchange.DefaultExchangeFactory;
@@ -75,7 +70,6 @@ import org.apache.qpid.server.store.Even
 import org.apache.qpid.server.store.EventListener;
 import org.apache.qpid.server.txn.DtxRegistry;
 import org.apache.qpid.server.util.MapValueConverter;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 public abstract class AbstractVirtualHost implements VirtualHost, IConnectionRegistry.RegistryChangeListener, EventListener
 {
@@ -97,8 +91,6 @@ public abstract class AbstractVirtualHos
 
     private final SecurityManager _securityManager;
 
-    private final VirtualHostConfiguration _vhostConfig;
-
     private final QueueRegistry _queueRegistry;
 
     private final ExchangeRegistry _exchangeRegistry;
@@ -131,23 +123,11 @@ public abstract class AbstractVirtualHos
     public AbstractVirtualHost(VirtualHostRegistry virtualHostRegistry,
                                StatisticsGatherer brokerStatisticsGatherer,
                                SecurityManager parentSecurityManager,
-                               VirtualHostConfiguration hostConfig,
                                org.apache.qpid.server.model.VirtualHost virtualHost)
     {
-        if (hostConfig == null)
-        {
-            throw new IllegalArgumentException("HostConfig cannot be null");
-        }
-
-        if (hostConfig.getName() == null || hostConfig.getName().length() == 0)
-        {
-            throw new IllegalArgumentException("Illegal name (" + hostConfig.getName() + ") for virtualhost.");
-        }
-
         _virtualHostRegistry = virtualHostRegistry;
         _brokerStatisticsGatherer = brokerStatisticsGatherer;
-        _vhostConfig = hostConfig;
-        _name = _vhostConfig.getName();
+        _name = virtualHost.getName();
         _dtxRegistry = new DtxRegistry();
         _model = virtualHost;
         _eventLogger = virtualHostRegistry.getEventLogger();
@@ -156,12 +136,12 @@ public abstract class AbstractVirtualHos
 
         _eventLogger.message(VirtualHostMessages.CREATED(_name));
 
-        _securityManager = new SecurityManager(parentSecurityManager, _vhostConfig.getConfig().getString("security.acl"), _name);
+        _securityManager = new SecurityManager(parentSecurityManager, virtualHost.getSecurityAcl(), _name);
 
         _connectionRegistry = new ConnectionRegistry();
         _connectionRegistry.addRegistryChangeListener(this);
 
-        _houseKeepingTasks = new ScheduledThreadPoolExecutor(_vhostConfig.getHouseKeepingThreadCount());
+        _houseKeepingTasks = new ScheduledThreadPoolExecutor(virtualHost.getHouseKeepingThreadCount());
 
 
         _queueRegistry = new DefaultQueueRegistry(this);
@@ -176,7 +156,7 @@ public abstract class AbstractVirtualHos
 
         initialiseStatistics();
 
-        initialiseStorage(hostConfig, virtualHost);
+        initialiseStorage(virtualHost);
 
         getMessageStore().addEventListener(this, Event.PERSISTENT_MESSAGE_SIZE_OVERFULL);
         getMessageStore().addEventListener(this, Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL);
@@ -192,19 +172,13 @@ public abstract class AbstractVirtualHos
         }
     }
 
-    abstract protected void initialiseStorage(VirtualHostConfiguration hostConfig,
-                                              org.apache.qpid.server.model.VirtualHost virtualHost);
+    abstract protected void initialiseStorage(org.apache.qpid.server.model.VirtualHost<?> virtualHost);
 
     public IConnectionRegistry getConnectionRegistry()
     {
         return _connectionRegistry;
     }
 
-    public VirtualHostConfiguration getConfiguration()
-    {
-        return _vhostConfig;
-    }
-
     public UUID getId()
     {
         return _id;
@@ -306,135 +280,11 @@ public abstract class AbstractVirtualHos
     }
 
 
-    protected void initialiseModel(VirtualHostConfiguration config)
+    protected void initialiseModel()
     {
-        _logger.debug("Loading configuration for virtualhost: " + config.getName());
-
+        _logger.debug("Loading configuration for virtualhost: " + _model.getName());
 
         _exchangeRegistry.initialise(_exchangeFactory);
-
-        List<String> exchangeNames = config.getExchanges();
-
-        for (String exchangeName : exchangeNames)
-        {
-            try
-            {
-                configureExchange(config.getExchangeConfiguration(exchangeName));
-            }
-            catch (UnknownExchangeException e)
-            {
-                throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
-            }
-            catch (ReservedExchangeNameException e)
-            {
-                throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
-            }
-            catch (AMQUnknownExchangeType e)
-            {
-                throw new ServerScopedRuntimeException("Could not configure exchange " + exchangeName, e);
-            }
-        }
-
-        String[] queueNames = config.getQueueNames();
-
-        for (Object queueNameObj : queueNames)
-        {
-            String queueName = String.valueOf(queueNameObj);
-            try
-            {
-                configureQueue(config.getQueueConfiguration(queueName));
-            }
-            catch (ConfigurationException e)
-            {
-                throw new ServerScopedRuntimeException("Could not configure queue " + queueName, e);
-            }
-        }
-    }
-
-    private void configureExchange(ExchangeConfiguration exchangeConfiguration)
-            throws UnknownExchangeException, ReservedExchangeNameException,
-                   AMQUnknownExchangeType
-    {
-        boolean durable = exchangeConfiguration.getDurable();
-        boolean autodelete = exchangeConfiguration.getAutoDelete();
-        try
-        {
-            Map<String,Object> attributes = new HashMap<String, Object>();
-
-            attributes.put(org.apache.qpid.server.model.Exchange.ID, null);
-            attributes.put(org.apache.qpid.server.model.Exchange.NAME, exchangeConfiguration.getName());
-            attributes.put(org.apache.qpid.server.model.Exchange.TYPE, exchangeConfiguration.getType());
-            attributes.put(org.apache.qpid.server.model.Exchange.DURABLE, durable);
-            attributes.put(org.apache.qpid.server.model.Exchange.LIFETIME_POLICY,
-                           autodelete ? LifetimePolicy.DELETE_ON_NO_LINKS : LifetimePolicy.PERMANENT);
-            attributes.put(org.apache.qpid.server.model.Exchange.ALTERNATE_EXCHANGE, null);
-            ExchangeImpl newExchange = createExchange(attributes);
-        }
-        catch(ExchangeExistsException e)
-        {
-            _logger.info("Exchange " + exchangeConfiguration.getName() + " already defined. Configuration in XML file ignored");
-        }
-
-    }
-
-    private void configureQueue(QueueConfiguration queueConfiguration)
-            throws ConfigurationException
-    {
-        AMQQueue queue = _queueFactory.createAMQQueueImpl(queueConfiguration);
-        String queueName = queue.getName();
-
-        if (queue.isDurable())
-        {
-            DurableConfigurationStoreHelper.createQueue(getDurableConfigurationStore(), queue);
-        }
-
-        //get the exchange name (returns empty String if none was specified)
-        String exchangeName = queueConfiguration.getExchange();
-
-
-        if(ExchangeDefaults.DEFAULT_EXCHANGE_NAME.equals(exchangeName))
-        {
-            //get routing keys in configuration (returns empty list if none are defined)
-            List<?> routingKeys = queueConfiguration.getRoutingKeys();
-            if(!(routingKeys.isEmpty() || (routingKeys.size()==1 && routingKeys.contains(queueName))))
-            {
-                throw new ConfigurationException("Attempt to bind queue '" + queueName + "' with binding key(s) " +
-                                                 routingKeys + " without specifying an exchange");
-            }
-        }
-        else
-        {
-            ExchangeImpl exchange = _exchangeRegistry.getExchange(exchangeName);
-            if (exchange == null)
-            {
-                throw new ConfigurationException("Attempt to bind queue '" + queueName + "' to unknown exchange:" + exchangeName);
-            }
-
-            //get routing keys in configuration (returns empty list if none are defined)
-            List<?> routingKeys = queueConfiguration.getRoutingKeys();
-
-            for (Object routingKeyNameObj : routingKeys)
-            {
-                String routingKey = String.valueOf(routingKeyNameObj);
-
-                configureBinding(queue, exchange, routingKey, (Map) queueConfiguration.getBindingArguments(routingKey));
-            }
-
-            if (!routingKeys.contains(queueName))
-            {
-                //bind the queue to the named exchange using its name
-                configureBinding(queue, exchange, queueName, null);
-            }
-        }
-    }
-
-    private void configureBinding(AMQQueue queue, ExchangeImpl exchange, String routingKey, Map<String,Object> arguments)
-    {
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("Binding queue:" + queue + " with routing key '" + routingKey + "' to exchange:" + exchange.getName());
-        }
-        exchange.addBinding(routingKey, queue, arguments);
     }
 
     public String getName()
@@ -907,7 +757,7 @@ public abstract class AbstractVirtualHos
 
         try
         {
-            initialiseHouseKeeping(_vhostConfig.getHousekeepingCheckPeriod());
+            initialiseHouseKeeping(_model.getHousekeepingCheckPeriod());
             finalState = State.ACTIVE;
         }
         finally
@@ -981,10 +831,10 @@ public abstract class AbstractVirtualHos
                     }
                     try
                     {
-                        session.checkTransactionStatus(_vhostConfig.getTransactionTimeoutOpenWarn(),
-                                _vhostConfig.getTransactionTimeoutOpenClose(),
-                                _vhostConfig.getTransactionTimeoutIdleWarn(),
-                                _vhostConfig.getTransactionTimeoutIdleClose());
+                        session.checkTransactionStatus(_model.getStoreTransactionOpenTimeoutWarn(),
+                                _model.getStoreTransactionOpenTimeoutClose(),
+                                _model.getStoreTransactionIdleTimeoutWarn(),
+                                _model.getStoreTransactionIdleTimeoutClose());
                     } catch (Exception e)
                     {
                         _logger.error("Exception in housekeeping for connection: " + connection.toString(), e);
@@ -1039,49 +889,55 @@ public abstract class AbstractVirtualHos
     @Override
     public long getDefaultAlertThresholdMessageAge()
     {
-        return getConfiguration().getMaximumMessageAge();
+        return _model.getQueue_alertThresholdMessageAge();
     }
 
     @Override
     public long getDefaultAlertThresholdMessageSize()
     {
-        return getConfiguration().getMaximumMessageSize();
+        return _model.getQueue_alertThresholdMessageSize();
     }
 
     @Override
     public long getDefaultAlertThresholdQueueDepthMessages()
     {
-        return getConfiguration().getMaximumMessageCount();
+        return _model.getQueue_alertThresholdQueueDepthMessages();
     }
 
     @Override
     public long getDefaultAlertThresholdQueueDepthBytes()
     {
-        return getConfiguration().getMaximumQueueDepth();
+        return _model.getQueue_alertThresholdQueueDepthBytes();
     }
 
     @Override
     public long getDefaultAlertRepeatGap()
     {
-        return getConfiguration().getMinimumAlertRepeatGap();
+        return _model.getQueue_alertRepeatGap();
     }
 
     @Override
     public long getDefaultQueueFlowControlSizeBytes()
     {
-        return getConfiguration().getCapacity();
+        return _model.getQueue_flowControlSizeBytes();
     }
 
     @Override
     public long getDefaultQueueFlowResumeSizeBytes()
     {
-        return getConfiguration().getFlowResumeCapacity();
+        return _model.getQueue_flowResumeSizeBytes();
     }
 
     @Override
     public int getDefaultMaximumDeliveryAttempts()
     {
-        return getConfiguration().getMaxDeliveryCount();
+        return _model.getQueue_maximumDeliveryAttempts();
+    }
+
+    @Override
+    public boolean getDefaultDeadLetterQueueEnabled()
+    {
+        return _model.isQueue_deadLetterQueueEnabled();
     }
 
     @Override

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java Wed Mar 12 13:19:29 2014
@@ -19,7 +19,6 @@ package org.apache.qpid.server.virtualho
  *
  */
 
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.stats.StatisticsGatherer;
@@ -29,7 +28,6 @@ import org.apache.qpid.server.store.Dura
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreCreator;
 import org.apache.qpid.server.store.OperationalLoggingListener;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 public class StandardVirtualHost extends AbstractVirtualHost
 {
@@ -40,54 +38,19 @@ public class StandardVirtualHost extends
     StandardVirtualHost(VirtualHostRegistry virtualHostRegistry,
                         StatisticsGatherer brokerStatisticsGatherer,
                         org.apache.qpid.server.security.SecurityManager parentSecurityManager,
-                        VirtualHostConfiguration hostConfig, VirtualHost virtualHost)
+                        VirtualHost virtualHost)
     {
-        super(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig, virtualHost);
+        super(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, virtualHost);
     }
 
 
 
-    private MessageStore initialiseMessageStore(VirtualHostConfiguration hostConfig, VirtualHost virtualHost)
+    private MessageStore initialiseMessageStore(VirtualHost virtualHost)
     {
         final Object storeTypeAttr = virtualHost.getAttribute(VirtualHost.STORE_TYPE);
         String storeType = storeTypeAttr == null ? null : String.valueOf(storeTypeAttr);
-        MessageStore  messageStore = null;
-        if (storeType == null)
-        {
-            try
-            {
-                final Class<?> clazz = Class.forName(hostConfig.getMessageStoreClass());
-                final Object o = clazz.newInstance();
-
-                if (!(o instanceof MessageStore))
-                {
-                    throw new ClassCastException(clazz + " does not implement " + MessageStore.class);
-                }
-
-                messageStore = (MessageStore) o;
-            }
-            catch (ClassNotFoundException e)
-            {
-                throw new ServerScopedRuntimeException("Failed to fina virtual host message store implementation, " +
-                                                       "check the classpath and the configuration", e);
-            }
-            catch (InstantiationException e)
-            {
-                throw new ServerScopedRuntimeException("Failed to initialise virtual host store, " +
-                                                       "check the configuration", e);
-            }
-            catch (IllegalAccessException e)
-            {
-                throw new ServerScopedRuntimeException("Failed to initialise virtual host store, " +
-                                                       "check the configuration", e);
-            }
-        }
-        else
-        {
-            messageStore = new MessageStoreCreator().createMessageStore(storeType);
-        }
+        MessageStore messageStore = new MessageStoreCreator().createMessageStore(storeType);
 
-        final
         MessageStoreLogSubject
                 storeLogSubject = new MessageStoreLogSubject(getName(), messageStore.getClass().getSimpleName());
         OperationalLoggingListener.listen(messageStore, storeLogSubject, getEventLogger());
@@ -118,9 +81,9 @@ public class StandardVirtualHost extends
     }
 
 
-    protected void initialiseStorage(VirtualHostConfiguration hostConfig, VirtualHost virtualHost)
+    protected void initialiseStorage(VirtualHost virtualHost)
     {
-        _messageStore = initialiseMessageStore(hostConfig, virtualHost);
+        _messageStore = initialiseMessageStore(virtualHost);
 
         _durableConfigurationStore = initialiseConfigurationStore(virtualHost);
 
@@ -132,7 +95,7 @@ public class StandardVirtualHost extends
         VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this);
         _messageStore.configureMessageStore(virtualHost, recoveryHandler, recoveryHandler);
 
-        initialiseModel(hostConfig);
+        initialiseModel();
 
         _messageStore.activate();
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java Wed Mar 12 13:19:29 2014
@@ -21,13 +21,10 @@ package org.apache.qpid.server.virtualho
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.model.adapter.VirtualHostAdapter;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 import org.apache.qpid.server.plugin.VirtualHostFactory;
 import org.apache.qpid.server.stats.StatisticsGatherer;
-import org.apache.qpid.server.store.MessageStoreConstants;
 import org.apache.qpid.server.store.MessageStoreCreator;
 
 public class StandardVirtualHostFactory implements VirtualHostFactory
@@ -45,10 +42,9 @@ public class StandardVirtualHostFactory 
     public VirtualHost createVirtualHost(VirtualHostRegistry virtualHostRegistry,
                                          StatisticsGatherer brokerStatisticsGatherer,
                                          org.apache.qpid.server.security.SecurityManager parentSecurityManager,
-                                         VirtualHostConfiguration hostConfig,
                                          org.apache.qpid.server.model.VirtualHost virtualHost)
     {
-        return new StandardVirtualHost(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig, virtualHost);
+        return new StandardVirtualHost(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, virtualHost);
     }
 
 
@@ -96,23 +92,4 @@ public class StandardVirtualHostFactory 
         return convertedMap;
     }
 
-    @Override
-    public Map<String, Object> convertVirtualHostConfiguration(Configuration configuration)
-    {
-        Map<String,Object> convertedMap = new LinkedHashMap<String, Object>();
-        Configuration storeConfiguration = configuration.subset("store");
-        convertedMap.put(org.apache.qpid.server.model.VirtualHost.STORE_TYPE, storeConfiguration.getString("type"));
-        convertedMap.put(org.apache.qpid.server.model.VirtualHost.STORE_PATH, storeConfiguration.getString(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY));
-
-        convertedMap.put(MessageStoreConstants.OVERFULL_SIZE_ATTRIBUTE, storeConfiguration.getString(MessageStoreConstants.OVERFULL_SIZE_PROPERTY));
-        convertedMap.put(MessageStoreConstants.UNDERFULL_SIZE_ATTRIBUTE, storeConfiguration.getString(MessageStoreConstants.UNDERFULL_SIZE_PROPERTY));
-
-        for(MessageStoreFactory mf : new MessageStoreCreator().getFactories())
-        {
-            convertedMap.putAll(mf.convertStoreConfiguration(storeConfiguration));
-        }
-
-        return convertedMap;
-
-    }
 }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Wed Mar 12 13:19:29 2014
@@ -28,7 +28,6 @@ import java.util.concurrent.ScheduledFut
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
 import org.apache.qpid.common.Closeable;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.connection.IConnectionRegistry;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.logging.EventLogger;
@@ -49,8 +48,6 @@ public interface VirtualHost extends Dur
 {
     IConnectionRegistry getConnectionRegistry();
 
-    VirtualHostConfiguration getConfiguration();
-
     String getName();
 
     AMQQueue getQueue(String name);
@@ -137,6 +134,8 @@ public interface VirtualHost extends Dur
 
     int getDefaultMaximumDeliveryAttempts();
 
+    boolean getDefaultDeadLetterQueueEnabled();
+
     TaskExecutor getTaskExecutor();
 
     org.apache.qpid.server.model.VirtualHost getModel();

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java Wed Mar 12 13:19:29 2014
@@ -23,7 +23,6 @@ package org.apache.qpid.server.configura
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,33 +35,9 @@ import org.apache.qpid.server.model.Virt
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.stats.StatisticsGatherer;
 import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
-import org.apache.qpid.test.utils.TestFileUtils;
 
 public class VirtualHostRecovererTest extends TestCase
 {
-    public void testCreate()
-    {
-        StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
-        SecurityManager securityManager = mock(SecurityManager.class);
-        ConfigurationEntry entry = mock(ConfigurationEntry.class);
-        Broker parent = mock(Broker.class);
-        when(parent.getAttribute(Broker.VIRTUALHOST_HOUSEKEEPING_CHECK_PERIOD)).thenReturn(3000l);
-        when(parent.getSecurityManager()).thenReturn(securityManager);
-
-        VirtualHostRecoverer recoverer = new VirtualHostRecoverer(statisticsGatherer);
-        Map<String, Object> attributes = new HashMap<String, Object>();
-        String name = getName();
-        attributes.put(VirtualHost.NAME, name);
-        File file = TestFileUtils.createTempFile(this, ".xml", "<virtualhosts><virtualhost><name>" + name + "</name><" + name
-                + "></" + name + "></virtualhost></virtualhosts>");
-        attributes.put(VirtualHost.CONFIG_PATH, file.getAbsolutePath());
-        when(entry.getAttributes()).thenReturn(attributes);
-
-        VirtualHost host = recoverer.create(null, entry, parent);
-
-        assertNotNull("Null is returned", host);
-        assertEquals("Unexpected name", getName(), host.getName());
-    }
 
     public void testCreateVirtualHostFromStoreConfigAttributes()
     {
@@ -91,8 +66,8 @@ public class VirtualHostRecovererTest ex
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(VirtualHost.NAME, getName());
-        attributes.put(VirtualHost.CONFIG_PATH, "/path/to/virtualhost.xml");
-        String[] mandatoryAttributes = {VirtualHost.NAME, VirtualHost.CONFIG_PATH};
+        attributes.put(VirtualHost.TYPE, "STANDARD");
+        String[] mandatoryAttributes = {VirtualHost.NAME, VirtualHost.TYPE};
 
         checkMandatoryAttributesAreValidated(mandatoryAttributes, attributes);
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java Wed Mar 12 13:19:29 2014
@@ -79,7 +79,7 @@ public abstract class ConfigurationEntry
         _virtualHostId = UUID.randomUUID();
         _virtualHostAttributes = new HashMap<String, Object>();
         _virtualHostAttributes.put(VirtualHost.NAME, "test");
-        _virtualHostAttributes.put(VirtualHost.CONFIG_PATH, "/path/to/phantom/test");
+        _virtualHostAttributes.put(VirtualHost.TYPE, "STANDARD");
 
         _authenticationProviderId = UUID.randomUUID();
         _authenticationProviderAttributes = new HashMap<String, Object>();
@@ -135,7 +135,7 @@ public abstract class ConfigurationEntry
     {
         Map<String, Object> virtualHostAttributes = new HashMap<String, Object>();
         virtualHostAttributes.put(VirtualHost.NAME, getName());
-        virtualHostAttributes.put(VirtualHost.CONFIG_PATH, "/path/to/phantom/virtualhost/config");
+        virtualHostAttributes.put(VirtualHost.TYPE, "STANDARD");
         UUID virtualHostId = UUID.randomUUID();
         addConfiguration(virtualHostId, VirtualHost.class.getSimpleName(), virtualHostAttributes);
 
@@ -149,13 +149,13 @@ public abstract class ConfigurationEntry
     {
         Map<String, Object> virtualHost1Attributes = new HashMap<String, Object>();
         virtualHost1Attributes.put(VirtualHost.NAME, "test1");
-        virtualHost1Attributes.put(VirtualHost.CONFIG_PATH, "/path/to/phantom/virtualhost/config1");
+        virtualHost1Attributes.put(VirtualHost.TYPE, "STANDARD");
         UUID virtualHost1Id = UUID.randomUUID();
         addConfiguration(virtualHost1Id, VirtualHost.class.getSimpleName(), virtualHost1Attributes);
 
         Map<String, Object> virtualHost2Attributes = new HashMap<String, Object>();
         virtualHost2Attributes.put(VirtualHost.NAME, "test1");
-        virtualHost2Attributes.put(VirtualHost.CONFIG_PATH, "/path/to/phantom/virtualhost/config2");
+        virtualHost2Attributes.put(VirtualHost.TYPE, "STANDARD");
         UUID virtualHost2Id = UUID.randomUUID();
         addConfiguration(virtualHost2Id, VirtualHost.class.getSimpleName(), virtualHost2Attributes);
 
@@ -207,7 +207,7 @@ public abstract class ConfigurationEntry
     {
         Map<String, Object> virtualHostAttributes = new HashMap<String, Object>();
         virtualHostAttributes.put(VirtualHost.NAME, "test1");
-        virtualHostAttributes.put(VirtualHost.CONFIG_PATH, "/path/to/phantom/virtualhost/config1");
+        virtualHostAttributes.put(VirtualHost.TYPE, "STANDARD");
         UUID virtualHostId = UUID.randomUUID();
         ConfigurationEntry hostEntry = new ConfigurationEntry(virtualHostId, VirtualHost.class.getSimpleName(), virtualHostAttributes,
                 Collections.<UUID> emptySet(), _store);
@@ -228,7 +228,7 @@ public abstract class ConfigurationEntry
 
         Map<String, Object> virtualHostAttributes = new HashMap<String, Object>();
         virtualHostAttributes.put(VirtualHost.NAME, "test");
-        virtualHostAttributes.put(VirtualHost.CONFIG_PATH, "/path/to/new/phantom/test/configuration");
+        virtualHostAttributes.put(VirtualHost.TYPE, "STANDARD");
 
         ConfigurationEntry updatedEntry = new ConfigurationEntry(_virtualHostId, VirtualHost.class.getSimpleName(), virtualHostAttributes,
                 hostEntry.getChildrenIds(), _store);
@@ -372,7 +372,7 @@ public abstract class ConfigurationEntry
         UUID virtualHostId = UUID.randomUUID();
         Map<String, Object> virtualHostAttributes = new HashMap<String, Object>();
         virtualHostAttributes.put(VirtualHost.NAME, "test1");
-        virtualHostAttributes.put(VirtualHost.CONFIG_PATH, "/path/to/phantom/virtualhost/config1");
+        virtualHostAttributes.put(VirtualHost.TYPE, "STANDARD");
         ConfigurationEntry hostEntry = new ConfigurationEntry(virtualHostId, VirtualHost.class.getSimpleName(), virtualHostAttributes,
                 Collections.<UUID> emptySet(), _store);
 

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java Wed Mar 12 13:19:29 2014
@@ -213,7 +213,7 @@ public class ManagementModeStoreHandlerT
         when(virtualHost.getId()).thenReturn(virtualHostId);
         when(virtualHost.getType()).thenReturn(VirtualHost.class.getSimpleName());
         Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(VirtualHost.CONFIG_PATH, "/path/to/host.xml");
+        attributes.put(VirtualHost.TYPE, "STANDARD");
         when(virtualHost.getAttributes()).thenReturn(attributes);
         when(_store.getEntry(virtualHostId)).thenReturn(virtualHost);
         when(_root.getChildrenIds()).thenReturn(new HashSet<UUID>(Arrays.asList(_portEntryId, virtualHostId)));

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java Wed Mar 12 13:19:29 2014
@@ -20,9 +20,6 @@
  */
 package org.apache.qpid.server.logging.messages;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
-
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
@@ -35,7 +32,6 @@ import java.util.List;
 
 public abstract class AbstractTestMessages extends QpidTestCase
 {
-    protected Configuration _config = new PropertiesConfiguration();
     protected LogMessage _logMessage = null;
     protected UnitTestMessageLogger _logger;
     protected LogSubject _logSubject = new TestBlankSubject();

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Wed Mar 12 13:19:29 2014
@@ -54,6 +54,15 @@ public class VirtualHostTest extends Qpi
         TaskExecutor taskExecutor = mock(TaskExecutor.class);
         when(taskExecutor.isTaskExecutorThread()).thenReturn(true);
         when(_broker.getTaskExecutor()).thenReturn(taskExecutor);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_AGE)).thenReturn(0l);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_THRESHOLD_MESSAGE_SIZE)).thenReturn(0l);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_BYTES)).thenReturn(0l);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES)).thenReturn(0l);
+        when(_broker.getAttribute(Broker.QUEUE_ALERT_REPEAT_GAP)).thenReturn(10000l);
+        when(_broker.getAttribute(Broker.QUEUE_MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(0);
+        when(_broker.getAttribute(Broker.QUEUE_FLOW_CONTROL_RESUME_SIZE_BYTES)).thenReturn(0l);
+        when(_broker.getAttribute(Broker.QUEUE_FLOW_CONTROL_SIZE_BYTES)).thenReturn(0l);
+        when(_broker.getAttribute(Broker.QUEUE_DEAD_LETTER_QUEUE_ENABLED)).thenReturn(false);
 
         _recovererProvider = mock(RecovererProvider.class);
         _statisticsGatherer = mock(StatisticsGatherer.class);

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Wed Mar 12 13:19:29 2014
@@ -33,8 +33,6 @@ import java.util.UUID;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.configuration.QueueConfiguration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.DefaultExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.logging.EventLogger;
@@ -56,7 +54,6 @@ public class AMQQueueFactoryTest extends
     private VirtualHost _virtualHost;
     private AMQQueueFactory _queueFactory;
     private List<AMQQueue> _queues;
-    private QueueConfiguration _queueConfiguration;
 
     @Override
     public void setUp() throws Exception
@@ -67,12 +64,8 @@ public class AMQQueueFactoryTest extends
 
         _virtualHost = mock(VirtualHost.class);
         when(_virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
-
-        VirtualHostConfiguration vhostConfig = mock(VirtualHostConfiguration.class);
-        when(_virtualHost.getConfiguration()).thenReturn(vhostConfig);
         when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
-        _queueConfiguration = mock(QueueConfiguration.class);
-        when(vhostConfig.getQueueConfiguration(anyString())).thenReturn(_queueConfiguration);
+
         DurableConfigurationStore store = mock(DurableConfigurationStore.class);
         when(_virtualHost.getDurableConfigurationStore()).thenReturn(store);
 
@@ -284,15 +277,14 @@ public class AMQQueueFactoryTest extends
         String dlExchangeName = queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX;
         String dlQueueName = queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX;
 
-        when(_queueConfiguration.getMaxDeliveryCount()).thenReturn(5);
-        when(_queueConfiguration.isDeadLetterQueueEnabled()).thenReturn(true);
-
         assertNull("The DLQ should not yet exist", _virtualHost.getQueue(dlQueueName));
         assertNull("The alternate exchange should not yet exist", _virtualHost.getExchange(dlExchangeName));
 
         Map<String,Object> attributes = new HashMap<String, Object>();
         attributes.put(Queue.ID, UUID.randomUUID());
         attributes.put(Queue.NAME, queueName);
+        attributes.put(Queue.CREATE_DLQ_ON_CREATION, true);
+        attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 5);
 
         AMQQueue queue = _queueFactory.createQueue(attributes);
 
@@ -501,19 +493,16 @@ public class AMQQueueFactoryTest extends
         }
     }
 
-    public void testMessageGroupFromConfig() throws Exception
+    public void testMessageGroupQueue() throws Exception
     {
 
-        Map<String,String> arguments = new HashMap<String, String>();
-
-        arguments.put(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY,"mykey");
-        arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP,"1");
-
-        QueueConfiguration qConf = mock(QueueConfiguration.class);
-        when(qConf.getArguments()).thenReturn(arguments);
-        when(qConf.getName()).thenReturn("test");
+        Map<String,Object> attributes = new HashMap<String, Object>();
+        attributes.put(Queue.ID, UUID.randomUUID());
+        attributes.put(Queue.NAME, getTestName());
+        attributes.put(Queue.MESSAGE_GROUP_KEY,"mykey");
+        attributes.put(Queue.MESSAGE_GROUP_SHARED_GROUPS, true);
 
-        AMQQueue queue = _queueFactory.createAMQQueueImpl(qConf);
+        AMQQueue queue = _queueFactory.createQueue(attributes);
         assertEquals("mykey", queue.getAttribute(Queue.MESSAGE_GROUP_KEY));
         assertEquals(Boolean.TRUE, queue.getAttribute(Queue.MESSAGE_GROUP_SHARED_GROUPS));
     }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java Wed Mar 12 13:19:29 2014
@@ -28,8 +28,8 @@ import org.apache.qpid.server.message.AM
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.Queue;
-
 import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -49,6 +49,7 @@ public class PriorityQueueListTest exten
 
     protected void setUp()
     {
+        BrokerTestHelper.setUp();
         QueueEntry[] entries = new QueueEntry[PRIORITIES.length];
         Map<String,Object> queueAttributes = new HashMap<String, Object>();
         queueAttributes.put(Queue.ID, UUID.randomUUID());
@@ -81,6 +82,19 @@ public class PriorityQueueListTest exten
         _priority5message2 = entries[2];
     }
 
+    @Override
+    public void tearDown() throws Exception
+    {
+        try
+        {
+            super.tearDown();
+        }
+        finally
+        {
+            BrokerTestHelper.tearDown();
+        }
+    }
+
     public void testPriorityQueueEntryCompareToItself()
     {
         //check messages compare to themselves properly

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Wed Mar 12 13:19:29 2014
@@ -36,7 +36,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.server.binding.BindingImpl;
 import org.apache.qpid.server.exchange.ExchangeImpl;
@@ -69,7 +68,6 @@ public abstract class AbstractDurableCon
     private String _storePath;
     private String _storeName;
     private MessageStore _messageStore;
-    private Configuration _configuration;
     private VirtualHost _virtualHost;
 
     private ConfigurationRecoveryHandler _recoveryHandler;
@@ -98,7 +96,7 @@ public abstract class AbstractDurableCon
         _storePath = TMP_FOLDER + File.separator + _storeName;
         FileUtils.delete(new File(_storePath), true);
         setTestSystemProperty("QPID_WORK", TMP_FOLDER);
-        _configuration = mock(Configuration.class);
+
         _recoveryHandler = mock(ConfigurationRecoveryHandler.class);
         _storedMessageRecoveryHandler = mock(StoredMessageRecoveryHandler.class);
         _logRecoveryHandler = mock(TransactionLogRecoveryHandler.class);
@@ -116,8 +114,6 @@ public abstract class AbstractDurableCon
         when(_exchange.getId()).thenReturn(_exchangeId);
         when(_exchange.getExchangeType()).thenReturn(mock(ExchangeType.class));
         when(_exchange.getEventLogger()).thenReturn(new EventLogger());
-        when(_configuration.getString(eq(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY), anyString())).thenReturn(
-                _storePath);
         when(_virtualHost.getAttribute(eq(VirtualHost.STORE_PATH))).thenReturn(_storePath);
 
         _bindingArgs = new HashMap<String, Object>();

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -21,9 +21,7 @@
 
 package org.apache.qpid.server.store;
 
-import java.util.Collections;
 import java.util.Map;
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 
 public class TestMemoryMessageStoreFactory implements MessageStoreFactory
@@ -42,12 +40,6 @@ public class TestMemoryMessageStoreFacto
     }
 
     @Override
-    public Map<String, Object> convertStoreConfiguration(Configuration configuration)
-    {
-        return Collections.emptyMap();
-    }
-
-    @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
     }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java Wed Mar 12 13:19:29 2014
@@ -33,6 +33,7 @@ import java.util.concurrent.atomic.Atomi
  */
 public class TestableMemoryMessageStore extends TestMemoryMessageStore
 {
+    public static final String TYPE = "TestableMemory";
     private final Map<Long, AMQQueue> _messages = new HashMap<Long, AMQQueue>();
     private final AtomicInteger _messageCount = new AtomicInteger(0);
 

Added: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java?rev=1576732&view=auto
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java (added)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStoreFactory.java Wed Mar 12 13:19:29 2014
@@ -0,0 +1,47 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.server.store;
+
+import java.util.Map;
+
+import org.apache.qpid.server.plugin.MessageStoreFactory;
+
+public class TestableMemoryMessageStoreFactory implements MessageStoreFactory
+{
+    @Override
+    public String getType()
+    {
+        return TestableMemoryMessageStore.TYPE;
+    }
+
+    @Override
+    public MessageStore createMessageStore()
+    {
+        return new TestableMemoryMessageStore();
+    }
+
+    @Override
+    public void validateAttributes(Map<String, Object> attributes)
+    {
+    }
+
+}

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Wed Mar 12 13:19:29 2014
@@ -29,14 +29,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.configuration.store.JsonConfigurationEntryStore;
 import org.apache.qpid.server.exchange.DefaultExchangeFactory;
 import org.apache.qpid.server.model.Broker;
@@ -45,9 +42,11 @@ import org.apache.qpid.server.queue.AMQQ
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.stats.StatisticsGatherer;
+import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.plugin.PluggableFactoryLoader;
 import org.apache.qpid.server.plugin.VirtualHostFactory;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 import org.apache.qpid.server.virtualhost.QueueExistsException;
@@ -82,23 +81,14 @@ public class BrokerTestHelper
     {
     }
 
-    public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration, VirtualHostRegistry virtualHostRegistry)
+    public static VirtualHost createVirtualHost(VirtualHostRegistry virtualHostRegistry, org.apache.qpid.server.model.VirtualHost modelVHost)
             throws Exception
     {
-        return createVirtualHost(virtualHostConfiguration, virtualHostRegistry, mock(org.apache.qpid.server.model.VirtualHost.class));
-    }
-
-    public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration, VirtualHostRegistry virtualHostRegistry, org.apache.qpid.server.model.VirtualHost modelVHost)
-            throws Exception
-    {
-        StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
-        final VirtualHostFactory factory =
-                        virtualHostConfiguration == null ? new StandardVirtualHostFactory()
-                                                         : VirtualHostFactory.FACTORIES.get(virtualHostConfiguration.getType());
+        String hostType = modelVHost.getType();
+        VirtualHostFactory factory = new PluggableFactoryLoader<VirtualHostFactory>(VirtualHostFactory.class).get(hostType);
         VirtualHost host = factory.createVirtualHost(virtualHostRegistry,
-                statisticsGatherer,
+                mock(StatisticsGatherer.class),
                 new SecurityManager(mock(Broker.class), false),
-                virtualHostConfiguration,
                 modelVHost);
         if(virtualHostRegistry != null)
         {
@@ -107,29 +97,21 @@ public class BrokerTestHelper
         return host;
     }
 
-    public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration) throws Exception
-    {
-
-        return createVirtualHost(virtualHostConfiguration, new VirtualHostRegistry(new EventLogger()));
-    }
-
-    public static VirtualHost createVirtualHost(String name, VirtualHostRegistry virtualHostRegistry) throws Exception
-    {
-        VirtualHostConfiguration vhostConfig = createVirtualHostConfiguration(name);
-        return createVirtualHost(vhostConfig, virtualHostRegistry);
-    }
-
     public static VirtualHost createVirtualHost(String name) throws Exception
     {
-        VirtualHostConfiguration configuration = createVirtualHostConfiguration(name);
-        return createVirtualHost(configuration);
+        return createVirtualHost(name, new VirtualHostRegistry(new EventLogger()));
     }
 
-    private static VirtualHostConfiguration createVirtualHostConfiguration(String name) throws ConfigurationException
+    public static VirtualHost createVirtualHost(String name, VirtualHostRegistry virtualHostRegistry) throws Exception
     {
-        VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, new PropertiesConfiguration(), createBrokerMock());
-        vhostConfig.setMessageStoreClass(TestableMemoryMessageStore.class.getName());
-        return vhostConfig;
+        org.apache.qpid.server.model.VirtualHost virtualHost = mock(org.apache.qpid.server.model.VirtualHost.class);
+        when(virtualHost.getType()).thenReturn(StandardVirtualHostFactory.TYPE);
+        when(virtualHost.getAttribute(org.apache.qpid.server.model.VirtualHost.TYPE)).thenReturn(StandardVirtualHostFactory.TYPE);
+
+        when(virtualHost.getStoreType()).thenReturn(TestableMemoryMessageStore.TYPE);
+        when(virtualHost.getAttribute(org.apache.qpid.server.model.VirtualHost.STORE_TYPE)).thenReturn(TestableMemoryMessageStore.TYPE);
+        when(virtualHost.getName()).thenReturn(name);
+        return createVirtualHost(virtualHostRegistry, virtualHost);
     }
 
     public static AMQSessionModel createSession(int channelId, AMQConnectionModel connection)
@@ -189,5 +171,4 @@ public class BrokerTestHelper
         return queue;
     }
 
-
 }

Modified: qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1576732&r1=1576731&r2=1576732&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/branches/java-broker-bdb-ha2/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Wed Mar 12 13:19:29 2014
@@ -23,7 +23,6 @@ package org.apache.qpid.server.virtualho
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.connection.IConnectionRegistry;
 import org.apache.qpid.server.exchange.ExchangeImpl;
@@ -73,11 +72,6 @@ public class MockVirtualHost implements 
         return null;
     }
 
-    public VirtualHostConfiguration getConfiguration()
-    {
-        return null;
-    }
-
     public IConnectionRegistry getConnectionRegistry()
     {
         return null;
@@ -370,4 +364,10 @@ public class MockVirtualHost implements 
     {
         return null;
     }
+
+    @Override
+    public boolean getDefaultDeadLetterQueueEnabled()
+    {
+        return false;
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message