QPID-4983 : [Java Broker] Move store implementations to broker plugins

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

Author: rgodfrey

qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java

@@ -20,26 +20,40 @@
  */
 package org.apache.qpid.server.store.berkeleydb;
 
+import org.apache.qpid.server.store.AbstractDurableConfigurationStoreTestCase;
 import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.DurableConfigurationStoreTest;
-import org.apache.qpid.server.store.MessageStore;
 
-public class BDBMessageStoreConfigurationTest extends DurableConfigurationStoreTest
+public class BDBMessageStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase
 {
 
     private BDBMessageStore _bdbMessageStore;
 
+    @Override
+    protected void onReopenStore()
+    {
+        _bdbMessageStore = null;
+    }
+
     @Override
     protected BDBMessageStore createMessageStore() throws Exception
     {
-        _bdbMessageStore = new BDBMessageStore();
+        createStoreIfNecessary();
         return _bdbMessageStore;
     }
 
-    // TODO - this only works so long as createConfigStore is called after createMessageStore
+    private void createStoreIfNecessary()
+    {
+        if(_bdbMessageStore == null)
+        {
+            _bdbMessageStore = new BDBMessageStore();
+        }
+    }
+
     @Override
     protected DurableConfigurationStore createConfigStore() throws Exception
     {
+        createStoreIfNecessary();
+
         return _bdbMessageStore;
     }
 }

qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java

@@ -20,16 +20,14 @@
  */
 package org.apache.qpid.server.store.berkeleydb;
 
-import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreCreator;
 import org.apache.qpid.server.store.berkeleydb.BDBMessageStore;
-import org.apache.qpid.server.store.derby.DerbyMessageStore;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class MessageStoreCreatorTest extends QpidTestCase
 {
-    private static final String[] STORE_TYPES = {MemoryMessageStore.TYPE, DerbyMessageStore.TYPE, BDBMessageStore.TYPE};
+    private static final String[] STORE_TYPES = {BDBMessageStore.TYPE};
 
     public void testMessageStoreCreator()
     {

qpid/java/broker-plugins/derby-store/build.xml

@@ -0,0 +1,32 @@
+<!--
+ - 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.
+ -->
+<project name="Qpid Broker-Plugins Derby Store" default="build">
+    <property name="module.depends" value="common broker" />
+    <property name="module.test.depends" value="common/tests broker/tests" />
+
+    <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
+
+    <property name="broker.plugin" value="true"/>
+
+    <import file="../../module.xml" />
+
+    <target name="bundle" depends="bundle-tasks"/>
+
+</project>

qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java renamed to qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java

@@ -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.derby.DerbyMessageStoreFactory

qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java renamed to qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java

@@ -18,22 +18,41 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.store;
+package org.apache.qpid.server.store.derby;
 
-import org.apache.qpid.server.store.derby.DerbyMessageStore;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.server.store.AbstractDurableConfigurationStoreTestCase;
 
-public class MessageStoreCreatorTest extends QpidTestCase
+public class DerbyMessageStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase
 {
-    private static final String[] STORE_TYPES = {MemoryMessageStore.TYPE, DerbyMessageStore.TYPE};
 
-    public void testMessageStoreCreator()
+    private DerbyMessageStore _derbyMessageStore;
+
+    @Override
+    protected void onReopenStore()
+    {
+        _derbyMessageStore = null;
+    }
+
+    @Override
+    protected DerbyMessageStore createMessageStore() throws Exception
     {
-        MessageStoreCreator messageStoreCreator = new MessageStoreCreator();
-        for (String type : STORE_TYPES)
+        createStoreIfNecessary();
+        return _derbyMessageStore;
+    }
+
+
+    private void createStoreIfNecessary()
+    {
+        if(_derbyMessageStore == null)
         {
-            MessageStore store = messageStoreCreator.createMessageStore(type);
-            assertNotNull("Store of type " + type + " is not created", store);
+            _derbyMessageStore = new DerbyMessageStore();
         }
     }
+
+    @Override
+    protected DerbyMessageStore createConfigStore() throws Exception
+    {
+        createStoreIfNecessary();
+        return _derbyMessageStore;
+    }
 }