You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/08/20 20:39:45 UTC

svn commit: r1515914 [1/2] - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/src/main/resources/META-INF/services/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ broker-plugins/derby-s...

Author: rgodfrey
Date: Tue Aug 20 18:39:44 2013
New Revision: 1515914

URL: http://svn.apache.org/r1515914
Log:
QPID-5087 : [Java Broker] Allow use of separate message stores and configuration stores

Added:
    qpid/trunk/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
      - copied unchanged from r1515742, qpid/trunk/qpid/java/bdbstore/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
    qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
      - copied unchanged from r1515742, qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
      - copied unchanged from r1515742, qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java
      - copied, changed from r1515742, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
      - copied, changed from r1515742, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java
    qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
Modified:
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java
    qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java
    qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
    qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java
    qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
    qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
    qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Tue Aug 20 18:39:44 2013
@@ -139,6 +139,7 @@ public abstract class AbstractBDBMessage
     private String _storeLocation;
 
     private Map<String, String> _envConfigMap;
+    private VirtualHost _virtualHost;
 
     public AbstractBDBMessageStore()
     {
@@ -151,34 +152,58 @@ public abstract class AbstractBDBMessage
         _eventManager.addEventListener(eventListener, events);
     }
 
-    public void configureConfigStore(String name,
-                                     ConfigurationRecoveryHandler recoveryHandler,
-                                     VirtualHost virtualHost) throws Exception
+    public void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler recoveryHandler) throws Exception
     {
         _stateManager.attainState(State.INITIALISING);
 
         _configRecoveryHandler = recoveryHandler;
-
-        configure(name, virtualHost);
+        _virtualHost = virtualHost;
     }
 
-    public void configureMessageStore(String name,
-                                      MessageStoreRecoveryHandler messageRecoveryHandler,
+    public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler messageRecoveryHandler,
                                       TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
+        if(_stateManager.isInState(State.INITIAL))
+        {
+            // Is acting as a message store, but not a durable config store
+            _stateManager.attainState(State.INITIALISING);
+        }
+
         _messageRecoveryHandler = messageRecoveryHandler;
         _tlogRecoveryHandler = tlogRecoveryHandler;
+        _virtualHost = virtualHost;
+
+        completeInitialisation();
+    }
+
+    private void completeInitialisation() throws Exception
+    {
+        configure(_virtualHost);
 
         _stateManager.attainState(State.INITIALISED);
     }
 
     public synchronized void activate() throws Exception
     {
+        // check if acting as a durable config store, but not a message store
+        if(_stateManager.isInState(State.INITIALISING))
+        {
+            completeInitialisation();
+        }
         _stateManager.attainState(State.ACTIVATING);
 
-        recoverConfig(_configRecoveryHandler);
-        recoverMessages(_messageRecoveryHandler);
-        recoverQueueEntries(_tlogRecoveryHandler);
+        if(_configRecoveryHandler != null)
+        {
+            recoverConfig(_configRecoveryHandler);
+        }
+        if(_messageRecoveryHandler != null)
+        {
+            recoverMessages(_messageRecoveryHandler);
+        }
+        if(_tlogRecoveryHandler != null)
+        {
+            recoverQueueEntries(_tlogRecoveryHandler);
+        }
 
         _stateManager.attainState(State.ACTIVE);
     }
@@ -192,23 +217,38 @@ public abstract class AbstractBDBMessage
      * Called after instantiation in order to configure the message store.
      *
      *
-     * @param name The name of the virtual host using this store
-     * @param virtualHost
+     *
+     * @param virtualHost The virtual host using this store
      * @return whether a new store environment was created or not (to indicate whether recovery is necessary)
      *
      * @throws Exception If any error occurs that means the store is unable to configure itself.
      */
-    public void configure(String name, VirtualHost virtualHost) throws Exception
+    public void configure(VirtualHost virtualHost) throws Exception
     {
+        configure(virtualHost, _messageRecoveryHandler != null);
+    }
 
-
+    public void configure(VirtualHost virtualHost, boolean isMessageStore) throws Exception
+    {
+        String name = virtualHost.getName();
         final String defaultPath = System.getProperty("QPID_WORK") + File.separator + "bdbstore" + File.separator + name;
 
-
-        String storeLocation = (String) virtualHost.getAttribute(VirtualHost.STORE_PATH);
-        if(storeLocation == null)
+        String storeLocation;
+        if(isMessageStore)
         {
-            storeLocation = defaultPath;
+            storeLocation = (String) virtualHost.getAttribute(VirtualHost.STORE_PATH);
+            if(storeLocation == null)
+            {
+                storeLocation = defaultPath;
+            }
+        }
+        else // we are acting only as the durable config store
+        {
+            storeLocation = (String) virtualHost.getAttribute(VirtualHost.CONFIG_STORE_PATH);
+            if(storeLocation == null)
+            {
+                storeLocation = defaultPath;
+            }
         }
 
         Object overfullAttr = virtualHost.getAttribute(MessageStoreConstants.OVERFULL_SIZE_ATTRIBUTE);

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStore.java Tue Aug 20 18:39:44 2013
@@ -122,14 +122,14 @@ public class BDBHAMessageStore extends A
     private Map<String, String> _repConfig;
 
     @Override
-    public void configure(String name, VirtualHost virtualHost) throws Exception
+    public void configure(VirtualHost virtualHost) throws Exception
     {
         //Mandatory configuration
         _groupName = getValidatedStringAttribute(virtualHost, "haGroupName");
         _nodeName = getValidatedStringAttribute(virtualHost, "haNodeName");
         _nodeHostPort = getValidatedStringAttribute(virtualHost, "haNodeAddress");
         _helperHostPort = getValidatedStringAttribute(virtualHost, "haHelperAddress");
-        _name = name;
+        _name = virtualHost.getName();
 
         //Optional configuration
         String durabilitySetting = getStringAttribute(virtualHost,"haDurability",null);
@@ -157,7 +157,7 @@ public class BDBHAMessageStore extends A
                     + "! Please set highAvailability.coalescingSync to false in store configuration.");
         }
 
-        super.configure(name, virtualHost);
+        super.configure(virtualHost);
     }
 
 
@@ -260,10 +260,10 @@ public class BDBHAMessageStore extends A
     }
 
     @Override
-    public void configureMessageStore(String name, MessageStoreRecoveryHandler messageRecoveryHandler,
+    public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler messageRecoveryHandler,
                                       TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
-        super.configureMessageStore(name, messageRecoveryHandler, tlogRecoveryHandler);
+        super.configureMessageStore(virtualHost, messageRecoveryHandler, tlogRecoveryHandler);
 
         final ReplicatedEnvironment replicatedEnvironment = getReplicatedEnvironment();
 

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHost.java Tue Aug 20 18:39:44 2013
@@ -77,12 +77,12 @@ public class BDBHAVirtualHost extends Ab
                 new DurableConfigurationRecoverer(getName(), getDurableConfigurationRecoverers(),
                                                   new DefaultUpgraderProvider(this, getExchangeRegistry()));
 
-        _messageStore.configureConfigStore(getName(),
-                configRecoverer,
-                virtualHost);
+        _messageStore.configureConfigStore(
+                virtualHost, configRecoverer
+        );
 
-        _messageStore.configureMessageStore(getName(),
-                recoveryHandler,
+        _messageStore.configureMessageStore(
+                virtualHost, recoveryHandler,
                 recoveryHandler
         );
     }

Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java Tue Aug 20 18:39:44 2013
@@ -26,10 +26,12 @@ import java.util.List;
 import java.util.Map;
 import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
+import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 
-public class BDBMessageStoreFactory implements MessageStoreFactory
+public class BDBMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory
 {
 
     @Override
@@ -39,6 +41,12 @@ public class BDBMessageStoreFactory impl
     }
 
     @Override
+    public DurableConfigurationStore createDurableConfigurationStore()
+    {
+        return new BDBMessageStore();
+    }
+
+    @Override
     public MessageStore createMessageStore()
     {
         return new BDBMessageStore();
@@ -76,12 +84,25 @@ public class BDBMessageStoreFactory impl
     @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
-        Object storePath = attributes.get(VirtualHost.STORE_PATH);
-        if(!(storePath instanceof String))
+        if(getType().equals(attributes.get(VirtualHost.STORE_TYPE)))
+        {
+            Object storePath = attributes.get(VirtualHost.STORE_PATH);
+            if(!(storePath instanceof String))
+            {
+                throw new IllegalArgumentException("Attribute '"+ VirtualHost.STORE_PATH
+                                                               +"' is required and must be of type String.");
+
+            }
+        }
+        if(getType().equals(attributes.get(VirtualHost.CONFIG_STORE_TYPE)))
         {
-            throw new IllegalArgumentException("Attribute '"+ VirtualHost.STORE_PATH
-                                                           +"' is required and must be of type String.");
+            Object storePath = attributes.get(VirtualHost.CONFIG_STORE_PATH);
+            if(!(storePath instanceof String))
+            {
+                throw new IllegalArgumentException("Attribute '"+ VirtualHost.CONFIG_STORE_PATH
+                                                               +"' is required and must be of type String.");
 
+            }
         }
     }
 }

Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Tue Aug 20 18:39:44 2013
@@ -230,7 +230,7 @@ public class BDBMessageStoreTest extends
         messageStore.close();
 
         AbstractBDBMessageStore newStore = new BDBMessageStore();
-        newStore.configure("", getVirtualHostModel());
+        newStore.configure(getVirtualHostModel(),true);
 
         newStore.startWithNoRecover();
 

Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAMessageStoreSmokeTest.java Tue Aug 20 18:39:44 2013
@@ -20,7 +20,6 @@
 package org.apache.qpid.server.store.berkeleydb;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -34,7 +33,7 @@ public class HAMessageStoreSmokeTest ext
     {
         try
         {
-            _store.configure("test", mock(VirtualHost.class));
+            _store.configure(mock(VirtualHost.class));
             fail("Expected an exception to be thrown");
         }
         catch (ConfigurationException ce)

Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java Tue Aug 20 18:39:44 2013
@@ -132,7 +132,7 @@ public class DerbyMessageStore extends A
         _driverClass = (Class<Driver>) Class.forName(SQL_DRIVER_NAME);
 
         String defaultPath = System.getProperty("QPID_WORK") + File.separator + "derbyDB";
-        String databasePath = (String) virtualHost.getAttribute(VirtualHost.STORE_PATH);
+        String databasePath = isConfigStoreOnly() ? (String) virtualHost.getAttribute(VirtualHost.CONFIG_STORE_PATH) : (String) virtualHost.getAttribute(VirtualHost.STORE_PATH);
         if(databasePath == null)
         {
             databasePath = defaultPath;

Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java Tue Aug 20 18:39:44 2013
@@ -24,10 +24,12 @@ import java.util.Collections;
 import java.util.Map;
 import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
+import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 
-public class DerbyMessageStoreFactory implements MessageStoreFactory
+public class DerbyMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory
 {
 
     @Override
@@ -37,6 +39,12 @@ public class DerbyMessageStoreFactory im
     }
 
     @Override
+    public DurableConfigurationStore createDurableConfigurationStore()
+    {
+        return new DerbyMessageStore();
+    }
+
+    @Override
     public MessageStore createMessageStore()
     {
         return new DerbyMessageStore();
@@ -52,12 +60,25 @@ public class DerbyMessageStoreFactory im
     @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
-        Object storePath = attributes.get(VirtualHost.STORE_PATH);
-        if(!(storePath instanceof String))
+        if(getType().equals(attributes.get(VirtualHost.STORE_TYPE)))
+        {
+            Object storePath = attributes.get(VirtualHost.STORE_PATH);
+            if(!(storePath instanceof String))
+            {
+                throw new IllegalArgumentException("Attribute '"+ VirtualHost.STORE_PATH
+                                                               +"' is required and must be of type String.");
+
+            }
+        }
+        if(getType().equals(attributes.get(VirtualHost.CONFIG_STORE_TYPE)))
         {
-            throw new IllegalArgumentException("Attribute '"+ VirtualHost.STORE_PATH
-                                                           +"' is required and must be of type String.");
+            Object storePath = attributes.get(VirtualHost.CONFIG_STORE_PATH);
+            if(!(storePath instanceof String))
+            {
+                throw new IllegalArgumentException("Attribute '"+ VirtualHost.CONFIG_STORE_PATH
+                                                               +"' is required and must be of type String.");
 
+            }
         }
     }
 

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java Tue Aug 20 18:39:44 2013
@@ -51,6 +51,7 @@ public class JDBCMessageStore extends Ab
 
     public static final String TYPE = "JDBC";
     public static final String CONNECTION_URL = "connectionURL";
+    public static final String CONFIG_CONNECTION_URL = "configConnectionURL";
 
     protected String _connectionURL;
     private ConnectionProvider _connectionProvider;
@@ -280,11 +281,20 @@ public class JDBCMessageStore extends Ab
         throws ClassNotFoundException, SQLException
     {
 
+        String connectionURL;
+        if(!isConfigStoreOnly())
+        {
+            connectionURL = virtualHost.getAttribute(CONNECTION_URL) == null
+                                   ? String.valueOf(virtualHost.getAttribute(VirtualHost.STORE_PATH))
+                                   : String.valueOf(virtualHost.getAttribute(CONNECTION_URL));
+        }
+        else
+        {
+            connectionURL = virtualHost.getAttribute(CONFIG_CONNECTION_URL) == null
+                                               ? String.valueOf(virtualHost.getAttribute(VirtualHost.CONFIG_STORE_PATH))
+                                               : String.valueOf(virtualHost.getAttribute(CONFIG_CONNECTION_URL));
 
-        String connectionURL = virtualHost.getAttribute(CONNECTION_URL) == null
-                               ? String.valueOf(virtualHost.getAttribute(VirtualHost.STORE_PATH))
-                               : String.valueOf(virtualHost.getAttribute(CONNECTION_URL));
-
+        }
         JDBCDetails details = null;
 
         String[] components = connectionURL.split(":",3);

Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java Tue Aug 20 18:39:44 2013
@@ -24,10 +24,12 @@ import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.configuration.Configuration;
 import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.plugin.MessageStoreFactory;
+import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 
-public class JDBCMessageStoreFactory implements MessageStoreFactory
+public class JDBCMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory
 {
 
     @Override
@@ -43,6 +45,12 @@ public class JDBCMessageStoreFactory imp
     }
 
     @Override
+    public DurableConfigurationStore createDurableConfigurationStore()
+    {
+        return new JDBCMessageStore();
+    }
+
+    @Override
     public Map<String, Object> convertStoreConfiguration(Configuration storeConfiguration)
     {
         Map<String,Object> convertedMap = new HashMap<String,Object>();
@@ -67,15 +75,32 @@ public class JDBCMessageStoreFactory imp
     @Override
     public void validateAttributes(Map<String, Object> attributes)
     {
-        Object connectionURL = attributes.get(JDBCMessageStore.CONNECTION_URL);
-        if(!(connectionURL instanceof String))
+        if(getType().equals(attributes.get(VirtualHost.STORE_TYPE)))
+        {
+            Object connectionURL = attributes.get(JDBCMessageStore.CONNECTION_URL);
+            if(!(connectionURL instanceof String))
+            {
+                Object storePath = attributes.get(VirtualHost.STORE_PATH);
+                if(!(storePath instanceof String))
+                {
+                    throw new IllegalArgumentException("Attribute '"+ JDBCMessageStore.CONNECTION_URL
+                                                                   +"' is required and must be of type String.");
+
+                }
+            }
+        }
+        if(getType().equals(attributes.get(VirtualHost.CONFIG_STORE_TYPE)))
         {
-            Object storePath = attributes.get(VirtualHost.STORE_PATH);
-            if(!(storePath instanceof String))
+            Object connectionURL = attributes.get(JDBCMessageStore.CONFIG_CONNECTION_URL);
+            if(!(connectionURL instanceof String))
             {
-                throw new IllegalArgumentException("Attribute '"+ JDBCMessageStore.CONNECTION_URL
-                                                               +"' is required and must be of type String.");
+                Object storePath = attributes.get(VirtualHost.CONFIG_STORE_PATH);
+                if(!(storePath instanceof String))
+                {
+                    throw new IllegalArgumentException("Attribute '"+ JDBCMessageStore.CONFIG_CONNECTION_URL
+                                                                   +"' is required and must be of type String.");
 
+                }
             }
         }
     }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java Tue Aug 20 18:39:44 2013
@@ -77,12 +77,12 @@ public class Model
 
         addRelationship(Connection.class, Session.class);
 
-        addRelationship(Exchange.class, Binding.class);
-        addRelationship(Exchange.class, Publisher.class);
-
         addRelationship(Queue.class, Binding.class);
         addRelationship(Queue.class, Consumer.class);
 
+        addRelationship(Exchange.class, Binding.class);
+        addRelationship(Exchange.class, Publisher.class);
+
         addRelationship(Session.class, Consumer.class);
         addRelationship(Session.class, Publisher.class);
     }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java Tue Aug 20 18:39:44 2013
@@ -74,6 +74,8 @@ public interface VirtualHost extends Con
     String STORE_TRANSACTION_OPEN_TIMEOUT_WARN  = "storeTransactionOpenTimeoutWarn";
     String STORE_TYPE                           = "storeType";
     String STORE_PATH                           = "storePath";
+    String CONFIG_STORE_TYPE                    = "configStoreType";
+    String CONFIG_STORE_PATH                    = "configStorePath";
     String SUPPORTED_EXCHANGE_TYPES             = "supportedExchangeTypes";
     String SUPPORTED_QUEUE_TYPES                = "supportedQueueTypes";
     String CREATED                              = "created";
@@ -107,6 +109,8 @@ public interface VirtualHost extends Con
                             QUEUE_MAXIMUM_DELIVERY_ATTEMPTS,
                             QUEUE_FLOW_CONTROL_SIZE_BYTES,
                             QUEUE_FLOW_RESUME_SIZE_BYTES,
+                            CONFIG_STORE_TYPE,
+                            CONFIG_STORE_PATH,
                             STORE_TYPE,
                             STORE_PATH,
                             STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java (from r1515742, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java&r1=1515742&r2=1515914&rev=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/MessageStoreFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/DurableConfigurationStoreFactory.java Tue Aug 20 18:39:44 2013
@@ -22,15 +22,14 @@ package org.apache.qpid.server.plugin;
 
 import java.util.Map;
 import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 
-public interface MessageStoreFactory extends Pluggable
+public interface DurableConfigurationStoreFactory extends Pluggable
 {
     String getType();
 
-    MessageStore createMessageStore();
-
-    public Map<String, Object> convertStoreConfiguration(Configuration configuration);
+    DurableConfigurationStore createDurableConfigurationStore();
 
     void validateAttributes(Map<String, Object> attributes);
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java Tue Aug 20 18:39:44 2013
@@ -42,9 +42,7 @@ public class QueueArgumentsConverter
     public static final String X_QPID_PRIORITIES = "x-qpid-priorities";
 
     public static final String X_QPID_DESCRIPTION = "x-qpid-description";
-    /*  public static final String QPID_LVQ_KEY = "qpid.LVQ_key";
-    public static final String QPID_LAST_VALUE_QUEUE = "qpid.last_value_queue";
-  */
+
     public static final String QPID_LAST_VALUE_QUEUE_KEY = "qpid.last_value_queue_key";
 
     public static final String QPID_QUEUE_SORT_KEY = "qpid.queue_sort_key";

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Tue Aug 20 18:39:44 2013
@@ -169,6 +169,7 @@ abstract public class AbstractJDBCMessag
     private MessageStoreRecoveryHandler _messageRecoveryHandler;
     private TransactionLogRecoveryHandler _tlogRecoveryHandler;
     private ConfigurationRecoveryHandler _configRecoveryHandler;
+    private VirtualHost _virtualHost;
 
     public AbstractJDBCMessageStore()
     {
@@ -176,46 +177,69 @@ abstract public class AbstractJDBCMessag
     }
 
     @Override
-    public void configureConfigStore(String name,
-                                     ConfigurationRecoveryHandler configRecoveryHandler,
-                                     VirtualHost virtualHost) throws Exception
+    public void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler configRecoveryHandler) throws Exception
     {
         _stateManager.attainState(State.INITIALISING);
         _configRecoveryHandler = configRecoveryHandler;
-
-        commonConfiguration(name, virtualHost);
+        _virtualHost = virtualHost;
 
     }
 
     @Override
-    public void configureMessageStore(String name,
-                                      MessageStoreRecoveryHandler recoveryHandler,
+    public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler recoveryHandler,
                                       TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
+        if(_stateManager.isInState(State.INITIAL))
+        {
+            _stateManager.attainState(State.INITIALISING);
+        }
+
+        _virtualHost = virtualHost;
         _tlogRecoveryHandler = tlogRecoveryHandler;
         _messageRecoveryHandler = recoveryHandler;
 
+        completeInitialisation();
+    }
+
+    private void completeInitialisation() throws ClassNotFoundException, SQLException, AMQStoreException
+    {
+        commonConfiguration();
+
         _stateManager.attainState(State.INITIALISED);
     }
 
     @Override
     public void activate() throws Exception
     {
+        if(_stateManager.isInState(State.INITIALISING))
+        {
+            completeInitialisation();
+        }
         _stateManager.attainState(State.ACTIVATING);
 
         // this recovers durable exchanges, queues, and bindings
-        recoverConfiguration(_configRecoveryHandler);
-        recoverMessages(_messageRecoveryHandler);
-        TransactionLogRecoveryHandler.DtxRecordRecoveryHandler dtxrh = recoverQueueEntries(_tlogRecoveryHandler);
-        recoverXids(dtxrh);
+        if(_configRecoveryHandler != null)
+        {
+            recoverConfiguration(_configRecoveryHandler);
+        }
+        if(_messageRecoveryHandler != null)
+        {
+            recoverMessages(_messageRecoveryHandler);
+        }
+        if(_tlogRecoveryHandler != null)
+        {
+            TransactionLogRecoveryHandler.DtxRecordRecoveryHandler dtxrh = recoverQueueEntries(_tlogRecoveryHandler);
+            recoverXids(dtxrh);
+
+        }
 
         _stateManager.attainState(State.ACTIVE);
     }
 
-    private void commonConfiguration(String name, VirtualHost virtualHost)
+    private void commonConfiguration()
             throws ClassNotFoundException, SQLException, AMQStoreException
     {
-        implementationSpecificConfiguration(name, virtualHost);
+        implementationSpecificConfiguration(_virtualHost.getName(), _virtualHost);
         createOrOpenDatabase();
         upgradeIfNecessary();
     }
@@ -1071,6 +1095,11 @@ abstract public class AbstractJDBCMessag
 
     }
 
+    protected boolean isConfigStoreOnly()
+    {
+        return _messageRecoveryHandler == null;
+    }
+
     private static final class ConnectionWrapper
     {
         private final Connection _connection;

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java Tue Aug 20 18:39:44 2013
@@ -80,24 +80,30 @@ abstract public class AbstractMemoryMess
     }
 
     @Override
-    public void configureConfigStore(String name,
-                                     ConfigurationRecoveryHandler recoveryHandler,
-                                     VirtualHost virtualHost) throws Exception
+    public void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler recoveryHandler) throws Exception
     {
         _stateManager.attainState(State.INITIALISING);
     }
 
     @Override
-    public void configureMessageStore(String name,
-                                      MessageStoreRecoveryHandler recoveryHandler,
+    public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler recoveryHandler,
                                       TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
+        if(_stateManager.isInState(State.INITIAL))
+        {
+            _stateManager.attainState(State.INITIALISING);
+        }
         _stateManager.attainState(State.INITIALISED);
     }
 
     @Override
     public void activate() throws Exception
     {
+
+        if(_stateManager.isInState(State.INITIALISING))
+        {
+            _stateManager.attainState(State.INITIALISED);
+        }
         _stateManager.attainState(State.ACTIVATING);
 
         _stateManager.attainState(State.ACTIVE);

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java Tue Aug 20 18:39:44 2013
@@ -45,14 +45,13 @@ public interface DurableConfigurationSto
      *
      *
      *
-     * @param name             The name to be used by this store
-     * @param recoveryHandler  Handler to be called as the store recovers on start up
+     *
+     *
      * @param virtualHost
+     * @param recoveryHandler  Handler to be called as the store recovers on start up
      * @throws Exception If any error occurs that means the store is unable to configure itself.
      */
-    void configureConfigStore(String name,
-                              ConfigurationRecoveryHandler recoveryHandler,
-                              VirtualHost virtualHost) throws Exception;
+    void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler recoveryHandler) throws Exception;
 
 
     /**
@@ -96,4 +95,5 @@ public interface DurableConfigurationSto
     public void update(boolean createIfNecessary, ConfiguredObjectRecord... records) throws AMQStoreException;
 
 
+    void close() throws Exception;
 }

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java (from r1515742, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java&r1=1515742&r2=1515914&rev=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreCreator.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java Tue Aug 20 18:39:44 2013
@@ -24,28 +24,27 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.plugin.MessageStoreFactory;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.plugin.QpidServiceLoader;
 
-public class MessageStoreCreator
+public class DurableConfigurationStoreCreator
 {
-    private Map<String, MessageStoreFactory> _factories = new HashMap<String, MessageStoreFactory>();
+    private Map<String, DurableConfigurationStoreFactory> _factories = new HashMap<String, DurableConfigurationStoreFactory>();
 
-    public MessageStoreCreator()
+    public DurableConfigurationStoreCreator()
     {
-        QpidServiceLoader<MessageStoreFactory> qpidServiceLoader = new QpidServiceLoader<MessageStoreFactory>();
-        Iterable<MessageStoreFactory> factories = qpidServiceLoader.atLeastOneInstanceOf(MessageStoreFactory.class);
-        for (MessageStoreFactory messageStoreFactory : factories)
+        QpidServiceLoader<DurableConfigurationStoreFactory> qpidServiceLoader = new QpidServiceLoader<DurableConfigurationStoreFactory>();
+        Iterable<DurableConfigurationStoreFactory> factories = qpidServiceLoader.atLeastOneInstanceOf(DurableConfigurationStoreFactory.class);
+        for (DurableConfigurationStoreFactory durableConfigurationStoreFactory : factories)
         {
-            String type = messageStoreFactory.getType();
-            MessageStoreFactory factory = _factories.put(type.toLowerCase(), messageStoreFactory);
+            String type = durableConfigurationStoreFactory.getType();
+            DurableConfigurationStoreFactory factory = _factories.put(type.toLowerCase(), durableConfigurationStoreFactory);
             if (factory != null)
             {
-                throw new IllegalStateException("MessageStoreFactory with type name '" + type
+                throw new IllegalStateException("DurableConfigurationStoreFactory with type name '" + type
                         + "' is already registered using class '" + factory.getClass().getName() + "', can not register class '"
-                        + messageStoreFactory.getClass().getName() + "'");
+                        + durableConfigurationStoreFactory.getClass().getName() + "'");
             }
         }
     }
@@ -56,18 +55,18 @@ public class MessageStoreCreator
     }
 
 
-    public MessageStore createMessageStore(String storeType)
+    public DurableConfigurationStore createMessageStore(String storeType)
     {
-        MessageStoreFactory factory = _factories.get(storeType.toLowerCase());
+        DurableConfigurationStoreFactory factory = _factories.get(storeType.toLowerCase());
         if (factory == null)
         {
             throw new IllegalConfigurationException("Unknown store type: " + storeType
                                                     + ". Supported types: " + _factories.keySet());
         }
-        return factory.createMessageStore();
+        return factory.createDurableConfigurationStore();
     }
 
-    public Collection<MessageStoreFactory> getFactories()
+    public Collection<DurableConfigurationStoreFactory> getFactories()
     {
         return Collections.unmodifiableCollection(_factories.values());
     }

Added: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1515914&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java (added)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java Tue Aug 20 18:39:44 2013
@@ -0,0 +1,513 @@
+/*
+ *
+ * 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.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
+import java.util.ArrayList;
+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 org.apache.qpid.AMQStoreException;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.model.VirtualHost;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
+public class JsonFileConfigStore implements DurableConfigurationStore
+{
+    private static final Model MODEL = Model.getInstance();
+
+    private static final Map<String,Class<? extends ConfiguredObject>> CLASS_NAME_MAPPING = generateClassNameMap(VirtualHost.class);
+    public static final String TYPE = "JSON";
+
+    private final Map<UUID, ConfiguredObjectRecord> _objectsById = new HashMap<UUID, ConfiguredObjectRecord>();
+    private final Map<String, List<UUID>> _idsByType = new HashMap<String, List<UUID>>();
+    private final ObjectMapper _objectMapper = new ObjectMapper();
+
+    private String _directoryName;
+    private String _name;
+    private FileLock _fileLock;
+    private String _configFileName;
+    private String _backupFileName;
+    private int _configVersion;
+
+    public JsonFileConfigStore()
+    {
+        _objectMapper.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+    }
+
+    @Override
+    public void configureConfigStore(final VirtualHost virtualHost, final ConfigurationRecoveryHandler recoveryHandler)
+            throws Exception
+    {
+        _name = virtualHost.getName();
+
+        Object storePathAttr = virtualHost.getAttribute(VirtualHost.CONFIG_STORE_PATH);
+        if(!(storePathAttr instanceof String))
+        {
+            throw new AMQStoreException("Cannot determine path for configuration storage");
+        }
+        _directoryName = (String) storePathAttr;
+        _configFileName = _name + ".json";
+        _backupFileName = _name + ".bak";
+        checkDirectoryIsWritable(_directoryName);
+        getFileLock();
+
+        if(!fileExists(_configFileName))
+        {
+            if(!fileExists(_backupFileName))
+            {
+                File newFile = new File(_directoryName, _configFileName);
+                _objectMapper.writeValue(newFile, Collections.emptyMap());
+            }
+            else
+            {
+                renameFile(_backupFileName, _configFileName);
+            }
+        }
+
+
+        load();
+        recoveryHandler.beginConfigurationRecovery(this,_configVersion);
+        List<ConfiguredObjectRecord> records = new ArrayList<ConfiguredObjectRecord>(_objectsById.values());
+        for(ConfiguredObjectRecord record : records)
+        {
+            recoveryHandler.configuredObject(record.getId(), record.getType(), record.getAttributes());
+        }
+        int oldConfigVersion = _configVersion;
+        _configVersion = recoveryHandler.completeConfigurationRecovery();
+        if(oldConfigVersion != _configVersion)
+        {
+            save();
+        }
+    }
+
+    private void renameFile(String fromFileName, String toFileName) throws AMQStoreException
+    {
+        File toFile = new File(_directoryName, toFileName);
+        if(toFile.exists())
+        {
+            if(!toFile.delete())
+            {
+                throw new AMQStoreException("Cannot delete file " + toFile.getAbsolutePath());
+            }
+        }
+        File fromFile = new File(_directoryName, fromFileName);
+
+        if(!fromFile.renameTo(toFile))
+        {
+            throw new AMQStoreException("Cannot rename file " + fromFile.getAbsolutePath() + " to " + toFile.getAbsolutePath());
+        }
+    }
+
+    private boolean fileExists(String fileName)
+    {
+        File file = new File(_directoryName, fileName);
+        return file.exists();
+    }
+
+    private void getFileLock() throws IOException, AMQStoreException
+    {
+        File lockFile = new File(_directoryName, _name + ".lck");
+        lockFile.createNewFile();
+
+        FileOutputStream out = new FileOutputStream(lockFile);
+        FileChannel channel = out.getChannel();
+        try
+        {
+            _fileLock = channel.tryLock();
+        }
+        catch(OverlappingFileLockException e)
+        {
+            _fileLock = null;
+        }
+        if(_fileLock == null)
+        {
+            throw new AMQStoreException("Cannot get lock on file " + lockFile.getAbsolutePath() + " is another instance running?");
+        }
+        lockFile.deleteOnExit();
+    }
+
+    private void checkDirectoryIsWritable(String directoryName) throws AMQStoreException
+    {
+        File dir = new File(directoryName);
+        if(dir.exists())
+        {
+            if(dir.isDirectory())
+            {
+                if(!dir.canWrite())
+                {
+                    throw new AMQStoreException("Configuration path " + directoryName + " exists, but is not writable");
+                }
+
+            }
+            else
+            {
+                throw new AMQStoreException("Configuration path " + directoryName + " exists, but is not a directory");
+            }
+        }
+        else if(!dir.mkdirs())
+        {
+            throw new AMQStoreException("Cannot create directory " + directoryName);
+        }
+    }
+
+    private void load() throws IOException
+    {
+        Map data = _objectMapper.readValue(new File(_directoryName,_configFileName),Map.class);
+        Collection<Class<? extends ConfiguredObject>> childClasses =
+                MODEL.getChildTypes(VirtualHost.class);
+        String modelVersion = (String) data.remove("modelVersion");
+        Object configVersion;
+        if((configVersion = data.remove("configVersion")) instanceof Integer)
+        {
+            _configVersion = (Integer) configVersion;
+        }
+        for(Class<? extends ConfiguredObject> childClass : childClasses)
+        {
+            final String type = childClass.getSimpleName();
+            String attrName = type.toLowerCase() + "s";
+            Object children = data.remove(attrName);
+            if(children != null)
+            {
+                if(children instanceof Collection)
+                {
+                    for(Object child : (Collection)children)
+                    {
+                        if(child instanceof Map)
+                        {
+                            loadChild(childClass, (Map)child, VirtualHost.class, null);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void loadChild(final Class<? extends ConfiguredObject> clazz,
+                           final Map<String,Object> data,
+                           final Class<? extends ConfiguredObject> parentClass,
+                           final UUID parentId)
+    {
+        Collection<Class<? extends ConfiguredObject>> childClasses =
+                MODEL.getChildTypes(clazz);
+        String idStr = (String) data.remove("id");
+        final UUID id = UUID.fromString(idStr);
+        final String type = clazz.getSimpleName();
+
+        for(Class<? extends ConfiguredObject> childClass : childClasses)
+        {
+            final String childType = childClass.getSimpleName();
+            String attrName = childType.toLowerCase() + "s";
+            Object children = data.remove(attrName);
+            if(children != null)
+            {
+                if(children instanceof Collection)
+                {
+                    for(Object child : (Collection)children)
+                    {
+                        if(child instanceof Map)
+                        {
+                            loadChild(childClass, (Map)child, clazz, id);
+                        }
+                    }
+                }
+            }
+
+        }
+        if(parentId != null)
+        {
+            data.put(parentClass.getSimpleName().toLowerCase(),parentId);
+            for(Class<? extends ConfiguredObject> otherParent : MODEL.getParentTypes(clazz))
+            {
+                if(otherParent != parentClass)
+                {
+                    final String otherParentAttr = otherParent.getSimpleName().toLowerCase();
+                    Object otherParentId = data.get(otherParentAttr);
+                    if(otherParentId instanceof String)
+                    {
+                        try
+                        {
+                            data.put(otherParentAttr, UUID.fromString((String) otherParentId));
+                        }
+                        catch(IllegalArgumentException e)
+                        {
+                            //
+                        }
+                    }
+                }
+
+            }
+        }
+
+        _objectsById.put(id, new ConfiguredObjectRecord(id, type, data));
+        List<UUID> idsForType = _idsByType.get(type);
+        if(idsForType == null)
+        {
+            idsForType = new ArrayList<UUID>();
+            _idsByType.put(type, idsForType);
+        }
+        idsForType.add(id);
+
+    }
+
+    @Override
+    public synchronized void create(final UUID id, final String type, final Map<String, Object> attributes) throws AMQStoreException
+    {
+        if(_objectsById.containsKey(id))
+        {
+            throw new AMQStoreException("Object with id " + id + " already exists");
+        }
+        else if(!CLASS_NAME_MAPPING.containsKey(type))
+        {
+            throw new AMQStoreException("Cannot create object of unknown type " + type);
+        }
+        else
+        {
+            ConfiguredObjectRecord record = new ConfiguredObjectRecord(id, type, attributes);
+            _objectsById.put(id, record);
+            List<UUID> idsForType = _idsByType.get(type);
+            if(idsForType == null)
+            {
+                idsForType = new ArrayList<UUID>();
+                _idsByType.put(type, idsForType);
+            }
+            idsForType.add(id);
+            save();
+        }
+    }
+
+    private void save() throws AMQStoreException
+    {
+        Collection<Class<? extends ConfiguredObject>> childClasses =
+                MODEL.getChildTypes(VirtualHost.class);
+
+        Map<String, Object> virtualHostMap = new LinkedHashMap<String, Object>();
+        virtualHostMap.put("modelVersion", Model.MODEL_VERSION);
+        virtualHostMap.put("configVersion", _configVersion);
+
+        for(Class<? extends ConfiguredObject> childClass : childClasses)
+        {
+            final String type = childClass.getSimpleName();
+            String attrName = type.toLowerCase() + "s";
+            List<UUID> childIds = _idsByType.get(type);
+            if(childIds != null && !childIds.isEmpty())
+            {
+                List<Map<String,Object>> entities = new ArrayList<Map<String, Object>>();
+                for(UUID id : childIds)
+                {
+                    entities.add(build(childClass,id));
+                }
+                virtualHostMap.put(attrName, entities);
+            }
+        }
+
+        try
+        {
+
+            File tmpFile = File.createTempFile("cfg","tmp", new File(_directoryName));
+            tmpFile.deleteOnExit();
+            _objectMapper.writeValue(tmpFile,virtualHostMap);
+            renameFile(_configFileName,_backupFileName);
+            renameFile(tmpFile.getName(),_configFileName);
+            tmpFile.delete();
+            File backupFile = new File(_directoryName, _backupFileName);
+            backupFile.delete();
+
+        }
+        catch (IOException e)
+        {
+            throw new AMQStoreException("Cannot save to store", e);
+        }
+    }
+
+    private Map<String, Object> build(final Class<? extends ConfiguredObject> type, final UUID id)
+    {
+        ConfiguredObjectRecord record = _objectsById.get(id);
+        Map<String,Object> map = new LinkedHashMap<String, Object>();
+        map.put("id", id);
+        map.putAll(record.getAttributes());
+        map.remove(MODEL.getParentTypes(type).iterator().next().getSimpleName().toLowerCase());
+
+        Collection<Class<? extends ConfiguredObject>> childClasses =
+                new ArrayList<Class<? extends ConfiguredObject>>(MODEL.getChildTypes(type));
+
+        for(Class<? extends ConfiguredObject> childClass : childClasses)
+        {
+            // only add if this is the "first" parent
+            if(MODEL.getParentTypes(childClass).iterator().next() == type)
+            {
+                String attrName = childClass.getSimpleName().toLowerCase() + "s";
+                List<UUID> childIds = _idsByType.get(childClass.getSimpleName());
+                if(childIds != null)
+                {
+                    List<Map<String,Object>> entities = new ArrayList<Map<String, Object>>();
+                    for(UUID childId : childIds)
+                    {
+                        ConfiguredObjectRecord childRecord = _objectsById.get(childId);
+                        final String parentArg = type.getSimpleName().toLowerCase();
+                        if(id.toString().equals(String.valueOf(childRecord.getAttributes().get(parentArg))))
+                        {
+                            entities.add(build(childClass,childId));
+                        }
+                    }
+                    if(!entities.isEmpty())
+                    {
+                        map.put(attrName,entities);
+                    }
+                }
+            }
+        }
+
+        return map;
+    }
+
+    @Override
+    public void remove(final UUID id, final String type) throws AMQStoreException
+    {
+        removeConfiguredObjects(id);
+    }
+
+    @Override
+    public synchronized UUID[] removeConfiguredObjects(final UUID... objects) throws AMQStoreException
+    {
+        List<UUID> removedIds = new ArrayList<UUID>();
+        for(UUID id : objects)
+        {
+            ConfiguredObjectRecord record = _objectsById.remove(id);
+            if(record != null)
+            {
+                removedIds.add(id);
+                _idsByType.get(record.getType()).remove(id);
+            }
+        }
+        save();
+        return removedIds.toArray(new UUID[removedIds.size()]);
+    }
+
+    @Override
+    public void update(final UUID id, final String type, final Map<String, Object> attributes) throws AMQStoreException
+    {
+        update(false, new ConfiguredObjectRecord(id, type, attributes));
+    }
+
+    @Override
+    public void update(final ConfiguredObjectRecord... records) throws AMQStoreException
+    {
+        update(false, records);
+    }
+
+    @Override
+    public void update(final boolean createIfNecessary, final ConfiguredObjectRecord... records)
+            throws AMQStoreException
+    {
+        for(ConfiguredObjectRecord record : records)
+        {
+            final UUID id = record.getId();
+            final String type = record.getType();
+
+            if(_objectsById.containsKey(id))
+            {
+                final ConfiguredObjectRecord existingRecord = _objectsById.get(id);
+                if(!type.equals(existingRecord.getType()))
+                {
+                    throw new AMQStoreException("Cannot change the type of record " + id + " from type "
+                                                + existingRecord.getType() + " to type " + type);
+                }
+            }
+            else if(!createIfNecessary)
+            {
+                throw new AMQStoreException("Cannot update record with id " + id
+                                        + " of type " + type + " as it does not exist");
+            }
+            else if(!CLASS_NAME_MAPPING.containsKey(type))
+            {
+                throw new AMQStoreException("Cannot update record of unknown type " + type);
+            }
+        }
+        for(ConfiguredObjectRecord record : records)
+        {
+            final UUID id = record.getId();
+            final String type = record.getType();
+            if(_objectsById.put(id, record) == null)
+            {
+                List<UUID> idsForType = _idsByType.get(type);
+                if(idsForType == null)
+                {
+                    idsForType = new ArrayList<UUID>();
+                    _idsByType.put(type, idsForType);
+                }
+                idsForType.add(id);
+            }
+        }
+
+        save();
+    }
+
+    public void close() throws Exception
+    {
+        try
+        {
+            releaseFileLock();
+        }
+        finally
+        {
+            _fileLock = null;
+            _idsByType.clear();
+            _objectsById.clear();
+        }
+
+    }
+
+    private void releaseFileLock() throws IOException
+    {
+        _fileLock.release();
+        _fileLock.channel().close();
+    }
+
+
+    private static Map<String,Class<? extends ConfiguredObject>> generateClassNameMap(final Class<? extends ConfiguredObject> clazz)
+    {
+        Map<String,Class<? extends ConfiguredObject>>map = new HashMap<String, Class<? extends ConfiguredObject>>();
+        map.put(clazz.getSimpleName().toString(), clazz);
+        Collection<Class<? extends ConfiguredObject>> childClasses = MODEL.getChildTypes(clazz);
+        if(childClasses != null)
+        {
+            for(Class<? extends ConfiguredObject> childClass : childClasses)
+            {
+                map.putAll(generateClassNameMap(childClass));
+            }
+        }
+        return map;
+    }
+
+
+}

Added: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java?rev=1515914&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java (added)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/JsonFileConfigStoreFactory.java Tue Aug 20 18:39:44 2013
@@ -0,0 +1,52 @@
+/*
+ *
+ * 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.model.VirtualHost;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
+
+public class JsonFileConfigStoreFactory implements DurableConfigurationStoreFactory
+{
+    @Override
+    public String getType()
+    {
+        return JsonFileConfigStore.TYPE;
+    }
+
+    @Override
+    public DurableConfigurationStore createDurableConfigurationStore()
+    {
+        return new JsonFileConfigStore();
+    }
+
+    @Override
+    public void validateAttributes(Map<String, Object> attributes)
+    {
+        Object storePath = attributes.get(VirtualHost.CONFIG_STORE_PATH);
+        if(!(storePath instanceof String))
+        {
+            throw new IllegalArgumentException("Attribute '"+ VirtualHost.CONFIG_STORE_PATH
+                                                           +"' is required and must be of type String.");
+
+        }
+    }
+}

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java Tue Aug 20 18:39:44 2013
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server.store;
 
+import org.apache.qpid.server.model.VirtualHost;
+
 /**
  * MessageStore defines the interface to a storage area, which can be used to preserve the state of messages.
  *
@@ -31,13 +33,14 @@ public interface MessageStore
      * whatever parameters it wants.
      *
      *
-     * @param name             The name to be used by this store
+     *
+     *
+     * @param virtualHost
      * @param messageRecoveryHandler  Handler to be called as the store recovers on start up
      * @param tlogRecoveryHandler
      * @throws Exception If any error occurs that means the store is unable to configure itself.
      */
-    void configureMessageStore(String name,
-                               MessageStoreRecoveryHandler messageRecoveryHandler,
+    void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler messageRecoveryHandler,
                                TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception;
 
     void activate() throws Exception;

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/NullMessageStore.java Tue Aug 20 18:39:44 2013
@@ -27,9 +27,7 @@ import org.apache.qpid.server.model.Virt
 public abstract class NullMessageStore implements MessageStore, DurableConfigurationStore
 {
     @Override
-    public void configureConfigStore(String name,
-                                     ConfigurationRecoveryHandler recoveryHandler,
-                                     VirtualHost virtualHost) throws Exception
+    public void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler recoveryHandler) throws Exception
     {
     }
 
@@ -66,8 +64,7 @@ public abstract class NullMessageStore i
     }
 
     @Override
-    public void configureMessageStore(String name,
-                                      MessageStoreRecoveryHandler recoveryHandler,
+    public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler recoveryHandler,
                                       TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception
     {
     }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Tue Aug 20 18:39:44 2013
@@ -660,6 +660,18 @@ public abstract class AbstractVirtualHos
                 _logger.error("Failed to close message store", e);
             }
         }
+        if (getDurableConfigurationStore() != null)
+        {
+            //Remove MessageStore Interface should not throw Exception
+            try
+            {
+                getDurableConfigurationStore().close();
+            }
+            catch (Exception e)
+            {
+                _logger.error("Failed to close message store", e);
+            }
+        }
     }
 
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/StandardVirtualHost.java Tue Aug 20 18:39:44 2013
@@ -25,6 +25,7 @@ import org.apache.qpid.server.model.Virt
 import org.apache.qpid.server.stats.StatisticsGatherer;
 import org.apache.qpid.server.store.DurableConfigurationRecoverer;
 import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.DurableConfigurationStoreCreator;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreCreator;
 import org.apache.qpid.server.store.OperationalLoggingListener;
@@ -78,7 +79,14 @@ public class StandardVirtualHost extends
     private DurableConfigurationStore initialiseConfigurationStore(VirtualHost virtualHost) throws Exception
     {
         DurableConfigurationStore configurationStore;
-        if(getMessageStore() instanceof DurableConfigurationStore)
+        final Object storeTypeAttr = virtualHost.getAttribute(VirtualHost.CONFIG_STORE_TYPE);
+        String storeType = storeTypeAttr == null ? null : String.valueOf(storeTypeAttr);
+
+        if(storeType != null)
+        {
+            configurationStore = new DurableConfigurationStoreCreator().createMessageStore(storeType);
+        }
+        else if(getMessageStore() instanceof DurableConfigurationStore)
         {
             configurationStore = (DurableConfigurationStore) getMessageStore();
         }
@@ -100,10 +108,10 @@ public class StandardVirtualHost extends
         DurableConfigurationRecoverer configRecoverer =
                 new DurableConfigurationRecoverer(getName(), getDurableConfigurationRecoverers(),
                                                   new DefaultUpgraderProvider(this, getExchangeRegistry()));
-        _durableConfigurationStore.configureConfigStore(getName(), configRecoverer, virtualHost);
+        _durableConfigurationStore.configureConfigStore(virtualHost, configRecoverer);
 
         VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this, getExchangeRegistry(), getExchangeFactory());
-        _messageStore.configureMessageStore(getName(), recoveryHandler, recoveryHandler);
+        _messageStore.configureMessageStore(virtualHost, recoveryHandler, recoveryHandler);
 
         initialiseModel(hostConfig);
 
@@ -112,25 +120,6 @@ public class StandardVirtualHost extends
         attainActivation();
     }
 
-
-    protected void closeStorage()
-    {
-        //Close MessageStore
-        if (_messageStore != null)
-        {
-            //Remove MessageStore Interface should not throw Exception
-            try
-            {
-                getMessageStore().close();
-            }
-            catch (Exception e)
-            {
-                getLogger().error("Failed to close message store", e);
-            }
-        }
-    }
-
-
     @Override
     public MessageStore getMessageStore()
     {

Added: qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory?rev=1515914&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory (added)
+++ qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.DurableConfigurationStoreFactory Tue Aug 20 18:39:44 2013
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.qpid.server.store.JsonFileConfigStoreFactory

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1515914&r1=1515913&r2=1515914&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Tue Aug 20 18:39:44 2013
@@ -406,8 +406,8 @@ public abstract class AbstractDurableCon
         _messageStore = createMessageStore();
         _configStore = createConfigStore();
 
-        _configStore.configureConfigStore(_storeName, _recoveryHandler, _virtualHost);
-        _messageStore.configureMessageStore(_storeName, _messageStoreRecoveryHandler, _logRecoveryHandler);
+        _configStore.configureConfigStore(_virtualHost, _recoveryHandler);
+        _messageStore.configureMessageStore(_virtualHost, _messageStoreRecoveryHandler, _logRecoveryHandler);
         _messageStore.activate();
     }
 



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