NO-JIRA: Make the MessageStore and DurableConfigurationStore stateless. This changes

removes the StateManager and delegates the operational logging (open/close)
messages to the vhost.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1582835 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 16 deletions

diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
index 2c2938cb01..9202672ea6 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
@@ -38,7 +38,6 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.server.store.AbstractJDBCMessageStore;
 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.StoreException;
 import org.apache.qpid.util.FileUtils;
@@ -168,16 +167,7 @@ public class DerbyMessageStore extends AbstractJDBCMessageStore implements Messa
         //FIXME this the _vhost name should not be added here, but derby wont use an empty directory as was possibly just created.
         _connectionURL = "jdbc:derby" + (databasePath.equals(MEMORY_STORE_LOCATION) ? databasePath: ":" + databasePath+ "/") + name + ";create=true";
 
-
-
-        _eventManager.addEventListener(new EventListener()
-                                        {
-                                            @Override
-                                            public void event(Event event)
-                                            {
-                                                setInitialSize();
-                                            }
-                                        }, Event.BEFORE_ACTIVATE);
+        setInitialSize();
 
     }
 
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
index 55c8d3ef79..4ca9cb2395 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
@@ -289,12 +289,12 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
     protected void implementationSpecificConfiguration(String name, Map<String, Object> storeSettings)
         throws ClassNotFoundException, SQLException
     {
-        String connectionURL = String.valueOf(storeSettings.get(CONNECTION_URL));
+        _connectionURL = String.valueOf(storeSettings.get(CONNECTION_URL));
         Object poolAttribute = storeSettings.get(CONNECTION_POOL);
 
         JDBCDetails details = null;
 
-        String[] components = connectionURL.split(":",3);
+        String[] components = _connectionURL.split(":",3);
         if(components.length >= 2)
         {
             String vendor = components[1];
@@ -303,7 +303,7 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
 
         if(details == null)
         {
-            getLogger().info("Do not recognize vendor from connection URL: " + connectionURL);
+            getLogger().info("Do not recognize vendor from connection URL: " + _connectionURL);
 
             // TODO - is there a better default than derby
             details = DERBY_DETAILS;
@@ -319,7 +319,7 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
             connectionProviderFactory = new DefaultConnectionProviderFactory();
         }
 
-        _connectionProvider = connectionProviderFactory.getConnectionProvider(connectionURL, storeSettings);
+        _connectionProvider = connectionProviderFactory.getConnectionProvider(_connectionURL, storeSettings);
         _blobType = MapValueConverter.getStringAttribute(JDBC_BLOB_TYPE, storeSettings, details.getBlobType());
         _varBinaryType = MapValueConverter.getStringAttribute(JDBC_VARBINARY_TYPE, storeSettings, details.getVarBinaryType());
         _useBytesMethodsForBlob = MapValueConverter.getBooleanAttribute(JDBC_BYTES_FOR_BLOB, storeSettings, details.isUseBytesMethodsForBlob());
@@ -334,7 +334,7 @@ public class JDBCMessageStore extends AbstractJDBCMessageStore implements Messag
     @Override
     public String getStoreLocation()
     {
-        return "";
+        return _connectionURL;
     }
 
     @Override