Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original) +++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Sun Apr 20 01:32:50 2014 @@ -108,8 +108,6 @@ public interface VirtualHostImpl< X exte int getHouseKeepingActiveCount(); - VirtualHostRegistry getVirtualHostRegistry(); - DtxRegistry getDtxRegistry(); LinkRegistry getLinkRegistry(String remoteContainerId);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java Sun Apr 20 01:32:50 2014 @@ -20,6 +20,7 @@ */ package org.apache.qpid.server.configuration.startup; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,12 +39,12 @@ import org.apache.qpid.server.model.Conf import org.apache.qpid.server.model.ConfiguredObjectFactory; import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.Model; +import org.apache.qpid.server.model.SystemContext; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.TestMemoryMessageStore; import org.apache.qpid.server.virtualhost.StandardVirtualHost; -import org.apache.qpid.server.virtualhost.VirtualHostRegistry; public class VirtualHostCreationTest extends TestCase { @@ -53,13 +54,14 @@ public class VirtualHostCreationTest ext SecurityManager securityManager = mock(SecurityManager.class); ConfigurationEntry entry = mock(ConfigurationEntry.class); ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(Model.getInstance()); + SystemContext systemContext = mock(SystemContext.class); + Broker parent = mock(Broker.class); when(parent.getObjectFactory()).thenReturn(objectFactory); when(parent.getSecurityManager()).thenReturn(securityManager); when(parent.getCategoryClass()).thenReturn(Broker.class); - VirtualHostRegistry virtualHostRegistry = mock(VirtualHostRegistry.class); - when(virtualHostRegistry.getEventLogger()).thenReturn(mock(EventLogger.class)); - when(parent.getVirtualHostRegistry()).thenReturn(virtualHostRegistry); + when(systemContext.getEventLogger()).thenReturn(mock(EventLogger.class)); + when(parent.getParent(eq(SystemContext.class))).thenReturn(systemContext); Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(VirtualHost.NAME, getName()); @@ -90,11 +92,11 @@ public class VirtualHostCreationTest ext public void checkMandatoryAttributesAreValidated(String[] mandatoryAttributes, Map<String, Object> attributes) { SecurityManager securityManager = mock(SecurityManager.class); + SystemContext systemContext = mock(SystemContext.class); Broker parent = mock(Broker.class); when(parent.getSecurityManager()).thenReturn(securityManager); - VirtualHostRegistry virtualHostRegistry = mock(VirtualHostRegistry.class); - when(virtualHostRegistry.getEventLogger()).thenReturn(mock(EventLogger.class)); - when(parent.getVirtualHostRegistry()).thenReturn(virtualHostRegistry); + when(parent.getParent(eq(SystemContext.class))).thenReturn(systemContext); + when(systemContext.getEventLogger()).thenReturn(mock(EventLogger.class)); for (String name : mandatoryAttributes) { Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java Sun Apr 20 01:32:50 2014 @@ -135,10 +135,10 @@ public class TaskExecutorTest extends Te public void testSubmitAndWait() throws Exception { _executor.start(); - Object result = _executor.submitAndWait(new TaskExecutor.Task<Object>() + Object result = _executor.run(new TaskExecutor.Task<Object>() { @Override - public String call() + public String execute() { return "DONE"; } @@ -149,7 +149,7 @@ public class TaskExecutorTest extends Te public void testSubmitAndWaitInNotAuthorizedContext() { _executor.start(); - Object subject = _executor.submitAndWait(new SubjectRetriever()); + Object subject = _executor.run(new SubjectRetriever()); assertNull("Subject must be null", subject); } @@ -162,7 +162,7 @@ public class TaskExecutorTest extends Te @Override public Object run() { - return _executor.submitAndWait(new SubjectRetriever()); + return _executor.run(new SubjectRetriever()); } }); assertEquals("Unexpected subject", subject, result); @@ -176,7 +176,7 @@ public class TaskExecutorTest extends Te @Override public Object run() { - return _executor.submitAndWait(new SubjectRetriever()); + return _executor.run(new SubjectRetriever()); } }); assertEquals("Unexpected subject", null, result); @@ -188,11 +188,11 @@ public class TaskExecutorTest extends Te _executor.start(); try { - _executor.submitAndWait(new TaskExecutor.Task<Object>() + _executor.run(new TaskExecutor.Task<Object>() { @Override - public Void call() + public Void execute() { throw exception; } @@ -215,15 +215,15 @@ public class TaskExecutorTest extends Te @Override public Object run() { - _executor.submitAndWait(new TaskExecutor.Task<Object>() - { - @Override - public Void call() + _executor.run(new TaskExecutor.Task<Object>() { - taskSubject.set(Subject.getSubject(AccessController.getContext())); - return null; - } - }); + @Override + public Void execute() + { + taskSubject.set(Subject.getSubject(AccessController.getContext())); + return null; + } + }); return null; } }); @@ -234,7 +234,7 @@ public class TaskExecutorTest extends Te private class SubjectRetriever implements TaskExecutor.Task<Subject> { @Override - public Subject call() + public Subject execute() { return Subject.getSubject(AccessController.getContext()); } @@ -251,7 +251,7 @@ public class TaskExecutorTest extends Te } @Override - public Void call() + public Void execute() { if (_waitLatch != null) { Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Sun Apr 20 01:32:50 2014 @@ -43,6 +43,7 @@ public class VirtualHostTest extends Qpi private Broker _broker; private StatisticsGatherer _statisticsGatherer; private RecovererProvider _recovererProvider; + private TaskExecutor _taskExecutor; @Override protected void setUp() throws Exception @@ -50,14 +51,22 @@ public class VirtualHostTest extends Qpi super.setUp(); _broker = BrokerTestHelper.createBrokerMock(); - TaskExecutor taskExecutor = mock(TaskExecutor.class); - when(taskExecutor.isTaskExecutorThread()).thenReturn(true); - when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + _taskExecutor = new TaskExecutor(); + _taskExecutor.start(); + when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); _recovererProvider = mock(RecovererProvider.class); _statisticsGatherer = mock(StatisticsGatherer.class); } + + @Override + public void tearDown() throws Exception + { + _taskExecutor.stopImmediately(); + super.tearDown(); + } + public void testInitialisingState() { VirtualHost host = createHost(); Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java Sun Apr 20 01:32:50 2014 @@ -49,6 +49,7 @@ public class FileSystemPreferencesProvid private Broker _broker; private String _user1, _user2; private File _preferencesFile; + private TaskExecutor _taskExecutor; protected void setUp() throws Exception { @@ -60,9 +61,10 @@ public class FileSystemPreferencesProvid _preferencesFile = TestFileUtils.createTempFile(this, ".prefs.json", TEST_PREFERENCES); _broker = BrokerTestHelper.createBrokerMock(); - TaskExecutor taskExecutor = mock(TaskExecutor.class); - when(taskExecutor.isTaskExecutorThread()).thenReturn(true); - when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + _taskExecutor = new TaskExecutor(); + _taskExecutor.start(); + when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_authenticationProvider.getParent(Broker.class)).thenReturn(_broker); } @@ -76,6 +78,7 @@ public class FileSystemPreferencesProvid } BrokerTestHelper.tearDown(); _preferencesFile.delete(); + _taskExecutor.stopImmediately(); } finally { Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Sun Apr 20 01:32:50 2014 @@ -62,7 +62,6 @@ import org.apache.qpid.server.virtualhos import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.server.virtualhost.StandardVirtualHost; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import org.apache.qpid.server.virtualhost.VirtualHostRegistry; public class BrokerTestHelper { @@ -80,17 +79,22 @@ public class BrokerTestHelper { ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(Model.getInstance()); SubjectCreator subjectCreator = mock(SubjectCreator.class); + when(subjectCreator.getMechanisms()).thenReturn(""); Broker broker = mock(Broker.class); when(broker.getConnection_sessionCountLimit()).thenReturn(1); when(broker.getConnection_closeWhenNoRoute()).thenReturn(false); when(broker.getId()).thenReturn(UUID.randomUUID()); when(broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(subjectCreator); - when(broker.getVirtualHostRegistry()).thenReturn(new VirtualHostRegistry(new EventLogger())); when(broker.getSecurityManager()).thenReturn(new SecurityManager(mock(Broker.class), false)); when(broker.getObjectFactory()).thenReturn(objectFactory); when(broker.getEventLogger()).thenReturn(new EventLogger()); when(broker.getCategoryClass()).thenReturn(Broker.class); + + SystemContext systemContext = mock(SystemContext.class); + when(systemContext.getEventLogger()).thenReturn(new EventLogger()); + when(broker.getParent(eq(SystemContext.class))).thenReturn(systemContext); + return broker; } @@ -102,7 +106,7 @@ public class BrokerTestHelper { } - public static VirtualHostImpl createVirtualHost(VirtualHostRegistry virtualHostRegistry, Map<String,Object> attributes) + public static VirtualHostImpl createVirtualHost(Map<String, Object> attributes) throws Exception { @@ -115,7 +119,6 @@ public class BrokerTestHelper ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(Model.getInstance()); Broker broker = mock(Broker.class); when(broker.getParent(eq(SystemContext.class))).thenReturn(systemContext); - when(broker.getVirtualHostRegistry()).thenReturn(virtualHostRegistry); when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR); SecurityManager securityManager = new SecurityManager(broker, false); when(broker.getSecurityManager()).thenReturn(securityManager); @@ -133,11 +136,6 @@ public class BrokerTestHelper public static VirtualHostImpl createVirtualHost(String name) throws Exception { - return createVirtualHost(name, new VirtualHostRegistry(new EventLogger())); - } - - public static VirtualHostImpl createVirtualHost(String name, VirtualHostRegistry virtualHostRegistry) throws Exception - { Map<String,Object> attributes = new HashMap<String, Object>(); attributes.put(org.apache.qpid.server.model.VirtualHost.TYPE, StandardVirtualHost.TYPE); @@ -147,7 +145,7 @@ public class BrokerTestHelper attributes.put(org.apache.qpid.server.model.VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings); attributes.put(org.apache.qpid.server.model.VirtualHost.NAME, name); - return createVirtualHost(virtualHostRegistry, attributes); + return createVirtualHost(attributes); } public static AMQSessionModel createSession(int channelId, AMQConnectionModel connection) Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Sun Apr 20 01:32:50 2014 @@ -66,12 +66,6 @@ public class MockVirtualHost implements } - @Override - public VirtualHostRegistry getVirtualHostRegistry() - { - return null; - } - public AuthenticationManager getAuthenticationManager() { return null; Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Sun Apr 20 01:32:50 2014 @@ -44,6 +44,7 @@ import org.apache.qpid.common.ServerProp import org.apache.qpid.properties.ConnectionStartProperties; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.protocol.AMQConnectionModel; import org.apache.qpid.server.security.SubjectCreator; import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus; @@ -203,7 +204,8 @@ public class ServerConnectionDelegate ex { vhostName = ""; } - vhost = _broker.getVirtualHostRegistry().getVirtualHost(vhostName); + + vhost = ((AmqpPort)sconn.getPort()).getVirtualHost(vhostName); Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ConnectionOpenMethodHandler.java Sun Apr 20 01:32:50 2014 @@ -30,6 +30,7 @@ import org.apache.qpid.framing.AMQShortS import org.apache.qpid.framing.ConnectionOpenBody; import org.apache.qpid.framing.MethodRegistry; import org.apache.qpid.protocol.AMQConstant; +import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession; import org.apache.qpid.server.protocol.v0_8.state.AMQState; import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager; @@ -72,7 +73,7 @@ public class ConnectionOpenMethodHandler virtualHostName = body.getVirtualHost() == null ? null : String.valueOf(body.getVirtualHost()); } - VirtualHostImpl virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName); + VirtualHostImpl virtualHost = ((AmqpPort)stateManager.getProtocolSession().getPort()).getVirtualHost(virtualHostName); if (virtualHost == null) { Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/state/AMQStateManager.java Sun Apr 20 01:32:50 2014 @@ -34,16 +34,13 @@ import org.apache.qpid.protocol.AMQMetho import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.protocol.v0_8.AMQChannel; import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession; -import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.security.SubjectCreator; import org.apache.qpid.server.util.ServerScopedRuntimeException; -import org.apache.qpid.server.virtualhost.VirtualHostRegistry; import javax.security.auth.Subject; -import java.security.PrivilegedAction; + import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.concurrent.CopyOnWriteArraySet; /** * The state manager is responsible for managing the state of the protocol session. <p/> For each AMQProtocolHandler @@ -142,11 +139,6 @@ public class AMQStateManager implements } - public VirtualHostRegistry getVirtualHostRegistry() - { - return _broker.getVirtualHostRegistry(); - } - public AMQProtocolSession getProtocolSession() { return _protocolSession; Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java (original) +++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java Sun Apr 20 01:32:50 2014 @@ -49,6 +49,7 @@ import org.apache.qpid.server.logging.Lo import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Transport; +import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.protocol.AMQConnectionModel; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.SessionModelListener; @@ -133,7 +134,8 @@ public class Connection_1_0 implements C { host = _broker.getDefaultVirtualHost(); } - _vhost = _broker.getVirtualHostRegistry().getVirtualHost(host); + + _vhost = ((AmqpPort)_port).getVirtualHost(host); if(_vhost == null) { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java Sun Apr 20 01:32:50 2014 @@ -35,7 +35,6 @@ import org.apache.qpid.server.model.Brok import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import org.apache.qpid.server.virtualhost.VirtualHostRegistry; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.transport.Sender; import org.apache.qpid.transport.network.NetworkConnection; @@ -51,26 +50,16 @@ public class MultiVersionProtocolEngineF super.setUp(); BrokerTestHelper.setUp(); _broker = BrokerTestHelper.createBrokerMock(); - VirtualHostRegistry virtualHostRegistry = _broker.getVirtualHostRegistry(); when(_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST)).thenReturn("default"); when(_broker.getDefaultVirtualHost()).thenReturn("default"); - // AMQP 1-0 connection needs default vhost to be present - _virtualHost = BrokerTestHelper.createVirtualHost("default", virtualHostRegistry); } @Override protected void tearDown() throws Exception { - try - { - _virtualHost.close(); - } - finally - { BrokerTestHelper.tearDown(); super.tearDown(); - } } private static final byte[] AMQP_0_8_HEADER = Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1588715&r1=1588714&r2=1588715&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Sun Apr 20 01:32:50 2014 @@ -38,7 +38,6 @@ import org.apache.qpid.framing.amqp_8_0. import org.apache.qpid.server.exchange.DirectExchange; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.exchange.TopicExchange; -import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.Binding; @@ -61,7 +60,6 @@ import org.apache.qpid.server.util.Broke import org.apache.qpid.server.virtualhost.AbstractVirtualHost; import org.apache.qpid.server.virtualhost.StandardVirtualHost; import org.apache.qpid.server.virtualhost.VirtualHostImpl; -import org.apache.qpid.server.virtualhost.VirtualHostRegistry; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.util.FileUtils; @@ -180,7 +178,7 @@ public class VirtualHostMessageStoreTest try { - _virtualHost = (AbstractVirtualHost<?>) BrokerTestHelper.createVirtualHost(new VirtualHostRegistry(new EventLogger()), _attributes); + _virtualHost = (AbstractVirtualHost<?>) BrokerTestHelper.createVirtualHost(_attributes); } catch (Exception e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
