QPID-2632 : Remove NullApplicationRegistry

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

3 files changed, 3 insertions, 153 deletions

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 9adab58a0c..2164ef1b30 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
@@ -72,8 +72,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
     protected final ServerConfiguration _configuration;
 
     public static final int DEFAULT_INSTANCE = 1;
-    public static final String DEFAULT_APPLICATION_REGISTRY = "org.apache.qpid.server.util.NullApplicationRegistry";
-    public static String _APPLICATION_REGISTRY = DEFAULT_APPLICATION_REGISTRY;
 
     protected final Map<InetSocketAddress, QpidAcceptor> _acceptors = new HashMap<InetSocketAddress, QpidAcceptor>();
 
@@ -315,20 +313,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
 
             if (instance == null)
             {
-                try
-                {
-                    _logger.info("Creating DEFAULT_APPLICATION_REGISTRY: " + _APPLICATION_REGISTRY + " : Instance:" + instanceID);
-                    IApplicationRegistry registry = (IApplicationRegistry) Class.forName(_APPLICATION_REGISTRY).getConstructor((Class[]) null).newInstance((Object[]) null);
-                    ApplicationRegistry.initialise(registry, instanceID);
-                    _logger.info("Initialised Application Registry:" + instanceID);
-                    return registry;
-                }
-                catch (Exception e)
-                {
-                    _logger.error("Error configuring application: " + e, e);
-                    //throw new AMQBrokerCreationException(instanceID, "Unable to create Application Registry instance " + instanceID);
-                    throw new RuntimeException("Unable to create Application Registry", e);
-                }
+                throw new IllegalStateException("Application Registry (" + instanceID + ") not created");
             }
             else
             {
@@ -420,11 +405,6 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
         }
     }
 
-    public static void setDefaultApplicationRegistry(String clazz)
-    {
-        _APPLICATION_REGISTRY = clazz;
-    }
-
     public VirtualHostRegistry getVirtualHostRegistry()
     {
         return _virtualHostRegistry;
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
deleted file mode 100644
index d757cdc3e6..0000000000
--- a/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
+++ /dev/null
@@ -1,117 +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.util;
-
-import java.util.NoSuchElementException;
-import java.util.Properties;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.logging.actors.BrokerActor;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.actors.TestLogActor;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
-
-public class NullApplicationRegistry extends ApplicationRegistry
-{
-    // Private Exception to track tests that cause Log Actor to become unset.
-    private Exception _startup;
-
-    public NullApplicationRegistry() throws ConfigurationException
-    {
-        this(new ServerConfiguration(new PropertiesConfiguration()));
-        _logger.error("Creating NAR:"+this);
-    }
-
-    public NullApplicationRegistry(ServerConfiguration config) throws ConfigurationException
-    {
-        super(config);
-
-        addTestVhost();
-
-        _logger.error("Creating NAR with config:"+this);
-    }
-
-    private void addTestVhost() throws ConfigurationException
-    {
-        if (_configuration.getVirtualHostConfig("test") == null)
-        {
-            PropertiesConfiguration vhostProps = new PropertiesConfiguration();
-            VirtualHostConfiguration hostConfig = new VirtualHostConfiguration("test", vhostProps);
-            _configuration.setVirtualHostConfig(hostConfig);
-            _configuration.setDefaultVirtualHost("test");
-        }
-    }
-
-    @Override
-    public void initialise(int instanceID) throws Exception
-    {
-        _logger.info("Initialising NullApplicationRegistry(" + this + ")");
-
-        _configuration.setHousekeepingExpiredMessageCheckPeriod(200);
-
-        super.initialise(instanceID);
-
-        // Tests don't correctly setup logging
-        CurrentActor.set(new TestLogActor(_rootMessageLogger));
-        _startup = new Exception("NAR Test didn't correctly setup Log Actors");
-    }
-
-    /**
-     * Create a user data base with just a single user guest with pwd guest.
-     * @param configuration This is ignored here as it will be empty.
-     */
-    @Override
-    protected void createDatabaseManager(ServerConfiguration configuration)
-    {
-        Properties users = new Properties();
-        users.put("guest", "guest");
-        _databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
-    }
-
-
-    @Override
-    public void close()
-    {        
-        try
-        {
-            _logger.error("Closing NAR:"+this);            
-            CurrentActor.set(new BrokerActor(_rootMessageLogger));
-            super.close();
-        }
-        finally
-        {
-            try
-            {
-                CurrentActor.remove();
-            }
-            catch (NoSuchElementException npe)
-            {
-                _startup.printStackTrace();
-                _startup.printStackTrace(System.err);
-            }
-
-        }
-    }
-}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index 28cd576fb6..48080cedb7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -23,24 +23,11 @@ package org.apache.qpid.server.util;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.actors.TestLogActor;
-import org.apache.qpid.server.logging.rawloggers.Log4jMessageLogger;
-import org.apache.qpid.server.management.NoopManagedObjectRegistry;
-import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.SecurityManager;
-import org.apache.qpid.server.security.access.plugins.AllowAll;
-import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
-import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
-import org.apache.qpid.server.store.MessageStore;
+
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 
-public class TestApplicationRegistry extends NullApplicationRegistry
+public class TestApplicationRegistry extends ApplicationRegistry
 {
     public TestApplicationRegistry() throws ConfigurationException
     {