diff options
Diffstat (limited to 'java')
17 files changed, 29 insertions, 37 deletions
diff --git a/java/broker-plugins/experimental/SlowConsumerDisconnect/MANIFEST.MF b/java/broker-plugins/experimental/SlowConsumerDisconnect/MANIFEST.MF index 80dcd33efb..ff98e7bdca 100644 --- a/java/broker-plugins/experimental/SlowConsumerDisconnect/MANIFEST.MF +++ b/java/broker-plugins/experimental/SlowConsumerDisconnect/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: qpid_slow_consumer_detection;singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.apache.qpid.server.virtualhost.plugins.Activator Import-Package: org.osgi.framework, - org.apache.qpid.server.configuration.plugin, + org.apache.qpid.server.configuration.plugins, org.apache.qpid.server.configuration, - org.apache.qpid.server.virtualhost.plugin, + org.apache.qpid.server.virtualhost.plugins, org.apache.qpid.server.virtualhost, org.apache.qpid.server.queue, org.apache.qpid.server.registry, diff --git a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/Activator.java b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/Activator.java index 62088e8bb3..c1f5a32c1e 100644 --- a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/Activator.java +++ b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/Activator.java @@ -20,8 +20,8 @@ */ package org.apache.qpid.server.virtualhost.plugin.SlowConsumer; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; -import org.apache.qpid.server.virtualhost.plugin.VirtualHostPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; +import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetection.java b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetection.java index 2f4bf1a528..40b21aec33 100644 --- a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetection.java +++ b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetection.java @@ -23,8 +23,8 @@ package org.apache.qpid.server.virtualhost.plugin.SlowConsumer; import org.apache.log4j.Logger; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.virtualhost.VirtualHost; -import org.apache.qpid.server.virtualhost.plugin.VirtualHostPlugin; -import org.apache.qpid.server.virtualhost.plugin.VirtualHostPluginFactory; +import org.apache.qpid.server.virtualhost.plugins.VirtualHostPlugin; +import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory; class SlowConsumerDetection implements VirtualHostPlugin { diff --git a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionConfiguration.java b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionConfiguration.java index 08dc9d2d09..262edcea16 100644 --- a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionConfiguration.java +++ b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionConfiguration.java @@ -22,8 +22,8 @@ package org.apache.qpid.server.virtualhost.plugin.SlowConsumer; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import java.util.concurrent.TimeUnit; diff --git a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionPolicyConfiguration.java b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionPolicyConfiguration.java index 7a5f1f1bff..e758ef965e 100644 --- a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionPolicyConfiguration.java +++ b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionPolicyConfiguration.java @@ -22,8 +22,8 @@ package org.apache.qpid.server.virtualhost.plugin.SlowConsumer; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import java.util.List; diff --git a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionQueueConfiguration.java b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionQueueConfiguration.java index 1eb79696d2..5230f7940c 100644 --- a/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionQueueConfiguration.java +++ b/java/broker-plugins/experimental/SlowConsumerDisconnect/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumer/SlowConsumerDetectionQueueConfiguration.java @@ -22,8 +22,8 @@ package org.apache.qpid.server.virtualhost.plugin.SlowConsumer; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import org.apache.qpid.server.plugins.PluginManager; import org.apache.qpid.server.registry.ApplicationRegistry; diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java index 3f2966b4a2..9529d1097d 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java @@ -23,8 +23,8 @@ package org.apache.qpid.server.configuration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.log4j.Logger; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import org.apache.qpid.server.registry.ApplicationRegistry; import java.util.Map; diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java index 5c3e0911f5..9da36c9b08 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java @@ -26,7 +26,7 @@ import java.util.HashMap; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; public class QueueConfiguration extends ConfigurationPlugin { diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 27ec80b1f8..96b2e26f3c 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -28,8 +28,8 @@ import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.SystemConfiguration; import org.apache.commons.configuration.XMLConfiguration; import org.apache.qpid.server.configuration.management.ConfigurationManagementMBean; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import org.apache.qpid.server.virtualhost.VirtualHost; import org.apache.qpid.server.virtualhost.VirtualHostRegistry; import org.apache.qpid.server.registry.ApplicationRegistry; diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java index 696a82b8f2..4e29a3e526 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java @@ -26,8 +26,7 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.store.MemoryMessageStore; -import org.apache.qpid.server.configuration.plugin.ConfigurationPlugin; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; import java.util.HashMap; import java.util.Iterator; diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/ConfigurationPlugin.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java index 0822d6debf..dc0410dba6 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/ConfigurationPlugin.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.configuration.plugin; +package org.apache.qpid.server.configuration.plugins; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/ConfigurationPluginFactory.java b/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java index 1286669f22..1e928a1728 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/ConfigurationPluginFactory.java +++ b/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.configuration.plugin; +package org.apache.qpid.server.configuration.plugins; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java index 171de7a701..293a9c5ebc 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java @@ -24,7 +24,7 @@ import org.apache.felix.framework.Felix; import org.apache.felix.framework.cache.BundleCache; import org.apache.felix.framework.util.FelixConstants; import org.apache.felix.framework.util.StringMap; -import org.apache.qpid.server.configuration.plugin.ConfigurationPluginFactory; +import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory; import org.apache.qpid.server.exchange.ExchangeType; import org.apache.qpid.server.security.access.ACLPlugin; import org.apache.qpid.server.security.access.ACLPluginFactory; @@ -33,7 +33,7 @@ import org.apache.qpid.server.security.access.plugins.DenyAll; import org.apache.qpid.server.security.access.plugins.LegacyAccessPlugin; import org.apache.qpid.server.security.access.plugins.SimpleXML; import org.apache.qpid.server.security.access.plugins.network.FirewallPlugin; -import org.apache.qpid.server.virtualhost.plugin.VirtualHostPluginFactory; +import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleException; import org.osgi.util.tracker.ServiceTracker; @@ -84,12 +84,12 @@ public class PluginManager "org.apache.qpid.server.management; version=0.7," + "org.apache.qpid.server.protocol; version=0.7," + "org.apache.qpid.server.virtualhost; version=0.7," + - "org.apache.qpid.server.virtualhost.plugin; version=0.7," + + "org.apache.qpid.server.virtualhost.plugins; version=0.7," + "org.apache.qpid.server.registry; version=0.7," + "org.apache.qpid.server.queue; version=0.7," + "org.apache.qpid.server.binding; version=0.7," + "org.apache.qpid.server.configuration; version=0.7," + - "org.apache.qpid.server.configuration.plugin; version=0.7," + + "org.apache.qpid.server.configuration.plugins; version=0.7," + "org.apache.qpid.server.configuration.management; version=0.7," + "org.apache.qpid.server.persistent; version=0.7," + "org.apache.qpid.server.plugins; version=0.7," + diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java index 5b8f8f0bb8..727e902a0c 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java +++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java @@ -202,7 +202,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry { if (_logger.isInfoEnabled()) { - _logger.info("Shuting down ApplicationRegistry(" + instanceID + "):" + instance); + _logger.info("Shutting down ApplicationRegistry(" + instanceID + "):" + instance); } instance.close(); instance.getBroker().getSystem().removeBroker(instance.getBroker()); @@ -235,7 +235,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry public void configure() throws ConfigurationException { - _logger.error("Configure AR"); _configurationManager = new ConfigurationManager(); @@ -253,18 +252,14 @@ public abstract class ApplicationRegistry implements IApplicationRegistry public void initialise(int instanceID) throws Exception { - _logger.error("Creating RML:" + this); _rootMessageLogger = new RootMessageLoggerImpl(_configuration, new Log4jMessageLogger()); - _logger.error("Created RML:" + _rootMessageLogger + ":" + this); _registryName = String.valueOf(instanceID); // Set the Actor for current log messages CurrentActor.set(new BrokerActor(_registryName, _rootMessageLogger)); - _logger.error("Init AR:" + this); configure(); - _logger.error("Configured AR:" + this); _qmfService = new QMFService(getConfigStore(), this); @@ -325,8 +320,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry try { _logger.info("Creating DEFAULT_APPLICATION_REGISTRY: " + _APPLICATION_REGISTRY + " : Instance:" + instanceID); - new Exception().printStackTrace(System.out); - new Exception().printStackTrace(System.err); IApplicationRegistry registry = (IApplicationRegistry) Class.forName(_APPLICATION_REGISTRY).getConstructor((Class[]) null).newInstance((Object[]) null); ApplicationRegistry.initialise(registry, instanceID); _logger.info("Initialised Application Registry:" + instanceID); diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java index 8d78415056..4331bbf972 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java +++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java @@ -28,8 +28,8 @@ import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.server.AMQBrokerManagerMBean; -import org.apache.qpid.server.virtualhost.plugin.VirtualHostPluginFactory; -import org.apache.qpid.server.virtualhost.plugin.VirtualHostPlugin; +import org.apache.qpid.server.virtualhost.plugins.VirtualHostPluginFactory; +import org.apache.qpid.server.virtualhost.plugins.VirtualHostPlugin; import org.apache.qpid.server.binding.BindingFactory; import org.apache.qpid.server.configuration.BrokerConfig; import org.apache.qpid.server.configuration.ConfigStore; diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/VirtualHostPlugin.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java index d3b97ff40c..6c9526346c 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/VirtualHostPlugin.java +++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.virtualhost.plugin; +package org.apache.qpid.server.virtualhost.plugins; public interface VirtualHostPlugin extends Runnable { diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/VirtualHostPluginFactory.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java index bde60fc9ae..c32ff76f81 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/VirtualHostPluginFactory.java +++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.virtualhost.plugin; +package org.apache.qpid.server.virtualhost.plugins; import org.apache.qpid.server.virtualhost.VirtualHost; |