You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/03/22 17:07:15 UTC
svn commit: r1788141 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/plugin/
broker-core/src/main/java/org/apache/qpid/server/store/
broker-core/src/main/java/org/apache/qpid/server/store/jdbc/
broker-core/src/main/java/org/apac...
Author: lquack
Date: Wed Mar 22 17:07:15 2017
New Revision: 1788141
URL: http://svn.apache.org/viewvc?rev=1788141&view=rev
Log:
QPID-7653: [Java Broker, JDBC, Derby] Move JDBC classes out of core. Make Derby plugin depend on JDBC plugin
Added:
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
- copied, changed from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
- copied, changed from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCPreferenceStore.java
- copied, changed from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/AbstractJDBCPreferenceStore.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
- copied, changed from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
- copied, changed from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
- copied, changed from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/AbstractJDBCPreferenceStore.java
Modified:
qpid/java/trunk/broker-plugins/derby-store/pom.xml
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml
qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
qpid/java/trunk/broker-plugins/jdbc-store/pom.xml
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
Modified: qpid/java/trunk/broker-plugins/derby-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/pom.xml?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/derby-store/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/derby-store/pom.xml Wed Mar 22 17:07:15 2017
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker-core</artifactId>
+ <artifactId>qpid-broker-plugins-jdbc-store</artifactId>
<version>${project.version}</version>
</dependency>
Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java (original)
+++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java Wed Mar 22 17:07:15 2017
@@ -31,7 +31,11 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.store.*;
+import org.apache.qpid.server.store.Event;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
+import org.apache.qpid.server.store.StoreException;
+import org.apache.qpid.server.store.jdbc.AbstractJDBCMessageStore;
+import org.apache.qpid.server.store.jdbc.JdbcUtils;
public abstract class AbstractDerbyMessageStore extends AbstractJDBCMessageStore
{
Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java (original)
+++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java Wed Mar 22 17:07:15 2017
@@ -21,8 +21,8 @@
package org.apache.qpid.server.store.derby;
-
-import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.*;
+import static org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore.State.CLOSED;
+import static org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore.State.CONFIGURED;
import java.io.File;
import java.sql.Connection;
@@ -34,13 +34,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.store.AbstractJDBCConfigurationStore;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.FileBasedSettings;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreProvider;
import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.server.store.preferences.AbstractJDBCPreferenceStore;
+import org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore;
+import org.apache.qpid.server.store.jdbc.AbstractJDBCPreferenceStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
import org.apache.qpid.server.util.FileUtils;
Modified: qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java (original)
+++ qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java Wed Mar 22 17:07:15 2017
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.store.preferences.AbstractJDBCPreferenceStore;
+import org.apache.qpid.server.store.jdbc.AbstractJDBCPreferenceStore;
import org.apache.qpid.server.store.preferences.PreferenceRecord;
import org.apache.qpid.server.store.preferences.PreferenceRecordImpl;
import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
Modified: qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/jdbc-provider-bone/pom.xml Wed Mar 22 17:07:15 2017
@@ -32,9 +32,8 @@
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker-core</artifactId>
+ <artifactId>qpid-broker-plugins-jdbc-store</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
Modified: qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-provider-bone/src/main/java/org/apache/qpid/server/store/jdbc/bonecp/BoneCPConnectionProviderFactory.java Wed Mar 22 17:07:15 2017
@@ -23,15 +23,15 @@ package org.apache.qpid.server.store.jdb
import static java.util.Arrays.asList;
import static java.util.Collections.unmodifiableSet;
-import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
-import org.apache.qpid.server.plugin.PluggableService;
-import org.apache.qpid.server.store.jdbc.ConnectionProvider;
-
import java.sql.SQLException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.qpid.server.plugin.PluggableService;
+import org.apache.qpid.server.store.jdbc.ConnectionProvider;
+import org.apache.qpid.server.store.jdbc.JDBCConnectionProviderFactory;
+
@PluggableService
public class BoneCPConnectionProviderFactory implements JDBCConnectionProviderFactory
{
Modified: qpid/java/trunk/broker-plugins/jdbc-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/pom.xml?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/pom.xml Wed Mar 22 17:07:15 2017
@@ -34,7 +34,6 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-broker-core</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
Copied: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java (from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java?p2=qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java&r1=1788096&r2=1788141&rev=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java Wed Mar 22 17:07:15 2017
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.server.store;
+package org.apache.qpid.server.store.jdbc;
-import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.CONFIGURED;
-import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.OPEN;
+import static org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore.State.CONFIGURED;
+import static org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore.State.OPEN;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -46,6 +46,10 @@ import org.slf4j.Logger;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectJacksonModule;
import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.store.ConfiguredObjectRecord;
+import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.MessageStoreProvider;
+import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
public abstract class AbstractJDBCConfigurationStore implements MessageStoreProvider, DurableConfigurationStore
Copied: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java (from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java?p2=qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java&r1=1788096&r2=1788141&rev=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java Wed Mar 22 17:07:15 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.store;
+package org.apache.qpid.server.store.jdbc;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -49,6 +49,19 @@ import org.apache.qpid.server.bytebuffer
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.plugin.MessageMetaDataType;
+import org.apache.qpid.server.store.Event;
+import org.apache.qpid.server.store.EventListener;
+import org.apache.qpid.server.store.EventManager;
+import org.apache.qpid.server.store.MessageDurability;
+import org.apache.qpid.server.store.MessageEnqueueRecord;
+import org.apache.qpid.server.store.MessageHandle;
+import org.apache.qpid.server.store.MessageMetaDataTypeRegistry;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.StorableMessageMetaData;
+import org.apache.qpid.server.store.StoreException;
+import org.apache.qpid.server.store.StoredMessage;
+import org.apache.qpid.server.store.Transaction;
+import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.store.handler.DistributedTransactionHandler;
import org.apache.qpid.server.store.handler.MessageHandler;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
Copied: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCPreferenceStore.java (from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/AbstractJDBCPreferenceStore.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCPreferenceStore.java?p2=qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCPreferenceStore.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/AbstractJDBCPreferenceStore.java&r1=1788096&r2=1788141&rev=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/AbstractJDBCPreferenceStore.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCPreferenceStore.java Wed Mar 22 17:07:15 2017
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.qpid.server.store.preferences;
+package org.apache.qpid.server.store.jdbc;
-import static org.apache.qpid.server.store.JdbcUtils.tableExists;
+import static org.apache.qpid.server.store.jdbc.JdbcUtils.tableExists;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -45,6 +45,10 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectJacksonModule;
import org.apache.qpid.server.model.ModelVersion;
import org.apache.qpid.server.store.StoreException;
+import org.apache.qpid.server.store.preferences.PreferenceRecord;
+import org.apache.qpid.server.store.preferences.PreferenceRecordImpl;
+import org.apache.qpid.server.store.preferences.PreferenceStore;
+import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
import org.apache.qpid.server.util.BaseAction;
public abstract class AbstractJDBCPreferenceStore implements PreferenceStore
Copied: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java (from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java?p2=qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java&r1=1788096&r2=1788141&rev=1788141&view=diff
==============================================================================
(empty)
Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/DefaultConnectionProviderFactory.java Wed Mar 22 17:07:15 2017
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.store.jdbc;
-import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
import org.apache.qpid.server.plugin.PluggableService;
Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericAbstractJDBCMessageStore.java Wed Mar 22 17:07:15 2017
@@ -29,7 +29,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.Transaction;
-public abstract class GenericAbstractJDBCMessageStore extends org.apache.qpid.server.store.AbstractJDBCMessageStore
+public abstract class GenericAbstractJDBCMessageStore extends AbstractJDBCMessageStore
{
private final AtomicBoolean _messageStoreOpen = new AtomicBoolean(false);
private final List<RecordedJDBCTransaction> _transactions = new CopyOnWriteArrayList<>();
Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java Wed Mar 22 17:07:15 2017
@@ -19,8 +19,8 @@
package org.apache.qpid.server.store.jdbc;
-import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.CLOSED;
-import static org.apache.qpid.server.store.AbstractJDBCConfigurationStore.State.CONFIGURED;
+import static org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore.State.CLOSED;
+import static org.apache.qpid.server.store.jdbc.AbstractJDBCConfigurationStore.State.CONFIGURED;
import java.io.File;
import java.nio.charset.Charset;
@@ -37,12 +37,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
-import org.apache.qpid.server.store.AbstractJDBCConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreProvider;
import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.server.store.preferences.AbstractJDBCPreferenceStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
/**
Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java?rev=1788141&r1=1788140&r2=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java Wed Mar 22 17:07:15 2017
@@ -35,7 +35,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.plugin.JDBCConnectionProviderFactory;
import org.apache.qpid.server.store.StoreException;
/**
Copied: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java (from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java?p2=qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java&r1=1788096&r2=1788141&rev=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java Wed Mar 22 17:07:15 2017
@@ -18,13 +18,14 @@
* under the License.
*
*/
-package org.apache.qpid.server.plugin;
+package org.apache.qpid.server.store.jdbc;
import java.sql.SQLException;
import java.util.Map;
import java.util.Set;
-import org.apache.qpid.server.store.jdbc.ConnectionProvider;
+import org.apache.qpid.server.plugin.Pluggable;
+import org.apache.qpid.server.plugin.QpidServiceLoader;
public interface JDBCConnectionProviderFactory extends Pluggable
{
Copied: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java (from r1788096, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java?p2=qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java&r1=1788096&r2=1788141&rev=1788141&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java (original)
+++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java Wed Mar 22 17:07:15 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpid.server.store;
+package org.apache.qpid.server.store.jdbc;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org