diff options
author | Robert Gemmell <robbie@apache.org> | 2013-03-10 22:33:03 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2013-03-10 22:33:03 +0000 |
commit | 66992683e1310209c24435c8ff1d0ced0e94cd5a (patch) | |
tree | b4d746248e0d4a73f86f72499fe1b35ca065ea30 | |
parent | e07b736d33f260883097f258dde5f9d0efc9e69d (diff) | |
download | qpid-python-66992683e1310209c24435c8ff1d0ced0e94cd5a.tar.gz |
QPID-4390: misc cleanup
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1454942 13f79535-47bb-0310-9956-ffa450edef68
5 files changed, 6 insertions, 39 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java index 5f4ec1d3a8..6741b3328d 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java @@ -117,10 +117,6 @@ public interface VirtualHost extends ConfiguredObject ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, CONFIG_PATH)); - - - String getReplicationGroupName(); - //children Collection<VirtualHostAlias> getAliases(); Collection<Connection> getConnections(); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java index cc323694e0..eaf187c95c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java @@ -188,12 +188,6 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual } } - @Override - public String getReplicationGroupName() - { - return null; //TODO - } - public Collection<VirtualHostAlias> getAliases() { return Collections.unmodifiableCollection(_aliases); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java index dd3610373f..8e72afad22 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java @@ -146,9 +146,7 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr _bindingFactory = new BindingFactory(this); - _messageStore = initialiseMessageStore(hostConfig); - - configureMessageStore(hostConfig); + _messageStore = configureMessageStore(hostConfig); activateNonHAMessageStore(); @@ -278,7 +276,7 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr return messageStore; } - private MessageStore initialiseMessageStore(VirtualHostConfiguration hostConfig) throws Exception + private MessageStore configureMessageStore(VirtualHostConfiguration hostConfig) throws Exception { String storeType = hostConfig.getConfig().getString("store.type"); MessageStore messageStore = null; @@ -298,18 +296,13 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr messageStore.addEventListener(new AfterActivationListener(), Event.AFTER_ACTIVATE); messageStore.addEventListener(new BeforeCloseListener(), Event.BEFORE_CLOSE); messageStore.addEventListener(new BeforePassivationListener(), Event.BEFORE_PASSIVATE); - return messageStore; - } - - private void configureMessageStore(VirtualHostConfiguration hostConfig) throws Exception - { VirtualHostConfigRecoveryHandler recoveryHandler = new VirtualHostConfigRecoveryHandler(this); - // TODO perhaps pass config on construction?? - _messageStore.configureConfigStore(getName(), recoveryHandler, hostConfig.getStoreConfiguration()); - _messageStore.configureMessageStore(getName(), recoveryHandler, recoveryHandler, hostConfig.getStoreConfiguration()); + messageStore.configureConfigStore(getName(), recoveryHandler, hostConfig.getStoreConfiguration()); + messageStore.configureMessageStore(getName(), recoveryHandler, recoveryHandler, hostConfig.getStoreConfiguration()); + return messageStore; } private void activateNonHAMessageStore() throws Exception diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java index fa1bd966a7..afb7559d9d 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/BrokerConfigurationStoreCreatorTest.java @@ -114,9 +114,8 @@ public class BrokerConfigurationStoreCreatorTest extends QpidTestCase assertTrue("Unexpected children: " + childrenIds, childrenIds.isEmpty()); } - public void testCreateDerbyStore() + public void testCreateStoreWithUnknownType() { - //TODO: Implement DERBY store try { _storeCreator.createStore(_userStoreLocation.getAbsolutePath(), "derby", null, null); @@ -127,18 +126,4 @@ public class BrokerConfigurationStoreCreatorTest extends QpidTestCase // pass } } - - public void testCreateXmlStore() throws Exception - { - try - { - _storeCreator.createStore(_userStoreLocation.getAbsolutePath(), "xml", null, null); - fail("Store is not yet supported"); - } - catch(IllegalConfigurationException e) - { - // pass - } - } - } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java index 950b002b87..9279287117 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java @@ -270,7 +270,6 @@ public class ManagementLoggingTest extends AbstractTestLogging { if (isJavaBroker()) { - setSystemProperty(BrokerProperties.PROPERTY_USE_CUSTOM_RMI_SOCKET_FACTORY, "false"); startBrokerAndCreateMonitor(true, false); final JMXTestUtils jmxUtils = new JMXTestUtils(this); |