From c4f7a811226cd0342a6fe3a3845d8aea7fad2a09 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 17 Jun 2013 08:11:06 +0000 Subject: Initial change to separate virtual hosts into types git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-vhost-refactor@1493675 13f79535-47bb-0310-9956-ffa450edef68 --- java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java | 1 + .../src/main/java/org/apache/qpid/server/store/SlowMessageStore.java | 2 +- .../systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java | 3 ++- .../main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java | 2 ++ .../main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java | 2 ++ .../java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java | 5 ++++- 6 files changed, 12 insertions(+), 3 deletions(-) (limited to 'java/systests') diff --git a/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java b/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java index 7492d062fd..a19ba21c5c 100644 --- a/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java +++ b/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java @@ -26,6 +26,7 @@ import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE; import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD; import java.util.Arrays; +import javax.net.ssl.SSLSocket; import org.apache.commons.configuration.ConfigurationException; import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.client.AMQTestConnection_0_10; diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java index cff77711ca..ed76c40717 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java +++ b/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java @@ -35,7 +35,7 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Iterator; -public class SlowMessageStore implements MessageStore +public class SlowMessageStore implements MessageStore, DurableConfigurationStore { private static final Logger _logger = Logger.getLogger(SlowMessageStore.class); private static final String DELAYS = "delays"; diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java index deaac2dd2a..1d1c474be0 100644 --- a/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java +++ b/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java @@ -50,7 +50,8 @@ 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.CREATED, VirtualHost.UPDATED, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.STORE_PATH, + VirtualHost.CONFIG_PATH, VirtualHost.TYPE); assertEquals("Unexpected value of attribute " + VirtualHost.NAME, virtualHostName, virtualHost.get(VirtualHost.NAME)); assertNotNull("Unexpected value of attribute " + VirtualHost.ID, virtualHost.get(VirtualHost.ID)); diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java index 1823b59ba3..940d6a3298 100644 --- a/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java +++ b/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java @@ -37,6 +37,7 @@ import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.queue.AMQQueueFactory; +import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory; import org.apache.qpid.test.utils.TestFileUtils; import org.apache.qpid.util.FileUtils; import org.codehaus.jackson.JsonGenerationException; @@ -564,6 +565,7 @@ public class VirtualHostRestTest extends QpidRestTestCase } else { + hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE); hostData.put(VirtualHost.STORE_PATH, storePath); hostData.put(VirtualHost.STORE_TYPE, storeType); } diff --git a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java b/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java index acad55417a..666449b658 100644 --- a/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java +++ b/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java @@ -43,6 +43,7 @@ import org.apache.qpid.server.security.acl.AbstractACLTestCase; import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory; import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory; import org.apache.qpid.server.security.group.FileGroupManagerFactory; +import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; import org.apache.qpid.test.utils.TestFileUtils; @@ -981,6 +982,7 @@ public class BrokerACLTest extends QpidRestTestCase hostData.put(VirtualHost.NAME, hostName); hostData.put(VirtualHost.STORE_PATH, getStoreLocation(hostName)); hostData.put(VirtualHost.STORE_TYPE, getTestProfileMessageStoreType()); + hostData.put(VirtualHost.TYPE, StandardVirtualHostFactory.TYPE); return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData); } diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java index 9bf7dbd62a..4a81480671 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.test.client.timeouts; +import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +55,8 @@ public class SyncWaitDelayTest extends QpidBrokerTestCase public void setUp() throws Exception { + setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".type", + StandardVirtualHostFactory.TYPE); setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore"); setVirtualHostConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY)); @@ -64,7 +67,7 @@ public class SyncWaitDelayTest extends QpidBrokerTestCase _connection = getConnection(); - //Create Queue + //Create Queue _queue = (Queue) getInitialContext().lookup("queue"); //Create Consumer -- cgit v1.2.1