qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject svn commit: r966637 - in /qpid/trunk/qpid/java: broker-plugins/experimental/slowconsumerdetection/ broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/ broker-plugins/experimental/slowconsumerdete...
Date Thu, 22 Jul 2010 13:09:57 GMT
Author: grkvlt
Date: Thu Jul 22 13:09:56 2010
New Revision: 966637

URL: http://svn.apache.org/viewvc?rev=966637&view=rev
Log:
QPID-1440: Move slow consumer disconnection mechanism to the broker

Added:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/MergeConfigurationTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SubscriptionTest.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TestingBaseCase.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
      - copied, changed from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TopicTest.java
Removed:
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/MANIFEST.MF
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/build.xml
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
    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/Activator.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/MergeConfigurationTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SubscriptionTest.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TestingBaseCase.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TopicTest.java
Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
(from r966634, 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/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
(from r966634, 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/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java&r1=966634&r2=966637&rev=966637&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/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
Thu Jul 22 13:09:56 2010
@@ -98,7 +98,7 @@ public class SlowConsumerDetectionQueueC
         SlowConsumerDetectionPolicyConfiguration policyConfig = getConfiguration(SlowConsumerDetectionPolicyConfiguration.class.getName());
 
         PluginManager pluginManager = ApplicationRegistry.getInstance().getPluginManager();
-        Map<String, SlowConsumerPolicyPluginFactory> factories = pluginManager.getPlugins(SlowConsumerPolicyPluginFactory.class);
+        Map<String, SlowConsumerPolicyPluginFactory> factories = pluginManager.getSlowConsumerPlugins();
 
         if (policyConfig == null)
         {

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=966637&r1=966636&r2=966637&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
Thu Jul 22 13:09:56 2010
@@ -35,6 +35,9 @@ import org.apache.felix.framework.util.S
 import org.apache.log4j.Logger;
 import org.apache.qpid.common.Closeable;
 import org.apache.qpid.server.configuration.TopicConfiguration;
+import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionConfiguration.SlowConsumerDetectionConfigurationFactory;
+import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionPolicyConfiguration.SlowConsumerDetectionPolicyConfigurationFactory;
+import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionQueueConfiguration.SlowConsumerDetectionQueueConfigurationFactory;
 import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
 import org.apache.qpid.server.exchange.ExchangeType;
 import org.apache.qpid.server.security.SecurityManager;
@@ -43,6 +46,9 @@ import org.apache.qpid.server.security.a
 import org.apache.qpid.server.security.access.plugins.DenyAll;
 import org.apache.qpid.server.security.access.plugins.LegacyAccess;
 import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory;
+import org.apache.qpid.server.virtualhost.plugin.SlowConsumerDetection;
+import org.apache.qpid.server.virtualhost.plugin.policies.TopicDeletePolicy;
+import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPluginFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.launch.Framework;
@@ -57,7 +63,6 @@ public class PluginManager implements Cl
     private static final Logger _logger = Logger.getLogger(PluginManager.class);
 
     private static final int FELIX_STOP_TIMEOUT = 30000;
-    private static final String VERSION = "2.6.0.4";
 
     private Framework _felix;
 
@@ -65,11 +70,14 @@ public class PluginManager implements Cl
     private ServiceTracker _securityTracker = null;
     private ServiceTracker _configTracker = null;
     private ServiceTracker _virtualHostTracker = null;
+    private ServiceTracker _policyTracker = null;
 
     private Activator _activator;
 
     private Map<String, SecurityPluginFactory> _securityPlugins = new HashMap<String,
SecurityPluginFactory>();
     private Map<List<String>, ConfigurationPluginFactory> _configPlugins = new
IdentityHashMap<List<String>, ConfigurationPluginFactory>();
+    private Map<String, VirtualHostPluginFactory> _vhostPlugins = new HashMap<String,
VirtualHostPluginFactory>();
+    private Map<String, SlowConsumerPolicyPluginFactory> _policyPlugins = new HashMap<String,
SlowConsumerPolicyPluginFactory>();
 
     public PluginManager(String pluginPath, String cachePath) throws Exception
     {
@@ -85,10 +93,23 @@ public class PluginManager implements Cl
                 SecurityManager.SecurityConfiguration.FACTORY,
                 AllowAll.AllowAllConfiguration.FACTORY,
                 DenyAll.DenyAllConfiguration.FACTORY,
-                LegacyAccess.LegacyAccessConfiguration.FACTORY))
+                LegacyAccess.LegacyAccessConfiguration.FACTORY,
+                new SlowConsumerDetectionConfigurationFactory(),
+                new SlowConsumerDetectionPolicyConfigurationFactory(),
+                new SlowConsumerDetectionQueueConfigurationFactory()))
         {
             _configPlugins.put(configFactory.getParentPaths(), configFactory);
         }
+        for (SlowConsumerPolicyPluginFactory pluginFactory : Arrays.asList(
+                new TopicDeletePolicy.TopicDeletePolicyFactory()))
+        {
+            _policyPlugins.put(pluginFactory.getPluginName(), pluginFactory);
+        }
+        for (VirtualHostPluginFactory pluginFactory : Arrays.asList(
+                new SlowConsumerDetection.SlowConsumerFactory()))
+        {
+            _vhostPlugins.put(pluginFactory.getClass().getName(), pluginFactory);
+        }
 
         // Check the plugin directory path is set and exist
         if (pluginPath == null)
@@ -117,6 +138,7 @@ public class PluginManager implements Cl
                 "org.apache.qpid.common; version=0.7," +
                 "org.apache.qpid.exchange; version=0.7," +
                 "org.apache.qpid.framing; version=0.7," +
+                "org.apache.qpid.management.common.mbeans.annotations; version=0.7," +
                 "org.apache.qpid.protocol; version=0.7," +
                 "org.apache.qpid.server.binding; version=0.7," +
                 "org.apache.qpid.server.configuration; version=0.7," +
@@ -157,7 +179,7 @@ public class PluginManager implements Cl
         configMap.put(SYSTEMBUNDLE_ACTIVATORS_PROP, activators);
 
         if (cachePath != null)
-            {
+        {
             File cacheDir = new File(cachePath);
             if (!cacheDir.exists() && cacheDir.canWrite())
             {
@@ -204,12 +226,11 @@ public class PluginManager implements Cl
 
         _virtualHostTracker = new ServiceTracker(_activator.getContext(), VirtualHostPluginFactory.class.getName(),
null);
         _virtualHostTracker.open();
-
-        _logger.info("Opened service trackers");
+ 
+        _policyTracker = new ServiceTracker(_activator.getContext(), SlowConsumerPolicyPluginFactory.class.getName(),
null);
+        _policyTracker.open();
         
-        // Load security and configuration plugins from their trackers for access
-        _configPlugins.putAll(getConfigurationServices());
-        _securityPlugins.putAll(getPlugins(SecurityPluginFactory.class));
+        _logger.info("Opened service trackers");
     }
 
     private static <T> Map<String, T> getServices(ServiceTracker tracker)
@@ -234,11 +255,18 @@ public class PluginManager implements Cl
         return services;
     }
 
-    private Map<List<String>, ConfigurationPluginFactory> getConfigurationServices()
+    public static <T> Map<String, T> getServices(ServiceTracker tracker, Map<String,
T> plugins)
+    {   
+        Map<String, T> services = getServices(tracker);
+        services.putAll(plugins);
+        return services;
+    }
+
+    public Map<List<String>, ConfigurationPluginFactory> getConfigurationPlugins()
     {   
         Map<List<String>, ConfigurationPluginFactory> services = new IdentityHashMap<List<String>,
ConfigurationPluginFactory>();
         
-        if (_configTracker.getServices() != null)
+        if (_configTracker != null && _configTracker.getServices() != null)
         {
             for (Object service : _configTracker.getServices())
             {
@@ -246,49 +274,30 @@ public class PluginManager implements Cl
                 services.put(factory.getParentPaths(), factory);
             }
         }
+        
+        services.putAll(_configPlugins);
 
         return services;
     }
 
-    public Map<String, ExchangeType<?>> getExchanges()
-    {
-        return getServices(_exchangeTracker);
+    public Map<String, VirtualHostPluginFactory> getVirtualHostPlugins()
+    {   
+        return getServices(_virtualHostTracker, _vhostPlugins);
     }
 
-    public Map<String, VirtualHostPluginFactory> getVirtualHostPlugins()
-    {
-        return getServices(_virtualHostTracker);
+    public Map<String, SlowConsumerPolicyPluginFactory> getSlowConsumerPlugins()
+    {   
+        return getServices(_policyTracker, _policyPlugins);
     }
 
-    public <P extends PluginFactory<?>> Map<String, P> getPlugins(Class<P>
plugin)
+    public Map<String, ExchangeType<?>> getExchanges()
     {
-        // If plugins are not configured then return an empty set
-        if (_activator == null)
-        {
-            return new HashMap<String, P>();
-        }
-
-        ServiceTracker tracker = new ServiceTracker(_activator.getContext(), plugin.getName(),
null);
-        tracker.open();
-
-        try
-        {
-            return getServices(tracker);
-        }
-        finally
-        {
-            tracker.close();
-        }
+        return getServices(_exchangeTracker);
     }
     
     public Map<String, SecurityPluginFactory> getSecurityPlugins()
     {
-        return _securityPlugins;
-    }
-    
-    public Map<List<String>, ConfigurationPluginFactory> getConfigurationPlugins()
-    {
-        return _configPlugins;
+        return getServices(_securityTracker, _securityPlugins);
     }
 
     public void close()
@@ -302,6 +311,7 @@ public class PluginManager implements Cl
                 _securityTracker.close();
                 _configTracker.close();
                 _virtualHostTracker.close();
+                _policyTracker.close();
             }
             finally
             {

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/ConfiguredQueueBindingListener.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
Thu Jul 22 13:09:56 2010
@@ -35,7 +35,7 @@ import org.apache.qpid.server.virtualhos
 import org.apache.qpid.server.virtualhost.plugins.VirtualHostHouseKeepingPlugin;
 import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory;
 
-class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
+public class SlowConsumerDetection extends VirtualHostHouseKeepingPlugin
 {
     private SlowConsumerDetectionConfiguration _config;
     private ConfiguredQueueBindingListener _listener;

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/SlowConsumerDetection_logmessages.properties&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/TopicDeletePolicy_logmessages.properties&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
(from r966634, 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/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java?p2=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
(original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
Thu Jul 22 13:09:56 2010
@@ -1,5 +1,4 @@
 /*
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +15,6 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- *
  */
 package org.apache.qpid.server.virtualhost.plugin;
 
@@ -29,21 +27,21 @@ import org.apache.qpid.server.util.Inter
 /**
  * Unit test the QueueConfiguration processing.
  *
- * This is slightly awkward as the SCDQC requries that a policy be available.
- *
- * So all the Valid test much catch the ensuing ConfigurationException and
- * validate that the error is due to a lack of a valid Policy
+ * This is slightly awkward as the {@link SlowConsumerDetectionQueueConfiguration}
+ * requries that a policy be available.
+ * <p>
+ * So all the Valid test much catch the ensuing {@link ConfigurationException} and
+ * validate that the error is due to a lack of a valid policy.
  */
 public class SlowConsumerDetectionQueueConfigurationTest extends InternalBrokerBaseCase
 {
-
     /**
      * Test a fully loaded configuration file.
      *
      * It is not an error to have all control values specified.
-     *
-     * Here we need to catch the ConfigurationException that ensures due to lack
-     * of a Policy Plugin
+     * <p>
+     * Here we need to catch the {@link ConfigurationException} that ensues due to lack
+     * of a policy plugin.
      */
     public void testConfigLoadingValidConfig()
     {
@@ -66,13 +64,13 @@ public class SlowConsumerDetectionQueueC
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
-                         e.getMessage());
+            assertTrue("Exception message incorrect, was: " + e.getMessage(),
+                    e.getMessage().startsWith("No Slow Consumer Policy specified. Known Policies:["));
         }
     }
 
     /**
-     * When we do not specify any control value then a ConfigurationException
+     * When we do not specify any control value then a {@link ConfigurationException}
      * must be thrown to remind us.
      */
     public void testConfigLoadingMissingConfig()
@@ -101,8 +99,8 @@ public class SlowConsumerDetectionQueueC
     /**
      * Setting messageAge on its own is enough to have a valid configuration
      *
-     * Here we need to catch the ConfigurationException that ensures due to lack
-     * of a Policy Plugin
+     * Here we need to catch the {@link ConfigurationException} that ensues due to lack
+     * of a policy plugin.
      */
     public void testConfigLoadingMessageAgeOk()
     {
@@ -122,16 +120,16 @@ public class SlowConsumerDetectionQueueC
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
-                         e.getMessage());
+            assertTrue("Exception message incorrect, was: " + e.getMessage(),
+                    e.getMessage().startsWith("No Slow Consumer Policy specified. Known Policies:["));
         }
     }
 
     /**
-     * Setting depth on its own is enough to have a valid configuration
+     * Setting depth on its own is enough to have a valid configuration.
      *
-     * Here we need to catch the ConfigurationException that ensures due to lack
-     * of a Policy Plugin
+     * Here we need to catch the {@link ConfigurationException} that ensues due to lack
+     * of a policy plugin.
      */
     public void testConfigLoadingDepthOk()
     {
@@ -151,16 +149,16 @@ public class SlowConsumerDetectionQueueC
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
-                         e.getMessage());
+            assertTrue("Exception message incorrect, was: " + e.getMessage(),
+                    e.getMessage().startsWith("No Slow Consumer Policy specified. Known Policies:["));
         }
     }
 
     /**
-     * Setting messageCount on its own is enough to have a valid configuration
+     * Setting messageCount on its own is enough to have a valid configuration.
      *
-     * Here we need to catch the ConfigurationException that ensures due to lack
-     * of a Policy Plugin
+     * Here we need to catch the {@link ConfigurationException} that ensues due to lack
+     * of a policy plugin.
      */
     public void testConfigLoadingMessageCountOk()
     {
@@ -180,8 +178,8 @@ public class SlowConsumerDetectionQueueC
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
-                         e.getMessage());
+            assertTrue("Exception message incorrect, was: " + e.getMessage(),
+                    e.getMessage().startsWith("No Slow Consumer Policy specified. Known Policies:["));
         }
     }
 }

Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java?p2=qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/MergeConfigurationTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/MergeConfigurationTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SubscriptionTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SubscriptionTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TestingBaseCase.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TestingBaseCase.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
(from r966634, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TopicTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java?p2=qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/TopicTest.java&r1=966634&r2=966637&rev=966637&view=diff
==============================================================================
    (empty)



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message