QPID-4333: remove the 'queue reconfiguration' process and various clases leftover from SCD

Work by Keith Wall and myself.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1389451 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 137 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
deleted file mode 100644
index caf74a89ec..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *
- * 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.ConfigurationException;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInternalException;
-import org.apache.qpid.AMQSecurityException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
-
-/**
- * Test of the new Topic configuration processing
- */
-public class TopicConfigurationTest extends InternalBrokerBaseCase
-{
-
-    @Override
-    public void configure()
-    {
-        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic.name", "stocks.nyse.appl");
-
-        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic(1).subscriptionName", getName()+":stockSubscription");
-
-        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic(2).name", "stocks.nyse.orcl");
-        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic(2).subscriptionName", getName()+":stockSubscription");
-   }
-
-    /**
-     * Test that a TopicConfig object is created and attached to the queue when it is bound to the topic exchange.
-     *
-
-     * @throws ConfigurationException
-     * @throws AMQSecurityException
-     */
-    public void testTopicCreation() throws ConfigurationException, AMQSecurityException, AMQInternalException
-    {
-        Exchange topicExchange = getVirtualHost().getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
-        getVirtualHost().getBindingFactory().addBinding("stocks.nyse.appl", getQueue(), topicExchange, null);
-
-        TopicConfig config = getQueue().getConfiguration().getConfiguration(TopicConfig.class.getName());
-
-        assertNotNull("Queue should have topic configuration bound to it.", config);
-        assertEquals("Configuration name not correct", "stocks.nyse.appl", config.getName());
-    }
-
-    /**
-     * Test that a queue created for a subscription correctly has topic
-     * configuration selected based on the subscription and topic name.
-     *
-     * @throws ConfigurationException
-     * @throws AMQException
-     */
-    public void testSubscriptionWithTopicCreation() throws ConfigurationException, AMQException
-    {
-
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), getName()+":stockSubscription", false, "testowner",
-                                                    false, false, getVirtualHost(), null);
-
-        getVirtualHost().getQueueRegistry().registerQueue(queue);
-        Exchange defaultExchange = getVirtualHost().getExchangeRegistry().getDefaultExchange();
-        getVirtualHost().getBindingFactory().addBinding(getName(), queue, defaultExchange, null);
-
-
-        Exchange topicExchange = getVirtualHost().getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
-        getVirtualHost().getBindingFactory().addBinding("stocks.nyse.orcl", queue, topicExchange, null);
-
-        TopicConfig config = queue.getConfiguration().getConfiguration(TopicConfig.class.getName());
-
-        assertNotNull("Queue should have topic configuration bound to it.", config);
-        assertEquals("Configuration subscription name not correct", getName() + ":stockSubscription", config.getSubscriptionName());
-        assertEquals("Configuration name not correct", "stocks.nyse.orcl", config.getName());
-
-    }
-
-    /**
-     * Test that a queue created for a subscription correctly has topic
-     * configuration attached here this should be the generic topic section
-     * with just the subscriptionName
-     *
-     * @throws ConfigurationException
-     * @throws AMQException
-     */
-    public void testSubscriptionCreation() throws ConfigurationException, AMQException
-    {
-
-        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID() ,getName()+":stockSubscription", false, "testowner",
-                                                    false, false, getVirtualHost(), null);
-
-        getVirtualHost().getQueueRegistry().registerQueue(queue);
-        Exchange defaultExchange = getVirtualHost().getExchangeRegistry().getDefaultExchange();
-        getVirtualHost().getBindingFactory().addBinding(getName(), queue, defaultExchange, null);
-
-
-        Exchange topicExchange = getVirtualHost().getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
-        getVirtualHost().getBindingFactory().addBinding("stocks.nyse.ibm", queue, topicExchange, null);
-
-        TopicConfig config = queue.getConfiguration().getConfiguration(TopicConfig.class.getName());
-
-        assertNotNull("Queue should have topic configuration bound to it.", config);        
-        assertEquals("Configuration subscription name not correct", getName() + ":stockSubscription", config.getSubscriptionName());
-        assertEquals("Configuration name not correct", "#", config.getName());
-
-    }
-
-
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index c6235f2f45..63d4d196e1 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.queue;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.binding.Binding;
+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.LogSubject;
@@ -508,16 +509,11 @@ public class MockAMQQueue implements AMQQueue
 
     }
 
-    public void configure(ConfigurationPlugin config)
+    public void configure(QueueConfiguration config)
     {
 
     }
 
-    public ConfigurationPlugin getConfiguration()
-    {
-        return null;
-    }
-
     public AuthorizationHolder getAuthorizationHolder()
     {
         return _authorizationHolder;