From 8fc924683158b005c70d49d4b97d16fde2914bde Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Thu, 13 Mar 2014 10:41:24 +0000 Subject: QPID-5624: Remove MessageStoreCreator and finish some virtual host refactoring git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1577097 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/store/berkeleydb/BDBHAVirtualHostFactory.java | 12 +----------- .../qpid/server/store/berkeleydb/BDBMessageStoreFactory.java | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'qpid/java/bdbstore/src/main') diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java index f5d930dc5a..b2ec96f9f8 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostFactory.java @@ -19,9 +19,8 @@ package org.apache.qpid.server.store.berkeleydb;/* * */ -import java.util.LinkedHashMap; import java.util.Map; -import org.apache.qpid.server.model.adapter.VirtualHostAdapter; + import org.apache.qpid.server.plugin.VirtualHostFactory; import org.apache.qpid.server.stats.StatisticsGatherer; import org.apache.qpid.server.virtualhost.VirtualHost; @@ -70,13 +69,4 @@ public class BDBHAVirtualHostFactory implements VirtualHostFactory } } - @Override - public Map createVirtualHostConfiguration(VirtualHostAdapter virtualHostAdapter) - { - LinkedHashMap convertedMap = new LinkedHashMap(); - convertedMap.put("store.environment-path", virtualHostAdapter.getAttribute(org.apache.qpid.server.model.VirtualHost.STORE_PATH)); - - return convertedMap; - } - } diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java index 04efc77b8b..8f2086a25c 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreFactory.java @@ -21,6 +21,7 @@ package org.apache.qpid.server.store.berkeleydb; import java.util.Map; + import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory; import org.apache.qpid.server.plugin.MessageStoreFactory; -- cgit v1.2.1