diff options
Diffstat (limited to 'qpid/java/broker-plugins')
3 files changed, 6 insertions, 59 deletions
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java index 5a5511becf..31c3f7c944 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java +++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.derby; import java.util.Map; -import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; @@ -34,8 +33,6 @@ import org.apache.qpid.server.virtualhost.AbstractVirtualHost; public class DerbyVirtualHost extends AbstractVirtualHost<DerbyVirtualHost> { public static final String VIRTUAL_HOST_TYPE = "DERBY"; - private MessageStore _messageStore; - private MessageStoreLogSubject _messageStoreLogSubject; @ManagedObjectFactoryConstructor public DerbyVirtualHost(final Map<String, Object> attributes, @@ -46,23 +43,9 @@ public class DerbyVirtualHost extends AbstractVirtualHost<DerbyVirtualHost> @Override - protected void initialiseStorage() + protected MessageStore createMessageStore() { - _messageStore = new DerbyMessageStore().getMessageStore(); - - _messageStoreLogSubject = new MessageStoreLogSubject(getName(), _messageStore.getClass().getSimpleName()); - + return new DerbyMessageStore().getMessageStore(); } - @Override - protected MessageStoreLogSubject getMessageStoreLogSubject() - { - return _messageStoreLogSubject; - } - - @Override - public MessageStore getMessageStore() - { - return _messageStore; - } } diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java index 8acf474321..1dd39a8696 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.jdbc; import java.util.Map; -import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; @@ -34,8 +33,6 @@ import org.apache.qpid.server.virtualhost.AbstractVirtualHost; public class JDBCVirtualHost extends AbstractVirtualHost<JDBCVirtualHost> { public static final String VIRTUAL_HOST_TYPE = "JDBC"; - private MessageStore _messageStore; - private MessageStoreLogSubject _messageStoreLogSubject; @ManagedObjectFactoryConstructor public JDBCVirtualHost(final Map<String, Object> attributes, @@ -46,23 +43,8 @@ public class JDBCVirtualHost extends AbstractVirtualHost<JDBCVirtualHost> @Override - protected void initialiseStorage() + protected MessageStore createMessageStore() { - _messageStore = new JDBCMessageStore().getMessageStore(); - - _messageStoreLogSubject = new MessageStoreLogSubject(getName(), _messageStore.getClass().getSimpleName()); - - } - - @Override - protected MessageStoreLogSubject getMessageStoreLogSubject() - { - return _messageStoreLogSubject; - } - - @Override - public MessageStore getMessageStore() - { - return _messageStore; + return new JDBCMessageStore().getMessageStore(); } } diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhost/memory/MemoryVirtualHost.java b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhost/memory/MemoryVirtualHost.java index ebd32d79a7..5c86f734d0 100644 --- a/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhost/memory/MemoryVirtualHost.java +++ b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhost/memory/MemoryVirtualHost.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.memory; import java.util.Map; -import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; @@ -34,8 +33,6 @@ import org.apache.qpid.server.virtualhost.AbstractVirtualHost; public class MemoryVirtualHost extends AbstractVirtualHost<MemoryVirtualHost> { public static final String VIRTUAL_HOST_TYPE = "Memory"; - private MessageStore _messageStore; - private MessageStoreLogSubject _messageStoreLogSubject; @ManagedObjectFactoryConstructor public MemoryVirtualHost(final Map<String, Object> attributes, @@ -46,23 +43,8 @@ public class MemoryVirtualHost extends AbstractVirtualHost<MemoryVirtualHost> @Override - protected void initialiseStorage() + protected MessageStore createMessageStore() { - _messageStore = new MemoryMessageStore(); - - _messageStoreLogSubject = new MessageStoreLogSubject(getName(), _messageStore.getClass().getSimpleName()); - - } - - @Override - protected MessageStoreLogSubject getMessageStoreLogSubject() - { - return _messageStoreLogSubject; - } - - @Override - public MessageStore getMessageStore() - { - return _messageStore; + return new MemoryMessageStore(); } } |