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/07/10 11:10:53 UTC
svn commit: r1501682 - in /qpid/trunk/qpid/java: ./
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker-plugins/derby-store/ broker-plugins/derby-store/src/
broker-plugins/derby-store/src/main/
broker-plugins/derby-store/src/main/jav...
Author: rgodfrey
Date: Wed Jul 10 09:10:51 2013
New Revision: 1501682
URL: http://svn.apache.org/r1501682
Log:
QPID-4983 : [Java Broker] Move store implementations to broker plugins
Added:
qpid/trunk/qpid/java/broker-plugins/derby-store/
qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml
qpid/trunk/qpid/java/broker-plugins/derby-store/src/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/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
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/store/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/store/derby/
- copied from r1501206, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/store/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhost/store/derby/
- copied from r1501206, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/services/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java
- copied, changed from r1501206, qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/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
- copied unchanged from r1501206, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/
- copied from r1501206, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/pool/
- copied from r1501206, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/jdbc/
- copied from r1501206, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/services/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
- copied, changed from r1501206, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
- copied, changed from r1501206, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
Removed:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/derby/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/pool/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/derby/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/store/jdbc/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProvider.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStore.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreCreatorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java
qpid/trunk/qpid/java/broker/build.xml
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java Wed Jul 10 09:10:51 2013
@@ -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;
}
}
Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessageStoreCreatorTest.java Wed Jul 10 09:10:51 2013
@@ -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()
{
Added: qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml?rev=1501682&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml (added)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/build.xml Wed Jul 10 09:10:51 2013
@@ -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>
Added: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory?rev=1501682&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory (added)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory Wed Jul 10 09:10:51 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.derby.DerbyMessageStoreFactory
Copied: qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java (from r1501206, qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java?p2=qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java&p1=qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java&r1=1501206&r2=1501682&rev=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreConfigurationTest.java Wed Jul 10 09:10:51 2013
@@ -18,28 +18,41 @@
* under the License.
*
*/
-package org.apache.qpid.server.store.berkeleydb;
+package org.apache.qpid.server.store.derby;
-import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.DurableConfigurationStoreTest;
-import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.AbstractDurableConfigurationStoreTestCase;
-public class BDBMessageStoreConfigurationTest extends DurableConfigurationStoreTest
+public class DerbyMessageStoreConfigurationTest extends AbstractDurableConfigurationStoreTestCase
{
- private BDBMessageStore _bdbMessageStore;
+ private DerbyMessageStore _derbyMessageStore;
@Override
- protected BDBMessageStore createMessageStore() throws Exception
+ protected void onReopenStore()
{
- _bdbMessageStore = new BDBMessageStore();
- return _bdbMessageStore;
+ _derbyMessageStore = null;
}
- // TODO - this only works so long as createConfigStore is called after createMessageStore
@Override
- protected DurableConfigurationStore createConfigStore() throws Exception
+ protected DerbyMessageStore createMessageStore() throws Exception
{
- return _bdbMessageStore;
+ createStoreIfNecessary();
+ return _derbyMessageStore;
+ }
+
+
+ private void createStoreIfNecessary()
+ {
+ if(_derbyMessageStore == null)
+ {
+ _derbyMessageStore = new DerbyMessageStore();
+ }
+ }
+
+ @Override
+ protected DerbyMessageStore createConfigStore() throws Exception
+ {
+ createStoreIfNecessary();
+ return _derbyMessageStore;
}
}
Added: qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml?rev=1501682&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml (added)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/build.xml Wed Jul 10 09:10:51 2013
@@ -0,0 +1,31 @@
+<!--
+ - 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 JDBC 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>
Added: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory?rev=1501682&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory (added)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/resources/services/org.apache.qpid.server.plugin.MessageStoreFactory Wed Jul 10 09:10:51 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.jdbc.JDBCMessageStoreFactory
Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java (from r1501206, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java&p1=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java&r1=1501206&r2=1501682&rev=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java Wed Jul 10 09:10:51 2013
@@ -31,7 +31,6 @@ import java.util.Set;
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;
@@ -133,7 +132,7 @@ public class JDBCMessageStoreTest extend
}
catch(SQLException e)
{
- if (e.getSQLState().equalsIgnoreCase(DerbyMessageStore.DERBY_SINGLE_DB_SHUTDOWN_CODE))
+ if (e.getSQLState().equalsIgnoreCase("08006"))
{
//expected and represents a clean shutdown of this database only, do nothing.
}
Modified: qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Wed Jul 10 09:10:51 2013
@@ -25,9 +25,9 @@
<property name="module.genpom" value="true"/>
<!-- Add dependencies to the broker pom for the broker-plugins and bdbstore modules -->
- <property name="module.maven.depends" value="broker-plugins/management-http broker-plugins/management-jmx broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore bdbstore/jmx"/>
+ <property name="module.maven.depends" value="broker-plugins/management-http broker-plugins/management-jmx broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore bdbstore/jmx broker-plugins/jdbc-store broker-plugins/derby-store"/>
<!-- Make them runtime dependencies, make bdbstore modules optional -->
- <property name="module.genpom.args" value="-Sqpid-broker-plugins-management-http=runtime -Sqpid-broker-plugins-management-jmx=runtime -Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime -Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx -Sqpid-broker-plugins-jdbc-provider-bone=runtime -Oqpid-broker-plugins-jdbc-provider-bone"/>
+ <property name="module.genpom.args" value="-Sqpid-broker-plugins-management-http=runtime -Sqpid-broker-plugins-management-jmx=runtime -Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime -Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx -Sqpid-broker-plugins-jdbc-provider-bone=runtime -Oqpid-broker-plugins-jdbc-provider-bone -Sqpid-broker-plugins-jdbc-store=runtime -Sqpid-broker-plugins-derby-store=runtime"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java Wed Jul 10 09:10:51 2013
@@ -29,3 +29,4 @@ public interface ConnectionProvider
void close() throws SQLException;
}
+
Modified: qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory (original)
+++ qpid/trunk/qpid/java/broker/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.MessageStoreFactory Wed Jul 10 09:10:51 2013
@@ -16,6 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.qpid.server.store.derby.DerbyMessageStoreFactory
org.apache.qpid.server.store.MemoryMessageStoreFactory
-org.apache.qpid.server.store.jdbc.JDBCMessageStoreFactory
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java Wed Jul 10 09:10:51 2013
@@ -78,8 +78,7 @@ public class VirtualHostRecovererTest ex
attributes.put(VirtualHost.NAME, getName());
attributes.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE);
- attributes.put(VirtualHost.STORE_PATH, "/path/to/virtualhost/store");
- attributes.put(VirtualHost.STORE_TYPE, "DERBY");
+ attributes.put(VirtualHost.STORE_TYPE, "MEMORY");
when(entry.getAttributes()).thenReturn(attributes);
VirtualHost host = recoverer.create(null, entry, parent);
@@ -99,8 +98,7 @@ public class VirtualHostRecovererTest ex
attributes = new HashMap<String, Object>();
attributes.put(VirtualHost.NAME, getName());
- attributes.put(VirtualHost.STORE_PATH, "/path/to/store");
- attributes.put(VirtualHost.STORE_TYPE, "DERBY");
+ attributes.put(VirtualHost.STORE_TYPE, "MEMORY");
mandatoryAttributes = new String[]{VirtualHost.NAME, VirtualHost.STORE_TYPE};
checkMandatoryAttributesAreValidated(mandatoryAttributes, attributes);
Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (from r1501206, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java&p1=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java&r1=1501206&r2=1501682&rev=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Wed Jul 10 09:10:51 2013
@@ -42,9 +42,6 @@ import org.apache.qpid.framing.AMQShortS
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.logging.SystemOutMessageLogger;
-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.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
@@ -54,11 +51,10 @@ import org.apache.qpid.server.queue.AMQQ
import org.apache.qpid.server.queue.MockStoredMessage;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
import org.apache.qpid.server.store.Transaction.Record;
-import org.apache.qpid.server.store.derby.DerbyMessageStore;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.util.FileUtils;
-public class DurableConfigurationStoreTest extends QpidTestCase
+public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTestCase
{
private static final String EXCHANGE_NAME = "exchangeName";
private String _storePath;
@@ -371,6 +367,7 @@ public class DurableConfigurationStoreTe
private void reopenStore() throws Exception
{
+ onReopenStore();
if (_messageStore != null)
{
_messageStore.close();
@@ -383,8 +380,10 @@ public class DurableConfigurationStoreTe
_messageStore.activate();
}
- protected MessageStore createMessageStore() throws Exception
- {
+ protected abstract void onReopenStore();
+
+ abstract protected MessageStore createMessageStore() throws Exception;
+ /*{
String storeClass = System.getProperty(MESSAGE_STORE_CLASS_NAME_KEY);
if (storeClass == null)
{
@@ -394,9 +393,9 @@ public class DurableConfigurationStoreTe
MessageStore messageStore = (MessageStore) Class.forName(storeClass).newInstance();
return messageStore;
}
-
- protected DurableConfigurationStore createConfigStore() throws Exception
- {
+*/
+ abstract protected DurableConfigurationStore createConfigStore() throws Exception;
+ /*{
String storeClass = System.getProperty(CONFIGURATION_STORE_CLASS_NAME_KEY);
if (storeClass == null)
{
@@ -414,7 +413,7 @@ public class DurableConfigurationStoreTe
}
return configurationStore;
}
-
+*/
public void testRecordXid() throws Exception
{
Record enqueueRecord = getTestRecord(1);
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Wed Jul 10 09:10:51 2013
@@ -96,6 +96,8 @@ perftests.test.libs=${test.libs}
broker-plugins-access-control.test.libs=${test.libs}
broker-plugins-management-http.test.libs=${test.libs}
broker-plugins-management-jmx.test.libs=${test.libs}
+broker-plugins-jdbc-store.test.libs=${test.libs}
+broker-plugins-derby-store.test.libs=${test.libs}
management-common.test.libs=${test.libs}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1501682&r1=1501681&r2=1501682&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Wed Jul 10 09:10:51 2013
@@ -69,7 +69,6 @@ import org.apache.qpid.server.protocol.A
import org.apache.qpid.server.store.MemoryMessageStore;
import org.apache.qpid.server.store.MessageStoreConstants;
import org.apache.qpid.server.store.MessageStoreCreator;
-import org.apache.qpid.server.store.derby.DerbyMessageStore;
import org.apache.qpid.url.URLSyntaxException;
import org.apache.qpid.util.FileUtils;
@@ -839,7 +838,7 @@ public class QpidBrokerTestCase extends
if (System.getProperty("profile", "").startsWith("java-dby-mem"))
{
- storeDir = DerbyMessageStore.MEMORY_STORE_LOCATION;
+ storeDir = ":memory:";
}
else if (!MEMORY_STORE_CLASS_NAME.equals(storeClassName))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org