Author: ritchiem Date: Mon Jul 5 11:14:27 2010 New Revision: 960542 URL: http://svn.apache.org/viewvc?rev=960542&view=rev Log: QPID-2681 : Update SCD config to exist in topic/topics sections
Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java?rev=960542&r1=960541&r2=960542&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java (original) +++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java Mon Jul 5 11:14:27 2010 @@ -28,7 +28,7 @@ import org.apache.qpid.server.configurat 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 SlowConsumerDetectionPolicy "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"); } } Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java?rev=960542&r1=960541&r2=960542&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java (original) +++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java Mon Jul 5 11:14:27 2010 @@ -53,7 +53,7 @@ public class SlowConsumerDetectionQueueC "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"); } } Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java?rev=960542&r1=960541&r2=960542&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java (original) +++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java Mon Jul 5 11:14:27 2010 @@ -48,7 +48,9 @@ public class TopicDeletePolicyConfigurat { 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"); } } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org