diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-07-05 11:14:27 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-07-05 11:14:27 +0000 |
| commit | 3b36be271b8d07cbd99b9b9830f0a729232b2f5c (patch) | |
| tree | 08b798e70fb2c10601f6b6348a488bf21e7e98dd /qpid/java/broker-plugins | |
| parent | e06552778b981fad355d3eb5b03df84de65380e6 (diff) | |
| download | qpid-python-3b36be271b8d07cbd99b9b9830f0a729232b2f5c.tar.gz | |
QPID-2681 : Update SCD config to exist in topic/topics sections
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@960542 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
3 files changed, 6 insertions, 4 deletions
diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java index 4527fa576b..01ebab8122 100644 --- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java +++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java @@ -28,7 +28,7 @@ import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import java.util.Arrays; import java.util.List; -public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugin +public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugin { public static class SlowConsumerDetectionPolicyConfigurationFactory implements ConfigurationPluginFactory { @@ -45,7 +45,7 @@ public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugi "virtualhosts.virtualhost.queues.slow-consumer-detection.policy", "virtualhosts.virtualhost.queues.queue.slow-consumer-detection.policy", "virtualhosts.virtualhost.topics.slow-consumer-detection.policy", - "virtualhosts.virtualhost.queues.topics.topic.slow-consumer-detection.policy"); + "virtualhosts.virtualhost.topics.topic.slow-consumer-detection.policy"); } } diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java index 0949204a33..161a06ed7b 100644 --- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java +++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java @@ -53,7 +53,7 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin "virtualhosts.virtualhost.queues.slow-consumer-detection", "virtualhosts.virtualhost.queues.queue.slow-consumer-detection", "virtualhosts.virtualhost.topics.slow-consumer-detection", - "virtualhosts.virtualhost.queues.topics.topic.slow-consumer-detection"); + "virtualhosts.virtualhost.topics.topic.slow-consumer-detection"); } } diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java index 74b5a12d20..baf71b638f 100644 --- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java +++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java @@ -48,7 +48,9 @@ public class TopicDeletePolicyConfiguration extends ConfigurationPlugin { return Arrays.asList( "virtualhosts.virtualhost.queues.slow-consumer-detection.policy.topicDelete", - "virtualhosts.virtualhost.queues.queue.slow-consumer-detection.policy.topicDelete"); + "virtualhosts.virtualhost.queues.queue.slow-consumer-detection.policy.topicDelete", + "virtualhosts.virtualhost.topics.slow-consumer-detection.policy.topicDelete", + "virtualhosts.virtualhost.topics.topic.slow-consumer-detection.policy.topicDelete"); } } |