From f2f70ed3341ba85162ea88fbd51c937cfdac9580 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Mon, 13 Apr 2009 13:54:54 +0000 Subject: QPID-1612: more fixups as other stuff hasnt followed git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764468 13f79535-47bb-0310-9956-ffa450edef68 --- .../MultipleJCAProviderRegistrationTest.java | 2 +- .../qpid/server/security/acl/SimpleACLTest.java | 2 +- .../apache/qpid/server/store/SlowMessageStore.java | 7 ++++--- .../test/client/timeouts/SyncWaitDelayTest.java | 22 ++++++++++++---------- .../org/apache/qpid/test/utils/QpidTestCase.java | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java index ea0bae7a56..22b1a38574 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java @@ -61,7 +61,7 @@ public class MultipleJCAProviderRegistrationTest extends QpidTestCase ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile); // This is a bit evil it should be updated with QPID-1103 - config.getConfiguration().setProperty("management.enabled", "false"); + config.getConfiguration().setManagementEnabled(false); startBroker(); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java index e6c9f43ffb..edf390b752 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java @@ -63,7 +63,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile); // This is a bit evil it should be updated with QPID-1103 - config.getConfiguration().setProperty("management.enabled", "false"); + config.getConfiguration().setManagementEnabled(false); ApplicationRegistry.initialise(config, 1); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java index 92a142e402..9790f07cea 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java @@ -27,6 +27,7 @@ import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.abstraction.ContentChunk; import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.configuration.VirtualHostConfiguration; import org.apache.qpid.server.exchange.Exchange; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.MessageMetaData; @@ -46,14 +47,14 @@ public class SlowMessageStore implements MessageStore private static final String POST = "post"; private String DEFAULT_DELAY = "default"; - public void configure(VirtualHost virtualHost, String base, Configuration config) throws Exception + public void configure(VirtualHost virtualHost, String base, VirtualHostConfiguration config) throws Exception { _logger.info("Starting SlowMessageStore on Virtualhost:" + virtualHost.getName()); - Configuration delays = config.subset(base + "." + DELAYS); + Configuration delays = config.getStoreConfiguration().subset(DELAYS); configureDelays(delays); - String messageStoreClass = config.getString(base + ".store.class"); + String messageStoreClass = config.getMessageStoreClass(); if (delays.containsKey(DEFAULT_DELAY)) { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java index f2c8a5e1f5..67e2213e63 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java @@ -22,6 +22,7 @@ package org.apache.qpid.test.client.timeouts; import org.apache.commons.configuration.Configuration; import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry; +import org.apache.commons.configuration.XMLConfiguration; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.client.transport.TransportConnection; @@ -67,16 +68,17 @@ public class SyncWaitDelayTest extends QpidTestCase fail("Unable to test without config file:" + _configFile); } - ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(_configFile); - - //Disable management on broker. - config.getConfiguration().setProperty("management.enabled", "false"); - - Configuration testVirtualhost = config.getConfiguration().subset("virtualhosts.virtualhost." + VIRTUALHOST); - testVirtualhost.setProperty("store.class", "org.apache.qpid.server.store.SlowMessageStore"); - testVirtualhost.setProperty("store.delays.commitTran.post", POST_COMMIT_DELAY); - - startBroker(1, config); + XMLConfiguration configuration = new XMLConfiguration(_configFile); + configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore"); + configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", POST_COMMIT_DELAY); + configuration.setProperty("management.enabled", "false"); + + File tmpFile = File.createTempFile("configFile", "test"); + tmpFile.deleteOnExit(); + configuration.save(tmpFile); + + ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(tmpFile); + startBroker(1, reg); //Set the syncWrite timeout to be just larger than the delay on the commitTran. setSystemProperty("amqj.default_syncwrite_timeout", String.valueOf(SYNC_WRITE_TIMEOUT)); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index d0bb265a0c..eddd9ed538 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -290,7 +290,7 @@ public class QpidTestCase extends TestCase } } - public void startBroker(int port, ConfigurationFileApplicationRegistry config) throws Exception + public void startBroker(int port, ApplicationRegistry config) throws Exception { ApplicationRegistry.initialise(config, port); startBroker(port); -- cgit v1.2.1