You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/11/23 11:29:41 UTC
qpid-broker-j git commit: QPID-8260: [Broker-J] Ass support for
provided preferences store into Derby and JDBC system configs
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 3b407342c -> 082f9bf0d
QPID-8260: [Broker-J] Ass support for provided preferences store into Derby and JDBC system configs
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/082f9bf0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/082f9bf0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/082f9bf0
Branch: refs/heads/master
Commit: 082f9bf0d370f2e23b1a349844120128e8d90738
Parents: 3b40734
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Nov 23 11:28:53 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Nov 23 11:28:53 2018 +0000
----------------------------------------------------------------------
.../org/apache/qpid/server/store/derby/DerbySystemConfig.java | 7 +++++--
.../apache/qpid/server/store/derby/DerbySystemConfigImpl.java | 7 +++++++
.../org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java | 5 ++++-
.../apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java | 7 +++++++
4 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/082f9bf0/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
index c79b08c..410e071 100644
--- a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
+++ b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfig.java
@@ -25,9 +25,12 @@ import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.store.FileBasedSettings;
import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
-public interface DerbySystemConfig<X extends DerbySystemConfig<X>> extends SystemConfig<X>, FileBasedSettings,
- SizeMonitoringSettings
+public interface DerbySystemConfig<X extends DerbySystemConfig<X>> extends SystemConfig<X>,
+ FileBasedSettings,
+ SizeMonitoringSettings,
+ PreferenceStoreProvider
{
@Override
@ManagedAttribute(defaultValue = "${qpid.work_dir}${file.separator}config.json")
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/082f9bf0/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
index fe4e560..d26d1ab 100644
--- a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
+++ b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
@@ -31,6 +31,7 @@ import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.SystemConfigFactoryConstructor;
import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.preferences.PreferenceStore;
@ManagedObject(category = false, type = DerbySystemConfigImpl.SYSTEM_CONFIG_TYPE)
public class DerbySystemConfigImpl extends AbstractSystemConfig<DerbySystemConfigImpl> implements DerbySystemConfig<DerbySystemConfigImpl>
@@ -76,4 +77,10 @@ public class DerbySystemConfigImpl extends AbstractSystemConfig<DerbySystemConfi
{
return _storeOverfullSize;
}
+
+ @Override
+ public PreferenceStore getPreferenceStore()
+ {
+ return ((DerbyConfigurationStore) getConfigurationStore()).getPreferenceStore();
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/082f9bf0/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
index 67c83cd..6a6d5f3 100644
--- a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
+++ b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfig.java
@@ -24,8 +24,11 @@ import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedContextDefault;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
-public interface JDBCSystemConfig<X extends JDBCSystemConfig<X>> extends SystemConfig<X>, JDBCSettings
+public interface JDBCSystemConfig<X extends JDBCSystemConfig<X>> extends SystemConfig<X>,
+ JDBCSettings,
+ PreferenceStoreProvider
{
@Override
@ManagedAttribute(mandatory=true, defaultValue = "${systemConfig.connectionUrl}")
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/082f9bf0/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
index 6a4ef55..2a21b96 100644
--- a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
+++ b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
@@ -31,6 +31,7 @@ import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.SystemConfigFactoryConstructor;
import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.preferences.PreferenceStore;
@ManagedObject( category = false, type = JDBCSystemConfigImpl.SYSTEM_CONFIG_TYPE)
public class JDBCSystemConfigImpl extends AbstractSystemConfig<JDBCSystemConfigImpl> implements JDBCSystemConfig<JDBCSystemConfigImpl>
@@ -92,4 +93,10 @@ public class JDBCSystemConfigImpl extends AbstractSystemConfig<JDBCSystemConfigI
{
return _tableNamePrefix;
}
+
+ @Override
+ public PreferenceStore getPreferenceStore()
+ {
+ return ((GenericJDBCConfigurationStore) getConfigurationStore()).getPreferenceStore();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org