You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/06/14 14:36:57 UTC
svn commit: r954433 - in /qpid/trunk/qpid/java:
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/
broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/
bro...
Author: ritchiem
Date: Mon Jun 14 12:36:56 2010
New Revision: 954433
URL: http://svn.apache.org/viewvc?rev=954433&view=rev
Log:
QPID-2638 : Add initial support for Topics section in configuration file.
Added getQueueConfiguration(AMQQueue) which will return a new configuration for the given queue reflecting its binding status. This will allow the queue
to be reconfigured during the binding process. Full Docs on this approach to appear on wiki.
AMQQueue.configure and getConfiguration() have been updated to use ConfigurationPlugin rather than QueueConfiguration, The queue may be configured by a TopicConfiguration now.
Update SlowConsumerTest to be GlobalQueuesTest and add a GlobalTopicsTest to match, where the config is added to the queues or topics section respectively
Added:
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java
- copied, changed from r954432, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SlowConsumerTest.java
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
Removed:
qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SlowConsumerTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.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/SlowConsumerDetection.java
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/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java Mon Jun 14 12:36:56 2010
@@ -60,7 +60,7 @@ public class AccessControl extends Abstr
public AccessControl newInstance(ConfigurationPlugin config) throws ConfigurationException
{
- AccessControlConfiguration configuration = config.getConfiguration(AccessControlConfiguration.class);
+ AccessControlConfiguration configuration = config.getConfiguration(AccessControlConfiguration.class.getName());
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
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=954433&r1=954432&r2=954433&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 Jun 14 12:36:56 2010
@@ -95,7 +95,7 @@ public class SlowConsumerDetectionQueueC
"('messageAge','depth' or 'messageCount') must be specified.");
}
- SlowConsumerDetectionPolicyConfiguration policyConfig = getConfiguration(SlowConsumerDetectionPolicyConfiguration.class);
+ SlowConsumerDetectionPolicyConfiguration policyConfig = getConfiguration(SlowConsumerDetectionPolicyConfiguration.class.getName());
PluginManager pluginManager = ApplicationRegistry.getInstance().getPluginManager();
Map<String, SlowConsumerPolicyPluginFactory> factories = pluginManager.getPlugins(SlowConsumerPolicyPluginFactory.class);
Modified: 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-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java?rev=954433&r1=954432&r2=954433&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-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java Mon Jun 14 12:36:56 2010
@@ -40,7 +40,7 @@ class SlowConsumerDetection extends Virt
{
public SlowConsumerDetection newInstance(VirtualHost vhost)
{
- SlowConsumerDetectionConfiguration config = vhost.getConfiguration().getConfiguration(SlowConsumerDetectionConfiguration.class);
+ SlowConsumerDetectionConfiguration config = vhost.getConfiguration().getConfiguration(SlowConsumerDetectionConfiguration.class.getName());
if (config == null)
{
@@ -74,7 +74,7 @@ class SlowConsumerDetection extends Virt
try
{
SlowConsumerDetectionQueueConfiguration config =
- q.getConfiguration().getConfiguration(SlowConsumerDetectionQueueConfiguration.class);
+ q.getConfiguration().getConfiguration(SlowConsumerDetectionQueueConfiguration.class.getName());
if (checkQueueStatus(q, config))
{
Modified: 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-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java Mon Jun 14 12:36:56 2010
@@ -45,7 +45,7 @@ public class TopicDeletePolicy implement
public TopicDeletePolicy newInstance(ConfigurationPlugin configuration) throws ConfigurationException
{
TopicDeletePolicyConfiguration config =
- configuration.getConfiguration(TopicDeletePolicyConfiguration.class);
+ configuration.getConfiguration(TopicDeletePolicyConfiguration.class.getName());
TopicDeletePolicy policy = new TopicDeletePolicy();
policy.configure(config);
Copied: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java (from r954432, qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SlowConsumerTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java?p2=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java&p1=qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SlowConsumerTest.java&r1=954432&r2=954433&rev=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/SlowConsumerTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalQueuesTest.java Mon Jun 14 12:36:56 2010
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit;
* Slow consumers should on a topic should expect to receive a
* 506 : Resource Error if the hit a predefined threshold.
*/
-public class SlowConsumerTest extends QpidBrokerTestCase implements ExceptionListener, ConnectionListener
+public class GlobalQueuesTest extends QpidBrokerTestCase implements ExceptionListener, ConnectionListener
{
Topic _destination;
private CountDownLatch _disconnectionLatch = new CountDownLatch(1);
@@ -59,6 +59,7 @@ public class SlowConsumerTest extends Qp
private Exception _publisherError = null;
private JMSException _connectionException = null;
private static final long JOIN_WAIT = 5000;
+ protected String CONFIG_SECTION = ".queues";
@Override
public void setUp() throws IOException, ConfigurationException, NamingException
@@ -71,32 +72,26 @@ public class SlowConsumerTest extends Qp
+ getConnectionURL().getVirtualHost().substring(1) +
".slow-consumer-detection.timeunit", "SECONDS");
- setConfigurationProperty("virtualhosts.virtualhost."
- + getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "policy.name", "TopicDelete");
-
-
/**
* Queue Configuration
<slow-consumer-detection>
- <!-- The depth before which the policy will be applied-->
- <depth>4235264</depth>
+ <!-- The depth before which the policy will be applied-->
+ <depth>4235264</depth>
- <!-- The message age before which the policy will be applied-->
- <messageAge>600000</messageAge>
+ <!-- The message age before which the policy will be applied-->
+ <messageAge>600000</messageAge>
- <!-- The number of message before which the policy will be applied-->
- <messageCount>50</messageCount>
+ <!-- The number of message before which the policy will be applied-->
+ <messageCount>50</messageCount>
- <!-- Policies configuration -->
- <policy>
- <name>TopicDelete</name>
- <topicDelete>
- <delete-persistent/>
- </topicDelete>
- </policy>
+ <!-- Policies configuration -->
+ <policy>
+ <name>TopicDelete</name>
+ <topicDelete>
+ <delete-persistent/>
+ </topicDelete>
+ </policy>
</slow-consumer-detection>
*/
@@ -105,8 +100,8 @@ public class SlowConsumerTest extends Qp
* VirtualHost Plugin Configuration
<slow-consumer-detection>
- <delay>1</delay>
- <timeunit>MINUTES</timeunit>
+ <delay>1</delay>
+ <timeunit>MINUTES</timeunit>
</slow-consumer-detection>
*/
@@ -132,6 +127,7 @@ public class SlowConsumerTest extends Qp
* Clients should not have to modify their code based on the protocol in use.
*
* @param ackMode @see javax.jms.Session
+ *
* @throws Exception
*/
public void topicConsumer(int ackMode, boolean durable) throws Exception
@@ -260,6 +256,27 @@ public class SlowConsumerTest extends Qp
}
+ public void setConfig(String property, String value, boolean deleteDurable) throws NamingException, IOException, ConfigurationException
+ {
+ setConfigurationProperty("virtualhosts.virtualhost."
+ + getConnectionURL().getVirtualHost().substring(1) +
+ CONFIG_SECTION + ".slow-consumer-detection." +
+ "policy.name", "TopicDelete");
+
+ setConfigurationProperty("virtualhosts.virtualhost." +
+ getConnectionURL().getVirtualHost().substring(1) +
+ CONFIG_SECTION + ".slow-consumer-detection." +
+ property, value);
+
+ if (deleteDurable)
+ {
+ setConfigurationProperty("virtualhosts.virtualhost."
+ + getConnectionURL().getVirtualHost().substring(1) +
+ CONFIG_SECTION + ".slow-consumer-detection." +
+ "policy.topicdelete.delete-persistent", "");
+ }
+ }
+
/**
* Test that setting messageCount takes affect on topics
*
@@ -271,10 +288,7 @@ public class SlowConsumerTest extends Qp
{
MAX_QUEUE_MESSAGE_COUNT = 10;
- setConfigurationProperty("virtualhosts.virtualhost." +
- getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "messageCount", String.valueOf(MAX_QUEUE_MESSAGE_COUNT - 1));
+ setConfig("messageCount", String.valueOf(MAX_QUEUE_MESSAGE_COUNT - 1), false);
//Start the broker
super.setUp();
@@ -295,10 +309,7 @@ public class SlowConsumerTest extends Qp
{
MAX_QUEUE_MESSAGE_COUNT = 10;
- setConfigurationProperty("virtualhosts.virtualhost." +
- getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "depth", String.valueOf(MESSAGE_SIZE * 9));
+ setConfig("depth", String.valueOf(MESSAGE_SIZE * 9), false);
//Start the broker
super.setUp();
@@ -321,10 +332,7 @@ public class SlowConsumerTest extends Qp
{
MAX_QUEUE_MESSAGE_COUNT = 10;
- setConfigurationProperty("virtualhosts.virtualhost." +
- getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "messageAge", String.valueOf(DISCONNECTION_WAIT / 2));
+ setConfig("messageAge", String.valueOf(DISCONNECTION_WAIT / 2), false);
//Start the broker
super.setUp();
@@ -346,15 +354,7 @@ public class SlowConsumerTest extends Qp
{
MAX_QUEUE_MESSAGE_COUNT = 10;
- setConfigurationProperty("virtualhosts.virtualhost." +
- getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "messageCount", String.valueOf(MAX_QUEUE_MESSAGE_COUNT - 1));
-
- setConfigurationProperty("virtualhosts.virtualhost."
- + getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "policy.topicdelete.delete-persistent", "");
+ setConfig("messageCount", String.valueOf(MAX_QUEUE_MESSAGE_COUNT - 1), true);
//Start the broker
super.setUp();
@@ -377,15 +377,7 @@ public class SlowConsumerTest extends Qp
{
MAX_QUEUE_MESSAGE_COUNT = 10;
- setConfigurationProperty("virtualhosts.virtualhost." +
- getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "depth", String.valueOf(MESSAGE_SIZE * 9));
-
- setConfigurationProperty("virtualhosts.virtualhost."
- + getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "policy.topicdelete.delete-persistent", "");
+ setConfig("depth", String.valueOf(MESSAGE_SIZE * 9), true);
//Start the broker
super.setUp();
@@ -395,7 +387,7 @@ public class SlowConsumerTest extends Qp
topicConsumer(Session.AUTO_ACKNOWLEDGE, true);
}
- /**
+ /**
* Test that setting messageAge has an effect on topics
*
* Ensure we set the delete-persistent option
@@ -410,15 +402,7 @@ public class SlowConsumerTest extends Qp
{
MAX_QUEUE_MESSAGE_COUNT = 10;
- setConfigurationProperty("virtualhosts.virtualhost." +
- getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "messageAge", String.valueOf(DISCONNECTION_WAIT / 5));
-
- setConfigurationProperty("virtualhosts.virtualhost."
- + getConnectionURL().getVirtualHost().substring(1) +
- ".queues.slow-consumer-detection." +
- "policy.topicdelete.delete-persistent", "");
+ setConfig("messageAge", String.valueOf(DISCONNECTION_WAIT / 5), true);
//Start the broker
super.setUp();
@@ -438,6 +422,7 @@ public class SlowConsumerTest extends Qp
_disconnectionLatch.countDown();
}
+
/// Connection Listener
public void bytesSent(long count)
Added: 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/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java?rev=954433&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java (added)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/systest/GlobalTopicsTest.java Mon Jun 14 12:36:56 2010
@@ -0,0 +1,36 @@
+/*
+ *
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.systest;
+
+import org.apache.commons.configuration.ConfigurationException;
+
+import javax.naming.NamingException;
+import java.io.IOException;
+
+public class GlobalTopicsTest extends GlobalQueuesTest
+{
+ @Override
+ public void setUp() throws NamingException, IOException, ConfigurationException
+ {
+ CONFIG_SECTION = ".topics";
+ super.setUp();
+ }
+}
Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java Mon Jun 14 12:36:56 2010
@@ -44,7 +44,7 @@ public class Firewall extends AbstractPl
{
public Firewall newInstance(ConfigurationPlugin config) throws ConfigurationException
{
- FirewallConfiguration configuration = config.getConfiguration(FirewallConfiguration.class);
+ FirewallConfiguration configuration = config.getConfiguration(FirewallConfiguration.class.getName());
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
Modified: qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java Mon Jun 14 12:36:56 2010
@@ -52,7 +52,7 @@ public class SimpleXML extends AbstractP
{
public SimpleXML newInstance(ConfigurationPlugin config) throws ConfigurationException
{
- SimpleXMLConfiguration configuration = config.getConfiguration(SimpleXMLConfiguration.class);
+ SimpleXMLConfiguration configuration = config.getConfiguration(SimpleXMLConfiguration.class.getName());
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java Mon Jun 14 12:36:56 2010
@@ -32,6 +32,8 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.BindingConfigType;
import org.apache.qpid.server.configuration.ConfigStore;
import org.apache.qpid.server.configuration.ConfiguredObject;
+import org.apache.qpid.server.configuration.QueueConfiguration;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.BindingMessages;
@@ -201,6 +203,15 @@ public class BindingFactory
exchange.addBinding(b);
getConfigStore().addConfiguredObject(b);
b.logCreation();
+
+ //Reconfigure the queue for to reflect this new binding.
+ ConfigurationPlugin config = queue.getVirtualHost().getConfiguration().getQueueConfiguration(queue);
+
+ if (config != null)
+ {
+ // Reconfigure with new config.
+ queue.configure(config);
+ }
return true;
}
else
Added: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java?rev=954433&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java (added)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java Mon Jun 14 12:36:56 2010
@@ -0,0 +1,120 @@
+/*
+ *
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.configuration;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public class TopicConfiguration extends ConfigurationPlugin
+{
+ public static final ConfigurationPluginFactory FACTORY = new TopicConfigurationFactory();
+
+ private static final String VIRTUALHOSTS_VIRTUALHOST_TOPICS = "virtualhosts.virtualhost.topics";
+
+ public static class TopicConfigurationFactory implements ConfigurationPluginFactory
+ {
+
+ public ConfigurationPlugin newInstance(String path, Configuration config) throws ConfigurationException
+ {
+ TopicConfiguration topicsConfig = new TopicConfiguration();
+ topicsConfig.setConfiguration(path, config);
+ return topicsConfig;
+ }
+
+ public List<String> getParentPaths()
+ {
+ return Arrays.asList(VIRTUALHOSTS_VIRTUALHOST_TOPICS);
+ }
+ }
+
+ Map<String, TopicConfig> _topics = new HashMap<String, TopicConfig>();
+
+ public String[] getElementsProcessed()
+ {
+ return new String[]{"topic"};
+ }
+
+ @Override
+ public void validateConfiguration() throws ConfigurationException
+ {
+ if (_configuration.isEmpty())
+ {
+ throw new ConfigurationException("Topics section cannot be empty.");
+ }
+
+ int topics = _configuration.getList("topic.name").size();
+
+ for(int index=0; index<topics;index++)
+ {
+ TopicConfig topic = new TopicConfig();
+ topic.setConfiguration(VIRTUALHOSTS_VIRTUALHOST_TOPICS + ".topic", _configuration.subset("topic(" + index + ")"));
+
+ String topicName = _configuration.getString("topic(" + index + ").name");
+ if(_topics.containsKey(topicName))
+ {
+ throw new ConfigurationException("Topics section cannot contain two entries for the same topic.");
+ }
+ else
+ {
+ _topics.put(topicName, topic);
+ }
+ }
+ }
+
+ public String toString()
+ {
+ return getClass().getName() + ": Defined Topics:" + _topics.size();
+ }
+
+ public static class TopicConfig extends ConfigurationPlugin
+ {
+ @Override
+ public String[] getElementsProcessed()
+ {
+ return new String[]{"name"};
+ }
+
+ public String getName()
+ {
+ // If we don't specify a topic name then match all topics
+ String configName = getStringValue("name");
+ return configName == null ? "#" : configName;
+ }
+
+
+ public void validateConfiguration() throws ConfigurationException
+ {
+ if(_configuration.isEmpty())
+ {
+ throw new ConfigurationException("Topic section cannot be empty.");
+ }
+ }
+ }
+
+}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java Mon Jun 14 12:36:56 2010
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.configuration;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -29,7 +31,15 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingFactory;
import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeType;
+import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.store.MemoryMessageStore;
@@ -147,6 +157,72 @@ public class VirtualHostConfiguration ex
}
}
+ public ConfigurationPlugin getQueueConfiguration(AMQQueue queue)
+ {
+ VirtualHostConfiguration hostConfig = queue.getVirtualHost().getConfiguration();
+
+ // First check if we have a named queue configuration (the easy case)
+ if (Arrays.asList(hostConfig.getQueueNames()).contains(queue.getName()))
+ {
+ return null;
+ }
+
+ // We don't have an explicit queue config we must find out what we need.
+ ArrayList<Binding> bindings = new ArrayList<Binding>(queue.getBindings());
+
+ List<AMQShortString> exchangeClasses = new ArrayList<AMQShortString>(bindings.size());
+
+ //Remove default exchange
+ for (int index = 0; index < bindings.size(); index++)
+ {
+ // Ignore the DEFAULT Exchange binding
+ if (bindings.get(index).getExchange().getNameShortString().equals(ExchangeDefaults.DEFAULT_EXCHANGE_NAME))
+ {
+ bindings.remove(index);
+ }
+ else
+ {
+ exchangeClasses.add(bindings.get(index).getExchange().getType().getName());
+
+ if (exchangeClasses.size() > 1)
+ {
+ // If we have more than 1 class of exchange then we can only use the global queue configuration.
+ // and this will be returned from the default getQueueConfiguration
+ return null;
+ }
+ }
+ }
+
+ // If we are just bound the the default exchange then use the default.
+ if (bindings.isEmpty())
+ {
+ return null;
+ }
+
+ // If we are bound to only one type of exchange then we are going
+ // to have to resolve the configuration for that exchange.
+
+ String exchangeName = bindings.get(0).getExchange().getType().getName().toString();
+
+ // Lookup a Configuration handler for this Exchange.
+
+ // Build the expected class name. <Exchangename>sConfiguration
+ // i.e. TopicConfiguration or HeadersConfiguration
+ String exchangeClass = "org.apache.qpid.server.configuration."
+ + exchangeName.substring(0, 1).toUpperCase()
+ + exchangeName.substring(1) + "Configuration";
+
+ ConfigurationPlugin configPlugin
+ = queue.getVirtualHost().getConfiguration().getConfiguration(exchangeClass);
+
+
+ // now need to perform the queue-topic-topics-queue magic.
+
+ System.err.println("*********** Reconfiguring queue with config:"+configPlugin);
+
+ return configPlugin;
+ }
+
public long getMemoryUsageMaximum()
{
return getLongValue("queues.maximumMemoryUsage");
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java Mon Jun 14 12:36:56 2010
@@ -38,8 +38,8 @@ public abstract class ConfigurationPlugi
{
protected static final Logger _logger = Logger.getLogger(ConfigurationPlugin.class);
- private Map<Class<? extends ConfigurationPlugin>, ConfigurationPlugin>
- _pluginConfiguration = new HashMap<Class<? extends ConfigurationPlugin>, ConfigurationPlugin>();
+ private Map<String, ConfigurationPlugin>
+ _pluginConfiguration = new HashMap<String, ConfigurationPlugin>();
protected Configuration _configuration;
@@ -69,7 +69,7 @@ public abstract class ConfigurationPlugi
return _configuration;
}
- public <C extends ConfigurationPlugin> C getConfiguration(Class<C> plugin)
+ public <C extends ConfigurationPlugin> C getConfiguration(String plugin)
{
return (C) _pluginConfiguration.get(plugin);
}
@@ -155,7 +155,7 @@ public abstract class ConfigurationPlugi
List<ConfigurationPlugin> handlers = configurationManager.getConfigurationPlugins(configurationElement, handled);
for (ConfigurationPlugin plugin : handlers)
{
- _pluginConfiguration.put(plugin.getClass(), plugin);
+ _pluginConfiguration.put(plugin.getClass().getName(), plugin);
}
}
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=954433&r1=954432&r2=954433&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 Mon Jun 14 12:36:56 2010
@@ -34,6 +34,8 @@ import org.apache.felix.framework.Felix;
import org.apache.felix.framework.util.StringMap;
import org.apache.log4j.Logger;
import org.apache.qpid.common.Closeable;
+import org.apache.qpid.server.configuration.TopicConfiguration;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
import org.apache.qpid.server.exchange.ExchangeType;
import org.apache.qpid.server.security.SecurityManager;
@@ -79,6 +81,7 @@ public class PluginManager implements Cl
_securityPlugins.put(pluginFactory.getPluginName(), pluginFactory);
}
for (ConfigurationPluginFactory configFactory : Arrays.asList(
+ TopicConfiguration.FACTORY,
SecurityManager.SecurityConfiguration.FACTORY,
AllowAll.AllowAllConfiguration.FACTORY,
DenyAll.DenyAllConfiguration.FACTORY,
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java Mon Jun 14 12:36:56 2010
@@ -24,6 +24,7 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.AMQSecurityException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -274,9 +275,9 @@ public interface AMQQueue extends Managa
public void doTask(AMQQueue queue) throws AMQException;
}
- void configure(QueueConfiguration config);
+ void configure(ConfigurationPlugin config);
- QueueConfiguration getConfiguration();
+ ConfigurationPlugin getConfiguration();
ManagedObject getManagedObject();
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Mon Jun 14 12:36:56 2010
@@ -26,6 +26,7 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.pool.ReadWriteRunnable;
import org.apache.qpid.pool.ReferenceCountingExecutorService;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.configuration.ConfigStore;
@@ -185,7 +186,7 @@ public class SimpleAMQQueue implements A
//TODO : persist creation time
private long _createTime = System.currentTimeMillis();
- private QueueConfiguration _queueConfiguration;
+ private ConfigurationPlugin _queueConfiguration;
@@ -2065,24 +2066,29 @@ public class SimpleAMQQueue implements A
}
- public void configure(QueueConfiguration config)
+ public void configure(ConfigurationPlugin config)
{
if (config != null)
{
- setMaximumMessageAge(config.getMaximumMessageAge());
- setMaximumQueueDepth(config.getMaximumQueueDepth());
- setMaximumMessageSize(config.getMaximumMessageSize());
- setMaximumMessageCount(config.getMaximumMessageCount());
- setMinimumAlertRepeatGap(config.getMinimumAlertRepeatGap());
- _capacity = config.getCapacity();
- _flowResumeCapacity = config.getFlowResumeCapacity();
+ if (config instanceof QueueConfiguration)
+ {
+
+ setMaximumMessageAge(((QueueConfiguration)config).getMaximumMessageAge());
+ setMaximumQueueDepth(((QueueConfiguration)config).getMaximumQueueDepth());
+ setMaximumMessageSize(((QueueConfiguration)config).getMaximumMessageSize());
+ setMaximumMessageCount(((QueueConfiguration)config).getMaximumMessageCount());
+ setMinimumAlertRepeatGap(((QueueConfiguration)config).getMinimumAlertRepeatGap());
+ _capacity = ((QueueConfiguration)config).getCapacity();
+ _flowResumeCapacity = ((QueueConfiguration)config).getFlowResumeCapacity();
+ }
_queueConfiguration = config;
+
}
}
- public QueueConfiguration getConfiguration()
+ public ConfigurationPlugin getConfiguration()
{
return _queueConfiguration;
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java Mon Jun 14 12:36:56 2010
@@ -153,7 +153,7 @@ public class SecurityManager
public Map<String, SecurityPlugin> configurePlugins(ConfigurationPlugin hostConfig) throws ConfigurationException
{
Map<String, SecurityPlugin> plugins = new HashMap<String, SecurityPlugin>();
- SecurityConfiguration securityConfig = hostConfig.getConfiguration(SecurityConfiguration.class);
+ SecurityConfiguration securityConfig = hostConfig.getConfiguration(SecurityConfiguration.class.getName());
// If we have no security Configuration then there is nothing to configure.
if (securityConfig != null)
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java Mon Jun 14 12:36:56 2010
@@ -66,7 +66,7 @@ public class AllowAll extends BasicPlugi
{
public AllowAll newInstance(ConfigurationPlugin config) throws ConfigurationException
{
- AllowAllConfiguration configuration = config.getConfiguration(AllowAllConfiguration.class);
+ AllowAllConfiguration configuration = config.getConfiguration(AllowAllConfiguration.class.getName());
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java Mon Jun 14 12:36:56 2010
@@ -66,7 +66,7 @@ public class DenyAll extends BasicPlugin
{
public DenyAll newInstance(ConfigurationPlugin config) throws ConfigurationException
{
- DenyAllConfiguration configuration = config.getConfiguration(DenyAllConfiguration.class);
+ DenyAllConfiguration configuration = config.getConfiguration(DenyAllConfiguration.class.getName());
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java Mon Jun 14 12:36:56 2010
@@ -60,7 +60,7 @@ public class LegacyAccess extends BasicP
{
public LegacyAccess newInstance(ConfigurationPlugin config) throws ConfigurationException
{
- LegacyAccessConfiguration configuration = config.getConfiguration(LegacyAccessConfiguration.class);
+ LegacyAccessConfiguration configuration = config.getConfiguration(LegacyAccessConfiguration.class.getName());
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java Mon Jun 14 12:36:56 2010
@@ -38,7 +38,7 @@ public class LogMessageTest extends Test
{
Locale usLocal = Locale.US;
Locale.setDefault(usLocal);
- ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.LogMessages",
+ ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages",
usLocal);
assertNotNull("Unable to load ResourceBundle", _messages);
@@ -55,7 +55,7 @@ public class LogMessageTest extends Test
Locale.setDefault(japanese);
try
{
- ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.LogMessages",
+ ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages",
japanese);
assertNotNull("Unable to load ResourceBundle", _messages);
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=954433&r1=954432&r2=954433&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Mon Jun 14 12:36:56 2010
@@ -21,8 +21,8 @@
package org.apache.qpid.server.queue;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.server.configuration.*;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.subscription.Subscription;
@@ -36,7 +36,6 @@ import org.apache.qpid.server.binding.Bi
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.AMQException;
-import javax.swing.*;
import java.util.List;
import java.util.Set;
import java.util.Map;
@@ -520,12 +519,12 @@ public class MockAMQQueue implements AMQ
//To change body of implemented methods use File | Settings | File Templates.
}
- public void configure(QueueConfiguration config)
+ public void configure(ConfigurationPlugin config)
{
}
- public QueueConfiguration getConfiguration()
+ public ConfigurationPlugin getConfiguration()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org