Author: aidan
Date: Mon Apr 13 13:54:54 2009
New Revision: 764468
URL: http://svn.apache.org/viewvc?rev=764468&view=rev
Log:
QPID-1612: more fixups as other stuff hasnt followed
Modified:
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java?rev=764468&r1=764467&r2=764468&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
Mon Apr 13 13:54:54 2009
@@ -61,7 +61,7 @@
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();
}
Modified:
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java?rev=764468&r1=764467&r2=764468&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
Mon Apr 13 13:54:54 2009
@@ -63,7 +63,7 @@
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);
Modified:
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=764468&r1=764467&r2=764468&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
Mon Apr 13 13:54:54 2009
@@ -27,6 +27,7 @@
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 @@
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))
{
Modified:
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=764468&r1=764467&r2=764468&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
Mon Apr 13 13:54:54 2009
@@ -22,6 +22,7 @@
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 @@
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));
Modified:
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=764468&r1=764467&r2=764468&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Mon Apr 13 13:54:54 2009
@@ -290,7 +290,7 @@
}
}
- public void startBroker(int port, ConfigurationFileApplicationRegistry
config) throws Exception
+ public void startBroker(int port, ApplicationRegistry config) throws
Exception
{
ApplicationRegistry.initialise(config, port);
startBroker(port);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
