QPID-4970 : [Java Broker] Configure MessageStores based on VirtualHost object not XML Configuration

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

28 files changed, 300 insertions, 125 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
index 383ff2f3f6..68177dac62 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
@@ -144,7 +144,7 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
             {
                 validateAttributes(type);
             }
-        }
+        }/*
         else
         {
             if (type != null)
@@ -152,7 +152,7 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
                 invalidAttributes = true;
             }
 
-        }
+        }*/
         if (invalidAttributes)
         {
             throw new IllegalConfigurationException("Please specify either the 'configPath' attribute or 'type' attributes");
@@ -1109,9 +1109,10 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
             else
             {
                 _virtualHost = factory.createVirtualHost(_broker.getVirtualHostRegistry(),
-                        _brokerStatisticsGatherer,
-                        _broker.getSecurityManager(),
-                        configuration);
+                                                         _brokerStatisticsGatherer,
+                                                         _broker.getSecurityManager(),
+                                                         configuration,
+                                                         this);
             }
         }
         catch (Exception e)
@@ -1172,6 +1173,17 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
                 throw new IllegalConfigurationException("Configuration file '" + configurationFile + "' does not exist");
             }
             configuration = new VirtualHostConfiguration(virtualHostName, new File(configurationFile) , _broker);
+            String type = configuration.getType();
+            changeAttribute(TYPE,null,type);
+            VirtualHostFactory factory = VirtualHostFactory.FACTORIES.get(type);
+            if(factory != null)
+            {
+                for(Map.Entry<String,Object> entry : factory.convertVirtualHostConfiguration(configuration.getConfig()).entrySet())
+                {
+                    changeAttribute(entry.getKey(), getAttribute(entry.getKey()), entry.getValue());
+                }
+            }
+
         }
         return configuration;
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
index e3b7f03978..a5f4ea063b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
@@ -26,13 +26,14 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.jdbc.ConnectionProvider;
 
 public interface JDBCConnectionProviderFactory
 {
     String getType();
 
-    ConnectionProvider getConnectionProvider(String connectionUrl, Configuration storeConfiguration)
+    ConnectionProvider getConnectionProvider(String connectionUrl, VirtualHost virtualHost)
             throws SQLException;
 
     static final class TYPES
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
index aff06af4ce..9297f34f94 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.plugin;
 
+import java.util.Map;
+import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.store.MessageStore;
 
 public interface MessageStoreFactory
@@ -27,4 +29,7 @@ public interface MessageStoreFactory
     String getType();
 
     MessageStore createMessageStore();
+
+    public Map<String, Object> convertStoreConfiguration(Configuration configuration);
+
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
index f952e0410c..2a3b65f829 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/VirtualHostFactory.java
@@ -25,6 +25,7 @@ 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;
@@ -39,12 +40,15 @@ public interface VirtualHostFactory
     VirtualHost createVirtualHost(VirtualHostRegistry virtualHostRegistry,
                                   StatisticsGatherer brokerStatisticsGatherer,
                                   SecurityManager parentSecurityManager,
-                                  VirtualHostConfiguration hostConfig) throws Exception;
+                                  VirtualHostConfiguration hostConfig,
+                                  org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception;
 
     void validateAttributes(Map<String, Object> attributes);
 
     Map<String, Object> createVirtualHostConfiguration(VirtualHostAdapter virtualHostAdapter);
 
+    Map<String,Object> convertVirtualHostConfiguration(Configuration configuration);
+
     static final class TYPES
     {
         private TYPES()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index b7f5035de0..758945d6a1 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
@@ -29,7 +29,6 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -41,7 +40,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
@@ -50,6 +48,7 @@ import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.store.ConfigurationRecoveryHandler.BindingRecoveryHandler;
 import org.apache.qpid.server.store.ConfigurationRecoveryHandler.ExchangeRecoveryHandler;
@@ -170,21 +169,20 @@ abstract public class AbstractJDBCMessageStore implements MessageStore, DurableC
 
     @Override
     public void configureConfigStore(String name,
-                          ConfigurationRecoveryHandler configRecoveryHandler,
-                          Configuration storeConfiguration) throws Exception
+                                     ConfigurationRecoveryHandler configRecoveryHandler,
+                                     VirtualHost virtualHost) throws Exception
     {
         _stateManager.attainState(State.INITIALISING);
         _configRecoveryHandler = configRecoveryHandler;
 
-        commonConfiguration(name, storeConfiguration);
+        commonConfiguration(name, virtualHost);
 
     }
 
     @Override
     public void configureMessageStore(String name,
-                          MessageStoreRecoveryHandler recoveryHandler,
-                          TransactionLogRecoveryHandler tlogRecoveryHandler,
-                          Configuration storeConfiguration) throws Exception
+                                      MessageStoreRecoveryHandler recoveryHandler,
+                                      TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
         _tlogRecoveryHandler = tlogRecoveryHandler;
         _messageRecoveryHandler = recoveryHandler;
@@ -206,15 +204,16 @@ abstract public class AbstractJDBCMessageStore implements MessageStore, DurableC
         _stateManager.attainState(State.ACTIVE);
     }
 
-    private void commonConfiguration(String name, Configuration storeConfiguration)
+    private void commonConfiguration(String name, VirtualHost virtualHost)
             throws ClassNotFoundException, SQLException
     {
-        implementationSpecificConfiguration(name, storeConfiguration);
+        implementationSpecificConfiguration(name, virtualHost);
         createOrOpenDatabase();
 
     }
 
-    protected abstract void implementationSpecificConfiguration(String name, Configuration storeConfiguration) throws ClassNotFoundException, SQLException;
+    protected abstract void implementationSpecificConfiguration(String name,
+                                                                VirtualHost virtualHost) throws ClassNotFoundException, SQLException;
 
     abstract protected Logger getLogger();
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
index 27a40963f6..7092655e95 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
@@ -26,6 +26,7 @@ import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
 
 public interface DurableConfigurationStore
@@ -40,14 +41,16 @@ public interface DurableConfigurationStore
      * Called after instantiation in order to configure the message store. A particular implementation can define
      * whatever parameters it wants.
      *
+     *
+     *
      * @param name             The name to be used by this store
      * @param recoveryHandler  Handler to be called as the store recovers on start up
-     * @param config           The apache commons configuration object.
+     * @param virtualHost
      * @throws Exception If any error occurs that means the store is unable to configure itself.
      */
     void configureConfigStore(String name,
                               ConfigurationRecoveryHandler recoveryHandler,
-                              Configuration config) throws Exception;
+                              VirtualHost virtualHost) throws Exception;
     /**
      * Makes the specified exchange persistent.
      *
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 3f1d1b9530..9b2496f262 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
@@ -20,12 +20,12 @@
  */
 package org.apache.qpid.server.store;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.server.message.EnqueableMessage;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import org.apache.qpid.server.model.VirtualHost;
 
 /** A simple message store that stores the messages in a thread-safe structure in memory. */
 public class MemoryMessageStore extends NullMessageStore
@@ -82,13 +82,17 @@ public class MemoryMessageStore extends NullMessageStore
     }
 
     @Override
-    public void configureConfigStore(String name, ConfigurationRecoveryHandler recoveryHandler, Configuration config) throws Exception
+    public void configureConfigStore(String name,
+                                     ConfigurationRecoveryHandler recoveryHandler,
+                                     VirtualHost virtualHost) throws Exception
     {
         _stateManager.attainState(State.INITIALISING);
     }
 
     @Override
-    public void configureMessageStore(String name, MessageStoreRecoveryHandler recoveryHandler, TransactionLogRecoveryHandler tlogRecoveryHandler, Configuration config) throws Exception
+    public void configureMessageStore(String name,
+                                      MessageStoreRecoveryHandler recoveryHandler,
+                                      TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
         _stateManager.attainState(State.INITIALISED);
     }
@@ -97,7 +101,7 @@ public class MemoryMessageStore extends NullMessageStore
     public void activate() throws Exception
     {
         _stateManager.attainState(State.ACTIVATING);
-        
+
         _stateManager.attainState(State.ACTIVE);
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
index dceba4af31..476b2f127d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
@@ -20,6 +20,9 @@
  */
 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 MemoryMessageStoreFactory implements MessageStoreFactory
@@ -37,4 +40,10 @@ public class MemoryMessageStoreFactory implements MessageStoreFactory
         return new MemoryMessageStore();
     }
 
+    @Override
+    public Map<String, Object> convertStoreConfiguration(Configuration configuration)
+    {
+        return Collections.emptyMap();
+    }
+
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
index bbdfaf4959..5fc6bad368 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
@@ -32,16 +32,15 @@ public interface MessageStore
      * Called after instantiation in order to configure the message store. A particular implementation can define
      * whatever parameters it wants.
      *
+     *
      * @param name             The name to be used by this store
      * @param messageRecoveryHandler  Handler to be called as the store recovers on start up
      * @param tlogRecoveryHandler
-     * @param config           The apache commons configuration object.
      * @throws Exception If any error occurs that means the store is unable to configure itself.
      */
     void configureMessageStore(String name,
                                MessageStoreRecoveryHandler messageRecoveryHandler,
-                               TransactionLogRecoveryHandler tlogRecoveryHandler,
-                               Configuration config) throws Exception;
+                               TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception;
 
     void activate() throws Exception;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
index 728da23f28..93b669e6e4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreConstants.java
@@ -25,5 +25,7 @@ public class MessageStoreConstants
     public static final String ENVIRONMENT_PATH_PROPERTY = "environment-path";
     public static final String OVERFULL_SIZE_PROPERTY = "overfull-size";
     public static final String UNDERFULL_SIZE_PROPERTY = "underfull-size";
+    public static final String OVERFULL_SIZE_ATTRIBUTE = "storeOverfullSize";
+    public static final String UNDERFULL_SIZE_ATTRIBUTE = "storeUnderfullSize";
 
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
index f0936a221c..3b57bbfa55 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
@@ -19,11 +19,11 @@
  */
 package org.apache.qpid.server.store;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
 
 public abstract class NullMessageStore implements MessageStore, DurableConfigurationStore
@@ -31,7 +31,7 @@ public abstract class NullMessageStore implements MessageStore, DurableConfigura
     @Override
     public void configureConfigStore(String name,
                                      ConfigurationRecoveryHandler recoveryHandler,
-                                     Configuration config) throws Exception
+                                     VirtualHost virtualHost) throws Exception
     {
     }
 
@@ -77,8 +77,8 @@ public abstract class NullMessageStore implements MessageStore, DurableConfigura
 
     @Override
     public void configureMessageStore(String name,
-            MessageStoreRecoveryHandler recoveryHandler,
-            TransactionLogRecoveryHandler tlogRecoveryHandler, Configuration config) throws Exception
+                                      MessageStoreRecoveryHandler recoveryHandler,
+                                      TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
index 0d4231a10d..ac310d02c9 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
@@ -32,8 +32,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.AbstractJDBCMessageStore;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.Event;
@@ -123,15 +123,20 @@ public class DerbyMessageStore extends AbstractJDBCMessageStore implements Messa
     }
 
     @Override
-    protected void implementationSpecificConfiguration(String name, Configuration storeConfiguration)
+    protected void implementationSpecificConfiguration(String name,
+                                                       VirtualHost virtualHost)
             throws ClassNotFoundException
     {
         //Update to pick up QPID_WORK and use that as the default location not just derbyDB
 
         _driverClass = (Class<Driver>) Class.forName(SQL_DRIVER_NAME);
 
-        final String databasePath = storeConfiguration.getString(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY, System.getProperty("QPID_WORK")
-                + File.separator + "derbyDB");
+        String defaultPath = System.getProperty("QPID_WORK") + File.separator + "derbyDB";
+        String databasePath = (String) virtualHost.getAttribute(VirtualHost.STORE_PATH);
+        if(databasePath == null)
+        {
+            databasePath = defaultPath;
+        }
 
         if(!MEMORY_STORE_LOCATION.equals(databasePath))
         {
@@ -148,8 +153,14 @@ public class DerbyMessageStore extends AbstractJDBCMessageStore implements Messa
 
         _storeLocation = databasePath;
 
-        _persistentSizeHighThreshold = storeConfiguration.getLong(MessageStoreConstants.OVERFULL_SIZE_PROPERTY, -1l);
-        _persistentSizeLowThreshold = storeConfiguration.getLong(MessageStoreConstants.UNDERFULL_SIZE_PROPERTY, _persistentSizeHighThreshold);
+        Object overfullAttr = virtualHost.getAttribute(MessageStoreConstants.OVERFULL_SIZE_ATTRIBUTE);
+        Object underfullAttr = virtualHost.getAttribute(MessageStoreConstants.UNDERFULL_SIZE_ATTRIBUTE);
+
+        _persistentSizeHighThreshold = overfullAttr == null ? -1l :
+                                       overfullAttr instanceof Number ? ((Number) overfullAttr).longValue() : Long.parseLong(overfullAttr.toString());
+        _persistentSizeLowThreshold = underfullAttr == null ? _persistentSizeHighThreshold :
+                                       underfullAttr instanceof Number ? ((Number) underfullAttr).longValue() : Long.parseLong(underfullAttr.toString());
+
         if(_persistentSizeLowThreshold > _persistentSizeHighThreshold || _persistentSizeLowThreshold < 0l)
         {
             _persistentSizeLowThreshold = _persistentSizeHighThreshold;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
index 81e5bb9ff9..0f53d66435 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.server.store.derby;
 
+import java.util.Collections;
+import java.util.Map;
+import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 import org.apache.qpid.server.store.MessageStore;
 
@@ -38,4 +41,10 @@ public class DerbyMessageStoreFactory implements MessageStoreFactory
         return new DerbyMessageStore();
     }
 
+    @Override
+    public Map<String, Object> convertStoreConfiguration(Configuration configuration)
+    {
+        return Collections.emptyMap();
+    }
+
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
index 0f074cc95b..a2d3644590 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.server.store.jdbc;
 
 import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
 
 public class DefaultConnectionProviderFactory implements JDBCConnectionProviderFactory
@@ -34,7 +35,7 @@ public class DefaultConnectionProviderFactory implements JDBCConnectionProviderF
 
     @Override
     public ConnectionProvider getConnectionProvider(String connectionUrl,
-                                                    Configuration storeConfiguration)
+                                                    VirtualHost virtualHost)
     {
         return new DefaultConnectionProvider(connectionUrl);
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
index 79093fe2e2..951ea28c20 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
@@ -29,13 +29,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQStoreException;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
 import org.apache.qpid.server.store.AbstractJDBCMessageStore;
 import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.MessageStoreConstants;
 import org.apache.qpid.server.store.StoreFuture;
 import org.apache.qpid.server.store.Transaction;
 
@@ -275,13 +274,15 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
     }
 
 
-    protected void implementationSpecificConfiguration(String name, Configuration storeConfiguration)
+    protected void implementationSpecificConfiguration(String name,
+                                                       VirtualHost virtualHost)
         throws ClassNotFoundException, SQLException
     {
 
 
-        String connectionURL = storeConfiguration.getString("connectionUrl",
-                storeConfiguration.getString(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY));
+        String connectionURL = virtualHost.getAttribute("connectionURL") == null
+                               ? String.valueOf(virtualHost.getAttribute(VirtualHost.STORE_PATH))
+                               : String.valueOf(virtualHost.getAttribute("connectionURL"));
 
         JDBCDetails details = null;
 
@@ -301,8 +302,9 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
         }
 
 
-        Configuration poolConfig = storeConfiguration.subset("pool");
-        String connectionPoolType = poolConfig.getString("type", "DEFAULT");
+        Object poolAttribute = virtualHost.getAttribute("connectionPool");
+        String connectionPoolType = poolAttribute == null ? "DEFAULT" : String.valueOf(poolAttribute);
+
         JDBCConnectionProviderFactory connectionProviderFactory =
                 JDBCConnectionProviderFactory.FACTORIES.get(connectionPoolType);
         if(connectionProviderFactory == null)
@@ -311,14 +313,44 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
             connectionProviderFactory = new DefaultConnectionProviderFactory();
         }
 
-        _connectionProvider = connectionProviderFactory.getConnectionProvider(connectionURL, poolConfig);
+        _connectionProvider = connectionProviderFactory.getConnectionProvider(connectionURL, virtualHost);
+
+        _blobType = getStringAttribute(virtualHost, "jdbcBlobType",details.getBlobType());
+        _varBinaryType = getStringAttribute(virtualHost, "jdbcVarbinaryType",details.getVarBinaryType());
+        _useBytesMethodsForBlob = getBooleanAttribute(virtualHost, "jdbcBytesForBlob",details.isUseBytesMethodsForBlob());
+        _bigIntType = getStringAttribute(virtualHost, "jdbcBigIntType", details.getBigintType());
+    }
+
+
+    private String getStringAttribute(VirtualHost virtualHost, String attributeName, String defaultVal)
+    {
+        Object attrValue = virtualHost.getAttribute(attributeName);
+        if(attrValue != null)
+        {
+            return attrValue.toString();
+        }
+        return defaultVal;
+    }
+
+    private boolean getBooleanAttribute(VirtualHost virtualHost, String attributeName, boolean defaultVal)
+    {
+        Object attrValue = virtualHost.getAttribute(attributeName);
+        if(attrValue != null)
+        {
+            if(attrValue instanceof Boolean)
+            {
+                return ((Boolean) attrValue).booleanValue();
+            }
+            else if(attrValue instanceof String)
+            {
+                return Boolean.parseBoolean((String)attrValue);
+            }
 
-        _blobType = storeConfiguration.getString("sqlBlobType",details.getBlobType());
-        _varBinaryType = storeConfiguration.getString("sqlVarbinaryType",details.getVarBinaryType());
-        _useBytesMethodsForBlob = storeConfiguration.getBoolean("useBytesForBlob",details.isUseBytesMethodsForBlob());
-        _bigIntType = storeConfiguration.getString("sqlBigIntType", details.getBigintType());
+        }
+        return defaultVal;
     }
 
+
     protected void storedSizeChange(int contentSize)
     {
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
index 1446ad34e9..99ec4c7d32 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.server.store.jdbc;
 
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
 import org.apache.qpid.server.store.MessageStore;
 
@@ -38,4 +41,25 @@ public class JDBCMessageStoreFactory implements MessageStoreFactory
         return new JDBCMessageStore();
     }
 
+    @Override
+    public Map<String, Object> convertStoreConfiguration(Configuration storeConfiguration)
+    {
+        Map<String,Object> convertedMap = new HashMap<String,Object>();
+        convertedMap.put("jdbcBlobType", storeConfiguration.getString("sqlBlobType"));
+        convertedMap.put("jdbcVarbinaryType", storeConfiguration.getString("sqlVarbinaryType"));
+        if(storeConfiguration.containsKey("useBytesForBlob"))
+        {
+            convertedMap.put("jdbcUseBytesForBlob", storeConfiguration.getBoolean("useBytesForBlob"));
+        }
+        convertedMap.put("jdbcBigIntType", storeConfiguration.getString("sqlBigIntType"));
+        convertedMap.put("connectionPool", storeConfiguration.getString("pool.type"));
+        convertedMap.put("minConnectionsPerPartition", storeConfiguration.getInteger("pool.minConnectionsPerPartition",
+                null));
+        convertedMap.put("maxConnectionsPerPartition", storeConfiguration.getInteger("pool.maxConnectionsPerPartition",
+                null));
+        convertedMap.put("partitionCount", storeConfiguration.getInteger("pool.partitionCount", null));
+
+        return convertedMap;
+    }
+
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 6116d46e41..a704ca112b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -45,7 +45,6 @@ import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.VirtualHostMessages;
-import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
 import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -57,12 +56,8 @@ import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.stats.StatisticsCounter;
 import org.apache.qpid.server.stats.StatisticsGatherer;
-import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.Event;
 import org.apache.qpid.server.store.EventListener;
-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.txn.DtxRegistry;
 
 public abstract class AbstractVirtualHost implements VirtualHost, IConnectionRegistry.RegistryChangeListener, EventListener
@@ -107,7 +102,8 @@ public abstract class AbstractVirtualHost implements VirtualHost, IConnectionReg
     public AbstractVirtualHost(VirtualHostRegistry virtualHostRegistry,
                                StatisticsGatherer brokerStatisticsGatherer,
                                SecurityManager parentSecurityManager,
-                               VirtualHostConfiguration hostConfig) throws Exception
+                               VirtualHostConfiguration hostConfig,
+                               org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception
     {
         if (hostConfig == null)
         {
@@ -144,13 +140,14 @@ public abstract class AbstractVirtualHost implements VirtualHost, IConnectionReg
 
         initialiseStatistics();
 
-        initialiseStorage(hostConfig);
+        initialiseStorage(hostConfig, virtualHost);
 
         getMessageStore().addEventListener(this, Event.PERSISTENT_MESSAGE_SIZE_OVERFULL);
         getMessageStore().addEventListener(this, Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL);
     }
 
-    abstract protected void initialiseStorage(VirtualHostConfiguration hostConfig) throws Exception;
+    abstract protected void initialiseStorage(VirtualHostConfiguration hostConfig,
+                                              org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception;
 
     public IConnectionRegistry getConnectionRegistry()
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
index 05a33e7d99..82be0c01e1 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
@@ -19,12 +19,11 @@ package org.apache.qpid.server.virtualhost;/*
  *
  */
 
-import org.apache.commons.configuration.Configuration;
 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;
 import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.Event;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreCreator;
 import org.apache.qpid.server.store.OperationalLoggingListener;
@@ -36,18 +35,19 @@ public class StandardVirtualHost extends AbstractVirtualHost
     private DurableConfigurationStore _durableConfigurationStore;
 
     StandardVirtualHost(VirtualHostRegistry virtualHostRegistry,
-                               StatisticsGatherer brokerStatisticsGatherer,
-                               org.apache.qpid.server.security.SecurityManager parentSecurityManager,
-                               VirtualHostConfiguration hostConfig) throws Exception
+                        StatisticsGatherer brokerStatisticsGatherer,
+                        org.apache.qpid.server.security.SecurityManager parentSecurityManager,
+                        VirtualHostConfiguration hostConfig, VirtualHost virtualHost) throws Exception
     {
-        super(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig);
+        super(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig, virtualHost);
     }
 
 
 
-    private MessageStore initialiseMessageStore(VirtualHostConfiguration hostConfig) throws Exception
+    private MessageStore initialiseMessageStore(VirtualHostConfiguration hostConfig, VirtualHost virtualHost) throws Exception
     {
-        String storeType = hostConfig.getConfig().getString("store.type");
+        final Object storeTypeAttr = virtualHost.getAttribute(VirtualHost.STORE_TYPE);
+        String storeType = storeTypeAttr == null ? null : String.valueOf(storeTypeAttr);
         MessageStore  messageStore = null;
         if (storeType == null)
         {
@@ -74,7 +74,7 @@ public class StandardVirtualHost extends AbstractVirtualHost
         return messageStore;
     }
 
-    private DurableConfigurationStore initialiseConfigurationStore(VirtualHostConfiguration hostConfig) throws Exception
+    private DurableConfigurationStore initialiseConfigurationStore(VirtualHost virtualHost) throws Exception
     {
         DurableConfigurationStore configurationStore;
         if(getMessageStore() instanceof DurableConfigurationStore)
@@ -90,19 +90,17 @@ public class StandardVirtualHost extends AbstractVirtualHost
     }
 
 
-    protected void initialiseStorage(VirtualHostConfiguration hostConfig) throws Exception
+    protected void initialiseStorage(VirtualHostConfiguration hostConfig, VirtualHost virtualHost) throws Exception
     {
-        _messageStore = initialiseMessageStore(hostConfig);
+        _messageStore = initialiseMessageStore(hostConfig, virtualHost);
 
-        _durableConfigurationStore = initialiseConfigurationStore(hostConfig);
+        _durableConfigurationStore = initialiseConfigurationStore(virtualHost);
 
         VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this);
 
-        final Configuration storeConfiguration = hostConfig.getStoreConfiguration();
+        _durableConfigurationStore.configureConfigStore(getName(), recoveryHandler, virtualHost);
 
-        _durableConfigurationStore.configureConfigStore(getName(), recoveryHandler, storeConfiguration);
-
-        _messageStore.configureMessageStore(getName(), recoveryHandler, recoveryHandler, storeConfiguration);
+        _messageStore.configureMessageStore(getName(), recoveryHandler, recoveryHandler);
 
         initialiseModel(hostConfig);
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
index 3a604dbd90..a0f22aa34c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHostFactory.java
@@ -19,13 +19,21 @@ package org.apache.qpid.server.virtualhost;/*
  *
  */
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
 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.MemoryMessageStore;
+import org.apache.qpid.server.store.MessageStoreConstants;
 import org.apache.qpid.server.store.MessageStoreCreator;
 
 public class StandardVirtualHostFactory implements VirtualHostFactory
@@ -43,9 +51,10 @@ public class StandardVirtualHostFactory implements VirtualHostFactory
     public VirtualHost createVirtualHost(VirtualHostRegistry virtualHostRegistry,
                                          StatisticsGatherer brokerStatisticsGatherer,
                                          org.apache.qpid.server.security.SecurityManager parentSecurityManager,
-                                         VirtualHostConfiguration hostConfig) throws Exception
+                                         VirtualHostConfiguration hostConfig,
+                                         org.apache.qpid.server.model.VirtualHost virtualHost) throws Exception
     {
-        return new StandardVirtualHost(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig);
+        return new StandardVirtualHost(virtualHostRegistry, brokerStatisticsGatherer, parentSecurityManager, hostConfig, virtualHost);
     }
 
 
@@ -94,13 +103,26 @@ public class StandardVirtualHostFactory implements VirtualHostFactory
         convertedMap.put("store.type", virtualHostAdapter.getAttribute(org.apache.qpid.server.model.VirtualHost.STORE_TYPE));
         convertedMap.put("store.environment-path", virtualHostAdapter.getAttribute(org.apache.qpid.server.model.VirtualHost.STORE_PATH));
 
-        // TODO - this should all be inverted to populate vhost from xml and then pass model object to the store
+        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("store.pool.type",virtualHostAdapter.getAttribute("connectionPool"));
-        convertedMap.put("store.pool.minConnectionsPerPartition",virtualHostAdapter.getAttribute("minConnectionsPerPartition"));
-        convertedMap.put("store.pool.maxConnectionsPerPartition",virtualHostAdapter.getAttribute("maxConnectionsPerPartition"));
-        convertedMap.put("store.pool.partitionCount",virtualHostAdapter.getAttribute("partitionCount"));
+        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;
+
     }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
index 8a7d5d85fc..57e1fcd15c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
@@ -49,6 +49,7 @@ import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.TestLogActor;
 import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MockStoredMessage;
 import org.apache.qpid.server.store.ConfigurationRecoveryHandler.BindingRecoveryHandler;
@@ -67,6 +68,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
     private String _storeName;
     private MessageStore _messageStore;
     private Configuration _configuration;
+    private VirtualHost _virtualHost;
 
     private ConfigurationRecoveryHandler _recoveryHandler;
     private QueueRecoveryHandler _queueRecoveryHandler;
@@ -107,6 +109,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _messageStoreRecoveryHandler = mock(MessageStoreRecoveryHandler.class);
         _queueEntryRecoveryHandler = mock(TransactionLogRecoveryHandler.QueueEntryRecoveryHandler.class);
         _dtxRecordRecoveryHandler = mock(TransactionLogRecoveryHandler.DtxRecordRecoveryHandler.class);
+        _virtualHost = mock(VirtualHost.class);
 
         when(_messageStoreRecoveryHandler.begin()).thenReturn(_storedMessageRecoveryHandler);
         when(_recoveryHandler.begin(isA(MessageStore.class))).thenReturn(_exchangeRecoveryHandler);
@@ -118,6 +121,7 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         when(_exchange.getId()).thenReturn(_exchangeId);
         when(_configuration.getString(eq(MessageStoreConstants.ENVIRONMENT_PATH_PROPERTY), anyString())).thenReturn(
                 _storePath);
+        when(_virtualHost.getAttribute(eq(VirtualHost.STORE_PATH))).thenReturn(_storePath);
 
         _bindingArgs = new FieldTable();
         AMQShortString argKey = AMQPFilterTypes.JMS_SELECTOR.getValue();
@@ -314,8 +318,8 @@ public class DurableConfigurationStoreTest extends QpidTestCase
         _messageStore = createMessageStore();
         _configStore = createConfigStore();
 
-        _configStore.configureConfigStore(_storeName, _recoveryHandler, _configuration);
-        _messageStore.configureMessageStore(_storeName, _messageStoreRecoveryHandler, _logRecoveryHandler, _configuration);
+        _configStore.configureConfigStore(_storeName, _recoveryHandler, _virtualHost);
+        _messageStore.configureMessageStore(_storeName, _messageStoreRecoveryHandler, _logRecoveryHandler);
         _messageStore.activate();
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
index 8743c4111b..f57195b2d7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
@@ -37,9 +36,14 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.message.MessageMetaData;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.FileUtils;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase implements EventListener, TransactionLogResource
 {
     private static final Logger _logger = Logger.getLogger(MessageStoreQuotaEventsTestBase.class);
@@ -54,7 +58,7 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple
 
     protected abstract MessageStore createStore() throws Exception;
 
-    protected abstract void applyStoreSpecificConfiguration(XMLConfiguration config);
+    protected abstract void applyStoreSpecificConfiguration(VirtualHost virtualHost);
 
     protected abstract int getNumberOfMessagesToFillStore();
 
@@ -66,12 +70,13 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple
         _storeLocation = new File(new File(TMP_FOLDER), getTestName());
         FileUtils.delete(_storeLocation, true);
 
-        XMLConfiguration config = new XMLConfiguration();
-        config.addProperty("environment-path", _storeLocation.getAbsolutePath());
-        applyStoreSpecificConfiguration(config);
+
+        VirtualHost vhost = mock(VirtualHost.class);
+        when(vhost.getAttribute(eq(VirtualHost.STORE_PATH))).thenReturn(_storeLocation.getAbsolutePath());
+        applyStoreSpecificConfiguration(vhost);
 
         _store = createStore();
-        ((DurableConfigurationStore)_store).configureConfigStore("test", null, config);
+        ((DurableConfigurationStore)_store).configureConfigStore("test", null, vhost);
 
         _transactionResource = UUID.randomUUID();
         _events = new ArrayList<Event>();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index fb255e89f9..5eea002365 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -62,6 +62,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * This tests the MessageStores by using the available interfaces.
  *
@@ -98,26 +102,42 @@ public class MessageStoreTest extends QpidTestCase
     private PropertiesConfiguration _config;
 
     private VirtualHost _virtualHost;
+    private org.apache.qpid.server.model.VirtualHost _virtualHostModel;
     private Broker _broker;
+    private String _storePath;
 
     public void setUp() throws Exception
     {
         super.setUp();
         BrokerTestHelper.setUp();
 
-        String storePath = System.getProperty("QPID_WORK") + File.separator + getName();
+        _storePath = System.getProperty("QPID_WORK") + File.separator + getName();
 
         _config = new PropertiesConfiguration();
         _config.addProperty("store.class", getTestProfileMessageStoreClassName());
-        _config.addProperty("store.environment-path", storePath);
+        _config.addProperty("store.environment-path", _storePath);
+        _virtualHostModel = mock(org.apache.qpid.server.model.VirtualHost.class);
+        when(_virtualHostModel.getAttribute(eq(org.apache.qpid.server.model.VirtualHost.STORE_PATH))).thenReturn(_storePath);
+
+
 
-        cleanup(new File(storePath));
+        cleanup(new File(_storePath));
 
         _broker = BrokerTestHelper.createBrokerMock();
 
         reloadVirtualHost();
     }
 
+    protected String getStorePath()
+    {
+        return _storePath;
+    }
+
+    protected org.apache.qpid.server.model.VirtualHost getVirtualHostModel()
+    {
+        return _virtualHostModel;
+    }
+
     @Override
     public void tearDown() throws Exception
     {
@@ -164,7 +184,7 @@ public class MessageStoreTest extends QpidTestCase
 
         try
         {
-            _virtualHost = BrokerTestHelper.createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config, _broker));
+            _virtualHost = BrokerTestHelper.createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config, _broker),null,getVirtualHostModel());
         }
         catch (Exception e)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
index 88d5852a17..a73057ebc1 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
@@ -25,8 +25,7 @@ import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.ConfigurationRecoveryHandler.BindingRecoveryHandler;
 import org.apache.qpid.server.store.ConfigurationRecoveryHandler.ExchangeRecoveryHandler;
 import org.apache.qpid.server.store.ConfigurationRecoveryHandler.QueueRecoveryHandler;
@@ -44,9 +43,9 @@ public abstract class MessageStoreTestCase extends QpidTestCase
     private TransactionLogRecoveryHandler _logRecoveryHandler;
     private TransactionLogRecoveryHandler.QueueEntryRecoveryHandler _queueEntryRecoveryHandler;
     private TransactionLogRecoveryHandler.DtxRecordRecoveryHandler _dtxRecordRecoveryHandler;
+    private VirtualHost _virtualHost;
 
     private MessageStore _store;
-    private Configuration _storeConfiguration;
 
     public void setUp() throws Exception
     {
@@ -61,6 +60,7 @@ public abstract class MessageStoreTestCase extends QpidTestCase
         _messageStoreRecoveryHandler = mock(MessageStoreRecoveryHandler.class);
         _queueEntryRecoveryHandler = mock(TransactionLogRecoveryHandler.QueueEntryRecoveryHandler.class);
         _dtxRecordRecoveryHandler = mock(TransactionLogRecoveryHandler.DtxRecordRecoveryHandler.class);
+        _virtualHost = mock(VirtualHost.class);
 
         when(_messageStoreRecoveryHandler.begin()).thenReturn(_storedMessageRecoveryHandler);
         when(_recoveryHandler.begin(isA(MessageStore.class))).thenReturn(_exchangeRecoveryHandler);
@@ -69,15 +69,15 @@ public abstract class MessageStoreTestCase extends QpidTestCase
         when(_logRecoveryHandler.begin(any(MessageStore.class))).thenReturn(_queueEntryRecoveryHandler);
         when(_queueEntryRecoveryHandler.completeQueueEntryRecovery()).thenReturn(_dtxRecordRecoveryHandler);
 
-        _storeConfiguration = new PropertiesConfiguration();
-        setUpStoreConfiguration(_storeConfiguration);
+        setUpStoreConfiguration(_virtualHost);
 
         _store = createMessageStore();
-        ((DurableConfigurationStore)_store).configureConfigStore(getTestName(), _recoveryHandler, _storeConfiguration);
-        _store.configureMessageStore(getTestName(), _messageStoreRecoveryHandler, _logRecoveryHandler, _storeConfiguration);
+        ((DurableConfigurationStore)_store).configureConfigStore(getTestName(), _recoveryHandler, _virtualHost);
+
+        _store.configureMessageStore(getTestName(), _messageStoreRecoveryHandler, _logRecoveryHandler);
     }
 
-    protected abstract void setUpStoreConfiguration(Configuration storeConfiguration) throws Exception;
+    protected abstract void setUpStoreConfiguration(VirtualHost virtualHost) throws Exception;
 
     protected abstract MessageStore createMessageStore();
 
@@ -86,8 +86,4 @@ public abstract class MessageStoreTestCase extends QpidTestCase
         return _store;
     }
 
-    public Configuration getStoreConfiguration()
-    {
-        return _storeConfiguration;
-    }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
index 5d316fca43..479675dac1 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
@@ -20,11 +20,15 @@
  */
 package org.apache.qpid.server.store.derby;
 
-import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.log4j.Logger;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.MessageStoreConstants;
 import org.apache.qpid.server.store.MessageStoreQuotaEventsTestBase;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
 public class DerbyMessageStoreQuotaEventsTest extends MessageStoreQuotaEventsTestBase
 {
     private static final Logger _logger = Logger.getLogger(DerbyMessageStoreQuotaEventsTest.class);
@@ -46,12 +50,12 @@ public class DerbyMessageStoreQuotaEventsTest extends MessageStoreQuotaEventsTes
     }
 
     @Override
-    protected void applyStoreSpecificConfiguration(XMLConfiguration config)
+    protected void applyStoreSpecificConfiguration(VirtualHost vhost)
     {
         _logger.debug("Applying store specific config. overfull-sze=" + OVERFULL_SIZE + ", underfull-size=" + UNDERFULL_SIZE);
 
-        config.addProperty("overfull-size", OVERFULL_SIZE);
-        config.addProperty("underfull-size", UNDERFULL_SIZE);
+        when(vhost.getAttribute(eq(MessageStoreConstants.OVERFULL_SIZE_ATTRIBUTE))).thenReturn(OVERFULL_SIZE);
+        when(vhost.getAttribute(eq(MessageStoreConstants.UNDERFULL_SIZE_ATTRIBUTE))).thenReturn(UNDERFULL_SIZE);
     }
 
     @Override
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
index 1747588bf1..859fad629b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.store.derby;
 
 import java.io.File;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreTestCase;
 import org.apache.qpid.util.FileUtils;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
 public class DerbyMessageStoreTest extends MessageStoreTestCase
 {
     private String _storeLocation;
@@ -57,10 +60,10 @@ public class DerbyMessageStoreTest extends MessageStoreTestCase
     }
 
     @Override
-    protected void setUpStoreConfiguration(Configuration storeConfiguration) throws Exception
+    protected void setUpStoreConfiguration(VirtualHost virtualHost) throws Exception
     {
         _storeLocation = TMP_FOLDER + File.separator + getTestName();
-        storeConfiguration.setProperty("environment-path", _storeLocation);
+        when(virtualHost.getAttribute(eq(VirtualHost.STORE_PATH))).thenReturn(_storeLocation);
         deleteStoreIfExists();
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
index bb118eaaf7..a8e0460cea 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
@@ -28,11 +28,14 @@ import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreTestCase;
 import org.apache.qpid.server.store.derby.DerbyMessageStore;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
 public class JDBCMessageStoreTest extends MessageStoreTestCase
 {
     private String _connectionURL;
@@ -61,10 +64,11 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
     }
 
     @Override
-    protected void setUpStoreConfiguration(Configuration storeConfiguration) throws Exception
+    protected void setUpStoreConfiguration(VirtualHost virtualHost) throws Exception
     {
         _connectionURL = "jdbc:derby:memory:/" + getTestName() + ";create=true";
-        storeConfiguration.addProperty("connectionUrl", _connectionURL);
+
+        when(virtualHost.getAttribute(eq("connectionURL"))).thenReturn(_connectionURL);
     }
 
     @Override
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
index 1c8939d117..7811d04997 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
@@ -58,7 +58,6 @@ 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.VirtualHostFactory;
-import org.apache.qpid.server.virtualhost.VirtualHostFactoryRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 
 public class BrokerTestHelper
@@ -98,6 +97,12 @@ public class BrokerTestHelper
     public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration, VirtualHostRegistry virtualHostRegistry)
             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()
@@ -105,18 +110,18 @@ public class BrokerTestHelper
         VirtualHost host = factory.createVirtualHost(virtualHostRegistry,
                 statisticsGatherer,
                 new SecurityManager(mock(Broker.class), false),
-                virtualHostConfiguration);
-        virtualHostRegistry.registerVirtualHost(host);
+                virtualHostConfiguration,
+                modelVHost);
+        if(virtualHostRegistry != null)
+        {
+            virtualHostRegistry.registerVirtualHost(host);
+        }
         return host;
     }
 
     public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration) throws Exception
     {
-        final VirtualHostFactory factory =
-                virtualHostConfiguration == null ? new StandardVirtualHostFactory()
-                                                 : VirtualHostFactory.FACTORIES.get(virtualHostConfiguration.getType());
-
-        return factory.createVirtualHost(null, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), virtualHostConfiguration);
+        return createVirtualHost(virtualHostConfiguration, null);
     }
 
     public static VirtualHost createVirtualHost(String name, VirtualHostRegistry virtualHostRegistry) throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
index 1243d9f7dd..ae09e8d7e7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
@@ -264,7 +264,8 @@ public class StandardVirtualHostTest extends QpidTestCase
         _virtualHostRegistry = broker.getVirtualHostRegistry();
 
         VirtualHostConfiguration configuration = new  VirtualHostConfiguration(vhostName, config, broker);
-        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), configuration);
+        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), configuration,
+                mock(org.apache.qpid.server.model.VirtualHost.class));
         _virtualHostRegistry.registerVirtualHost(host);
 
         return host;
@@ -364,7 +365,8 @@ public class StandardVirtualHostTest extends QpidTestCase
         Configuration config = new PropertiesConfiguration();
         config.setProperty("store.type", MemoryMessageStore.TYPE);
         VirtualHostConfiguration configuration = new  VirtualHostConfiguration(virtualHostName, config, broker);
-        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), configuration);
+        VirtualHost host = new StandardVirtualHostFactory().createVirtualHost(_virtualHostRegistry, mock(StatisticsGatherer.class), new SecurityManager(mock(Broker.class), false), configuration,
+                mock(org.apache.qpid.server.model.VirtualHost.class));
         _virtualHostRegistry.registerVirtualHost(host);
         return host;
     }