QPID-2581 : Add ConfigurationManager and split config creation from config processing

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

2 files changed, 50 insertions, 170 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
index d927bbe732..d24119f0d0 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
@@ -23,85 +23,84 @@ package org.apache.qpid.server.util;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
-import org.apache.qpid.qmf.QMFService;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
 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.logging.rawloggers.Log4jMessageLogger;
-import org.apache.qpid.server.management.NoopManagedObjectRegistry;
-import org.apache.qpid.server.plugins.PluginManager;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.access.ACLManager;
-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.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
 public class NullApplicationRegistry extends ApplicationRegistry
 {
+    // Private Exception to track tests that cause Log Actor to become unset.
+    private Exception _startup;
+
     public NullApplicationRegistry() throws ConfigurationException
     {
-        super(new ServerConfiguration(new PropertiesConfiguration()));
+        this(new ServerConfiguration(new PropertiesConfiguration()));
+        _logger.error("Creating NAR:"+this);
     }
 
-    public void initialise(int instanceID) throws Exception
+    public NullApplicationRegistry(ServerConfiguration config) throws ConfigurationException
     {
-        _logger.info("Initialising NullApplicationRegistry");
-
-        _rootMessageLogger = new RootMessageLoggerImpl(_configuration, new Log4jMessageLogger());
-
-        //We should use a Test Actor Here not the Broker Actor
-        CurrentActor.set(new TestLogActor(_rootMessageLogger));
-
-        _configuration.setHousekeepingExpiredMessageCheckPeriod(200);
+        super(config);
 
-        Properties users = new Properties();
+        addTestVhost();
 
-        users.put("guest", "guest");
+        _logger.error("Creating NAR with config:"+this);
+    }
 
-        _databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
+    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");
+        }
+    }
 
-        _accessManager = new ACLManager(_configuration.getSecurityConfiguration(), _pluginManager, AllowAll.FACTORY);
 
-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
+    @Override
+    public void initialise(int instanceID) throws Exception
+    {
+        _logger.info("Initialising NullApplicationRegistry(" + this + ")");
 
-        _managedObjectRegistry = new NoopManagedObjectRegistry();
-        _virtualHostRegistry = new VirtualHostRegistry(this);
-        _qmfService = new QMFService(getConfigStore(),this);
+        _configuration.setHousekeepingExpiredMessageCheckPeriod(200);
 
-        PropertiesConfiguration vhostProps = new PropertiesConfiguration();
-        VirtualHostConfiguration hostConfig = new VirtualHostConfiguration("test", vhostProps);
-        VirtualHost dummyHost = ApplicationRegistry.getInstance().createVirtualHost(hostConfig);
-        _virtualHostRegistry.setDefaultVirtualHostName("test");
-        _pluginManager = new PluginManager("");
-        _startup = new Exception("NAR");
+        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");
     }
-       private Exception _startup;
-    public Collection<String> getVirtualHostNames()
+
+    /**
+     * 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)
     {
-        String[] hosts = {"test"};
-        return Arrays.asList(hosts);
+        Properties users = new Properties();
+        users.put("guest", "guest");
+        _databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
     }
 
+
     @Override
     public void close() throws Exception
-    {
-        CurrentActor.set(new BrokerActor(_rootMessageLogger));
-
+    {        
         try
         {
+            _logger.error("Closing NAR:"+this);            
+            CurrentActor.set(new BrokerActor(_rootMessageLogger));
             super.close();
-            _qmfService.close();
         }
         finally
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index b5bbfde514..95ff096d6c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -22,143 +22,24 @@ package org.apache.qpid.server.util;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
-
-import org.apache.qpid.qmf.QMFService;
 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.access.ACLManager;
-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;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Properties;
 
-public class TestApplicationRegistry extends ApplicationRegistry
+public class TestApplicationRegistry extends NullApplicationRegistry
 {
-    private QueueRegistry _queueRegistry;
-
-    private ExchangeRegistry _exchangeRegistry;
-
-    private ExchangeFactory _exchangeFactory;
-
-    private MessageStore _messageStore;
-
-    private VirtualHost _vHost;
-
-
-    private ServerConfiguration _config;
-
     public TestApplicationRegistry() throws ConfigurationException
     {
-    	super(new ServerConfiguration(new PropertiesConfiguration()));
+        this(new ServerConfiguration(new PropertiesConfiguration()));
     }
 
     public TestApplicationRegistry(ServerConfiguration config) throws ConfigurationException
     {
-    	super(config);
-    	_config = config;
-    }
-
-    public void initialise(int instanceID) throws Exception
-    {
-        _rootMessageLogger = new RootMessageLoggerImpl(_configuration,
-                                                       new Log4jMessageLogger());
-
-        //Add a Test Actor as a lot of our System Tests reach in to the broker
-        // and manipulate it so the CurrentActor is not set.
-        CurrentActor.set(new TestLogActor(_rootMessageLogger));
-
-        Properties users = new Properties();
-
-        users.put("guest", "guest");
-
-        _databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
-
-        _accessManager = new ACLManager(_configuration.getSecurityConfiguration(), _pluginManager, AllowAll.FACTORY);
-
-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
-
-        _managedObjectRegistry = new NoopManagedObjectRegistry();
-
-        _messageStore = new TestableMemoryMessageStore();
-
-        _virtualHostRegistry = new VirtualHostRegistry(this);
-        _qmfService = new QMFService(getConfigStore(),this);
-
-
-        PropertiesConfiguration vhostProps = new PropertiesConfiguration();
-        VirtualHostConfiguration hostConfig = new VirtualHostConfiguration("test", vhostProps);
-        _vHost = new VirtualHostImpl(hostConfig, _messageStore);
-
-        _virtualHostRegistry.registerVirtualHost(_vHost);
-
-        _queueRegistry = _vHost.getQueueRegistry();
-        _exchangeFactory = _vHost.getExchangeFactory();
-        _exchangeRegistry = _vHost.getExchangeRegistry();
-
-    }
-
-    public QueueRegistry getQueueRegistry()
-    {
-        return _queueRegistry;
-    }
-
-    public ExchangeRegistry getExchangeRegistry()
-    {
-        return _exchangeRegistry;
-    }
-
-    public ExchangeFactory getExchangeFactory()
-    {
-        return _exchangeFactory;
-    }
-
-    public Collection<String> getVirtualHostNames()
-    {
-        String[] hosts = {"test"};
-        return Arrays.asList(hosts);
-    }
-
-    public void setAccessManager(ACLManager newManager)
-    {
-        _accessManager = newManager;
-    }
-
-    public MessageStore getMessageStore()
-    {
-        return _messageStore;
-    }
-
-    @Override
-    public void close() throws Exception
-    {
-        try
-        {
-            super.close();
-            _qmfService.close();
-        }
-        finally
-        {
-            CurrentActor.remove();
-        }
+        super(config);
+        _configuration.getConfig().setProperty("virtualhosts.virtualhost.name",
+                                               "test");
+        _configuration.getConfig().setProperty("virtualhosts.virtualhost.test.store.class",
+                                               TestableMemoryMessageStore.class.getName());
     }
-
 }