svn commit: r1752692 - in /qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server: store/derby/DerbyConfigurationStore.java virtualhostnode/derby/DerbyVirtualHostNode.java virtualhostnode/derby/DerbyVirtualHostNodeImpl.java

[orudyy]

Author: orudyy
Date: Thu Jul 14 16:48:30 2016
New Revision: 1752692

URL: http://svn.apache.org/viewvc?rev=1752692&view=rev
Log:
QPID-7337: [Java Broker] Implement PreferenceStoreProvider interface on Derby 
VHN

Modified:
    
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/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
    
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeImpl.java

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=1752692&r1=1752691&r2=1752692&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
 Thu Jul 14 16:48:30 2016
@@ -40,6 +40,7 @@ import org.apache.qpid.server.store.Mess
 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;
 import org.apache.qpid.util.FileUtils;
 
 /**
@@ -178,6 +179,12 @@ public class DerbyConfigurationStore ext
         return _providedMessageStore;
     }
 
+    public PreferenceStore getPreferenceStore()
+    {
+        return _providedPreferenceStore;
+    }
+
+
     @Override
     protected boolean tableExists(final String tableName, final Connection 
conn) throws SQLException
     {

Modified: 
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java?rev=1752692&r1=1752691&r2=1752692&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
 Thu Jul 14 16:48:30 2016
@@ -24,15 +24,17 @@ import org.apache.qpid.server.model.Mana
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.store.FileBasedSettings;
 import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
 
-public interface DerbyVirtualHostNode<X extends DerbyVirtualHostNode<X>> 
extends VirtualHostNode<X>, FileBasedSettings
+public interface DerbyVirtualHostNode<X extends DerbyVirtualHostNode<X>>
+        extends VirtualHostNode<X>, FileBasedSettings, PreferenceStoreProvider
 {
     String STORE_PATH = "storePath";
 
     @ManagedAttribute(mandatory = true, defaultValue = 
"${qpid.work_dir}${file.separator}${this:name}${file.separator}config")
     String getStorePath();
 
-    @ManagedAttribute( description = "Configuration for the preference store, 
e.g. type, path, etc.",
+    @ManagedAttribute(description = "Configuration for the preference store, 
e.g. type, path, etc.",
             defaultValue = "{\"type\": \"Provided\"}")
     PreferenceStoreAttributes getPreferenceStoreAttributes();
 }

Modified: 
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeImpl.java?rev=1752692&r1=1752691&r2=1752692&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNodeImpl.java
 Thu Jul 14 16:48:30 2016
@@ -35,6 +35,7 @@ import org.apache.qpid.server.model.Virt
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.derby.DerbyConfigurationStore;
 import org.apache.qpid.server.store.derby.DerbyUtils;
+import org.apache.qpid.server.store.preferences.PreferenceStore;
 import org.apache.qpid.server.util.FileHelper;
 import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
 
@@ -97,4 +98,10 @@ public class DerbyVirtualHostNodeImpl ex
             throw new IllegalConfigurationException("The store path is not 
writable directory");
         }
     }
+
+    @Override
+    public PreferenceStore getPreferenceStore()
+    {
+        return 
((DerbyConfigurationStore)getConfigurationStore()).getPreferenceStore();
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org