QPID-1621: add ServerConfiguration, QueueConfiguration and SecurityConfiguration classes. Move almost all uses of o.a.commons.configuration.Configuration behind there.

@Configured delenda est

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

5 files changed, 36 insertions, 43 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java b/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
index ea0bae7a56..ba7a4bb19c 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
@@ -59,10 +59,6 @@ public class MultipleJCAProviderRegistrationTest extends QpidTestCase
         }
 
         ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
-
-        // This is a bit evil it should be updated with QPID-1103
-        config.getConfiguration().setProperty("management.enabled", "false");
-
         startBroker();
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
index e6c9f43ffb..5d0e7f9186 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
@@ -61,12 +61,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
         }
 
         ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
-
-        // This is a bit evil it should be updated with QPID-1103
-        config.getConfiguration().setProperty("management.enabled", "false");
-
         ApplicationRegistry.initialise(config, 1);
-
         TransportConnection.createVMBroker(1);
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index 256491194d..a60058be14 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
@@ -27,6 +27,7 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageMetaData;
@@ -49,38 +50,38 @@ public class SlowMessageStore implements TransactionLog, RoutingTable
     private static final String POST = "post";
     private String DEFAULT_DELAY = "default";
 
-    public void configure(VirtualHost virtualHost, String base, Configuration config) throws Exception
+    public void configure(VirtualHost virtualHost, String base, VirtualHostConfiguration config) throws Exception
     {
-        _logger.info("Starting SlowMessageStore on Virtualhost:" + virtualHost.getName());
-        Configuration delays = config.subset(base + "." + DELAYS);
+        _logger.warn("Starting SlowMessageStore on Virtualhost:" + virtualHost.getName());
+        Configuration delays = config.getStoreConfiguration().subset(DELAYS);
 
         configureDelays(delays);
 
-        String transactionLogClass = config.getString(base + ".store.class");
+        String transactionLogClass = config.getTransactionLogClass();
 
         if (delays.containsKey(DEFAULT_DELAY))
         {
             _defaultDelay = delays.getLong(DEFAULT_DELAY);
+            _logger.warn("Delay is:" + _defaultDelay);
         }
 
         if (transactionLogClass != null)
         {
             Class clazz = Class.forName(transactionLogClass);
+            if (clazz != this.getClass())
+            {
 
-            Object o = clazz.newInstance();
+                Object o = clazz.newInstance();
 
-            if (!(o instanceof TransactionLog))
-            {
-                throw new ClassCastException("TransactionLog class must implement " + TransactionLog.class + ". Class " + clazz +
-                                             " does not.");
+                if (!(o instanceof TransactionLog))
+                {
+                    throw new ClassCastException("TransactionLog class must implement " + TransactionLog.class + ". Class " + clazz +
+                    " does not.");
+                }
+                _realTransactionLog = (TransactionLog) o;
             }
-            _realTransactionLog = (TransactionLog) o;
-            _realTransactionLog.configure(virtualHost, base , config);
-        }
-        else
-        {
-            _realTransactionLog.configure(virtualHost, base , config);
         }
+        _realTransactionLog.configure(virtualHost, base , config);
     }
 
     private void configureDelays(Configuration config)
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
index f2c8a5e1f5..e0da406059 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
@@ -20,13 +20,7 @@
  */
 package org.apache.qpid.test.client.timeouts;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.client.transport.TransportConnection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.File;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -35,7 +29,13 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
-import java.io.File;
+
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This tests that when the commit takes a long time(due to POST_COMMIT_DELAY) that the commit does not timeout
@@ -67,16 +67,17 @@ public class SyncWaitDelayTest extends QpidTestCase
             fail("Unable to test without config file:" + _configFile);
         }
 
-        ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(_configFile);
-
-        //Disable management on broker.
-        config.getConfiguration().setProperty("management.enabled", "false");
-
-        Configuration testVirtualhost = config.getConfiguration().subset("virtualhosts.virtualhost." + VIRTUALHOST);
-        testVirtualhost.setProperty("store.class", "org.apache.qpid.server.store.SlowMessageStore");
-        testVirtualhost.setProperty("store.delays.commitTran.post", POST_COMMIT_DELAY);
-
-        startBroker(1, config);
+        XMLConfiguration configuration = new XMLConfiguration(_configFile); 
+        configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.class", "org.apache.qpid.server.store.SlowMessageStore");
+        configuration.setProperty("virtualhosts.virtualhost." + VIRTUALHOST+".store.delays.commitTran.post", POST_COMMIT_DELAY);
+        
+        File tmpFile = File.createTempFile("configFile", "test");
+        tmpFile.deleteOnExit();
+        configuration.save(tmpFile);
+        
+        ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(tmpFile);
+        
+        startBroker(1, reg);
 
         //Set the syncWrite timeout to be just larger than the delay on the commitTran.
         setSystemProperty("amqj.default_syncwrite_timeout", String.valueOf(SYNC_WRITE_TIMEOUT));
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index d0bb265a0c..eddd9ed538 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -290,7 +290,7 @@ public class QpidTestCase extends TestCase
         }
     }
 
-    public void startBroker(int port, ConfigurationFileApplicationRegistry config) throws Exception
+    public void startBroker(int port, ApplicationRegistry config) throws Exception
     {
         ApplicationRegistry.initialise(config, port);
         startBroker(port);