summaryrefslogtreecommitdiff
path: root/java/broker-plugins
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-07-05 11:14:27 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-07-05 11:14:27 +0000
commit34dc981bac5559797dc3588a7b38c48ff51d82d3 (patch)
tree37d58793c98a70d63f3a20501a4183f5cd01b62f /java/broker-plugins
parentc06c4e432678be258d11a9d1452e72d1520244d7 (diff)
downloadqpid-python-34dc981bac5559797dc3588a7b38c48ff51d82d3.tar.gz
QPID-2681 : Update SCD config to exist in topic/topics sections
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@960542 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins')
-rw-r--r--java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java4
-rw-r--r--java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java2
-rw-r--r--java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java4
3 files changed, 6 insertions, 4 deletions
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
index 4527fa576b..01ebab8122 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
+++ b/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/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
index 0949204a33..161a06ed7b 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
+++ b/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/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java b/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
index 74b5a12d20..baf71b638f 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
+++ b/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");
}
}