From 6266c91a9ef891c84159c99cfc7708fc2cc7d49f Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Tue, 20 Aug 2013 18:39:44 +0000 Subject: QPID-5087 : [Java Broker] Allow use of separate message stores and configuration stores git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1515914 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/store/QuotaMessageStore.java | 6 ++---- .../java/org/apache/qpid/server/store/SlowMessageStore.java | 13 +++++-------- .../src/main/java/org/apache/qpid/systest/rest/Asserts.java | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) (limited to 'qpid/java/systests/src') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java index a1d3d1542e..e19aeb38e7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java @@ -48,9 +48,7 @@ public class } @Override - public void configureConfigStore(String name, - ConfigurationRecoveryHandler recoveryHandler, - VirtualHost virtualHost) + public void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler recoveryHandler) throws Exception { Object overfullAttr = virtualHost.getAttribute(MessageStoreConstants.OVERFULL_SIZE_ATTRIBUTE); @@ -77,7 +75,7 @@ public class } @Override - public void configureMessageStore(String name, MessageStoreRecoveryHandler recoveryHandler, + public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler recoveryHandler, TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception { _stateManager.attainState(State.INITIALISED); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java index cec982c2c5..e08061deea 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java @@ -48,11 +48,9 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore // ***** MessageStore Interface. - public void configureConfigStore(String name, - ConfigurationRecoveryHandler recoveryHandler, - VirtualHost virtualHost) throws Exception + public void configureConfigStore(VirtualHost virtualHost, ConfigurationRecoveryHandler recoveryHandler) throws Exception { - _logger.info("Starting SlowMessageStore on Virtualhost:" + name); + _logger.info("Starting SlowMessageStore on Virtualhost:" + virtualHost.getName()); Object delaysAttr = virtualHost.getAttribute("slowMessageStoreDelays"); @@ -84,7 +82,7 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore _durableConfigurationStore = (DurableConfigurationStore)o; } } - _durableConfigurationStore.configureConfigStore(name, recoveryHandler, virtualHost); + _durableConfigurationStore.configureConfigStore(virtualHost, recoveryHandler); } @@ -153,11 +151,10 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore } - public void configureMessageStore(String name, - MessageStoreRecoveryHandler messageRecoveryHandler, + public void configureMessageStore(VirtualHost virtualHost, MessageStoreRecoveryHandler messageRecoveryHandler, TransactionLogRecoveryHandler tlogRecoveryHandler) throws Exception { - _realStore.configureMessageStore(name, messageRecoveryHandler, tlogRecoveryHandler); + _realStore.configureMessageStore(virtualHost, messageRecoveryHandler, tlogRecoveryHandler); } public void close() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java index 1d1c474be0..ad328eaede 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java @@ -51,7 +51,7 @@ public class Asserts assertNotNull("Virtualhost " + virtualHostName + " data are not found", virtualHost); assertAttributesPresent(virtualHost, VirtualHost.AVAILABLE_ATTRIBUTES, VirtualHost.TIME_TO_LIVE, VirtualHost.CREATED, VirtualHost.UPDATED, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.STORE_PATH, - VirtualHost.CONFIG_PATH, VirtualHost.TYPE); + VirtualHost.CONFIG_PATH, VirtualHost.TYPE, VirtualHost.CONFIG_STORE_PATH, VirtualHost.CONFIG_STORE_TYPE); assertEquals("Unexpected value of attribute " + VirtualHost.NAME, virtualHostName, virtualHost.get(VirtualHost.NAME)); assertNotNull("Unexpected value of attribute " + VirtualHost.ID, virtualHost.get(VirtualHost.ID)); -- cgit v1.2.1