diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-05-18 14:43:42 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-05-18 14:43:42 +0000 |
| commit | fe6b4a3338ead258bbff3fd6c0998c7bcdf30e93 (patch) | |
| tree | ad51b0a8f6829c1d31ed665855a2e84efda2dc31 /qpid/java/broker/src/main | |
| parent | 5cab7ece402ff44d0321706d4fb85b32706a77dd (diff) | |
| download | qpid-python-fe6b4a3338ead258bbff3fd6c0998c7bcdf30e93.tar.gz | |
QPID-2614 : Update QueueConfiguration to take two parameters, moved Munging code from VHC to QC.
Updated Test.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@945680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
2 files changed, 10 insertions, 8 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java index 9da36c9b08..8e64aee174 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.HashMap; +import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; @@ -35,13 +36,17 @@ public class QueueConfiguration extends ConfigurationPlugin private String _name; private VirtualHostConfiguration _vHostConfig; - public QueueConfiguration(String name, Configuration config, VirtualHostConfiguration virtualHostConfiguration) throws ConfigurationException + public QueueConfiguration(String name, VirtualHostConfiguration virtualHostConfiguration) throws ConfigurationException { _vHostConfig = virtualHostConfiguration; - _config = config; _name = name; - setConfiguration("virtualhosts.virtualhost.queues.queue", config); + CompositeConfiguration mungedConf = new CompositeConfiguration(); + mungedConf.addConfiguration(_vHostConfig.getConfig().subset("queues.queue." + name)); + mungedConf.addConfiguration(_vHostConfig.getConfig().subset("queues")); + _config = mungedConf; + + setConfiguration("virtualhosts.virtualhost.queues.queue", mungedConf); } public String[] getElementsProcessed() diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java index 09ae3bd920..d3e5921e79 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java @@ -64,10 +64,7 @@ public class VirtualHostConfiguration extends ConfigurationPlugin while (i.hasNext()) { String queueName = (String) i.next(); - CompositeConfiguration mungedConf = new CompositeConfiguration(); - mungedConf.addConfiguration(_config.subset("queues.queue." + queueName)); - mungedConf.addConfiguration(_config.subset("queues")); - _queues.put(queueName, new QueueConfiguration(queueName, mungedConf, this)); + _queues.put(queueName, new QueueConfiguration(queueName, this)); } i = _config.getList("exchanges.exchange.name").iterator(); @@ -149,7 +146,7 @@ public class VirtualHostConfiguration extends ConfigurationPlugin { try { - return new QueueConfiguration(queueName, new PropertiesConfiguration(), this); + return new QueueConfiguration(queueName, this); } catch (ConfigurationException e) { |