diff options
| author | Keith Wall <kwall@apache.org> | 2014-07-20 09:18:41 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-07-20 09:18:41 +0000 |
| commit | cd126b93a9ec0b3891e19a2b3012e5ccc222cbbd (patch) | |
| tree | c49ea400c3d846b17488c15dac9b1404baea02b9 /qpid/java/systests/src/main/java/org/apache | |
| parent | f6d0e98d352eaa20596906e0a54316b023d99c33 (diff) | |
| download | qpid-python-cd126b93a9ec0b3891e19a2b3012e5ccc222cbbd.tar.gz | |
QPID-5867: [Java Broker] Allow the virtualhost's permitted node list to passed via the virtualhostnode's virtualhost blueprint context variable.
Work completed by Andrew MacBean <macbean@apache.org> and me.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1612064 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src/main/java/org/apache')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java | 4 | ||||
| -rwxr-xr-x | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java index dcab2cbe76..7916f39488 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java @@ -32,7 +32,7 @@ import javax.jms.Session; import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl; import org.apache.qpid.test.utils.QpidBrokerTestCase; @@ -88,7 +88,7 @@ public class SplitStoreTest extends QpidBrokerTestCase { final String blueprint = String.format( "{ \"type\" : \"%s\", \"storePath\" : \"%s\" }", virtualHostType, _messageStorePath); - final Map<String, String> contextMap = Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, + final Map<String, String> contextMap = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint); TestBrokerConfiguration config = getBrokerConfiguration(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 67cc87e103..2ccf85c5a5 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -69,7 +69,7 @@ import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.store.MemoryConfigurationStore; -import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.util.FileUtils; @@ -873,7 +873,7 @@ public class QpidBrokerTestCase extends QpidTestCase final String blueprint = getTestProfileVirtualHostNodeBlueprint(); - attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, + attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint)); int port = getPort(brokerPort); |