QPID-4390: Miscellaneous changes related to the deletion of references to ApplicationRegistry and refactoring of virtual host configuration

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-qpid-4390@1420878 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 27 insertions, 20 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index 9a33a57a54..1a21075940 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
@@ -62,18 +62,17 @@ public class VirtualHostConfiguration extends AbstractConfiguration
         {
             Configuration virtualHostConfig = XmlConfigurationUtilities.parseConfig(configurationFile, null);
 
+            // check if it is old virtual host configuration file
             Configuration config = virtualHostConfig.subset("virtualhost." + XmlConfigurationUtilities.escapeTagName(name));
             if (config.isEmpty())
             {
                 // try to load virtual host configuration from 'name' element
-                config = virtualHostConfig.subset(XmlConfigurationUtilities.escapeTagName(name));
-                if (config.isEmpty())
-                {
-                    // fallback to the original configuration
-                    config = virtualHostConfig;
-                }
+                configuration = virtualHostConfig;
+            }
+            else
+            {
+                configuration = config;
             }
-            configuration = config;
         }
         setConfiguration(configuration);
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
index 1cda49be42..fdd71a2062 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
@@ -49,9 +49,9 @@ public abstract class AbstractKeyStoreAdapter extends AbstractAdapter
         _name = MapValueConverter.getStringAttribute(TrustStore.NAME, attributes);
         _password = MapValueConverter.getStringAttribute(TrustStore.PASSWORD, attributes);
         setMandatoryAttribute(TrustStore.PATH, attributes);
-        setOptionalAttribute(TrustStore.TYPE, attributes, java.security.KeyStore.getDefaultType());
-        setOptionalAttribute(TrustStore.KEY_MANAGER_FACTORY_ALGORITHM, attributes, KeyManagerFactory.getDefaultAlgorithm());
-        setOptionalAttribute(TrustStore.DESCRIPTION, attributes, null);
+        setOptionalAttribute(TrustStore.TYPE, attributes);
+        setOptionalAttribute(TrustStore.KEY_MANAGER_FACTORY_ALGORITHM, attributes);
+        setOptionalAttribute(TrustStore.DESCRIPTION, attributes);
     }
 
     @Override
@@ -190,8 +190,11 @@ public abstract class AbstractKeyStoreAdapter extends AbstractAdapter
         setAttribute(name, null, MapValueConverter.getStringAttribute(name, attributes));
     }
 
-    protected void setOptionalAttribute(String name, Map<String, Object> attributes, String defaultValue)
+    protected void setOptionalAttribute(String name, Map<String, Object> attributes)
     {
-        setAttribute(name, null, MapValueConverter.getStringAttribute(name, attributes, defaultValue));
+        if (attributes.containsKey(name))
+        {
+            setAttribute(name, null, MapValueConverter.getStringAttribute(name, attributes));
+        }
     }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
index 3460e3340c..5b95889eeb 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
@@ -33,7 +33,10 @@ public class KeyStoreAdapter extends AbstractKeyStoreAdapter implements KeyStore
     public KeyStoreAdapter(UUID id, Broker broker, Map<String, Object> attributes)
     {
         super(id, broker, attributes);
-        setOptionalAttribute(CERTIFICATE_ALIAS, attributes, null);
+        if (attributes.containsKey(CERTIFICATE_ALIAS))
+        {
+            setAttribute(CERTIFICATE_ALIAS, null, attributes.get(CERTIFICATE_ALIAS));
+        }
     }
 
     @Override
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
index 4c754d6986..0d7dc1bb06 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
@@ -30,6 +30,7 @@ import java.util.UUID;
 import org.apache.qpid.server.configuration.ConfigurationEntry;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.KeyStore;
+import org.apache.qpid.server.model.TrustStore;
 
 import junit.framework.TestCase;
 
@@ -53,7 +54,10 @@ public class KeyStoreRecovererTest extends TestCase
         assertEquals(id, KeyStore.getId());
         assertEquals("my-secret-password", KeyStore.getPassword());
 
-        // password attribute  should not be provided
+        assertNull("Password was unexpectedly returned from configured object", KeyStore.getAttribute(TrustStore.PASSWORD));
+
+        // password attribute should not be exposed by a key store configured object
+        // so, we should set password value to null in the map being used to create the key store configured object
         attributes.put(KeyStore.PASSWORD, null);
         for (Map.Entry<String, Object> attribute : attributes.entrySet())
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
index ce30433893..3b64f45c80 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
@@ -51,7 +51,10 @@ public class TrustStoreRecovererTest extends QpidTestCase
         assertEquals(id, trustStore.getId());
         assertEquals("my-secret-password", trustStore.getPassword());
 
-        // password attribute  should not be provided
+        assertNull("Password was unexpectedly returned from configured object", trustStore.getAttribute(TrustStore.PASSWORD));
+
+        // password attribute should not be exposed by a trust store configured object
+        // so, we should set password value to null in the map being used to create the trust store configured object
         attributes.put(TrustStore.PASSWORD, null);
         for (Map.Entry<String, Object> attribute : attributes.entrySet())
         {
diff --git a/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
index 85e7712122..cddfcfb581 100644
--- a/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
+++ b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
@@ -58,11 +58,6 @@ public class ${type.name}Messages
         Logger.getLogger(${message.methodName.toUpperCase()}_LOG_HIERARCHY);
 #end
 
-        reload();
-    }
-
-    public static void reload()
-    {
         _messages = ResourceBundle.getBundle("${resource}", _currentLocale);
     }