QPID-6340 : Allow defaults for system properties to be overridden from a properties file

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

2 files changed, 109 insertions, 0 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
index 86f5ddeeed..89e4c3ccdd 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
@@ -18,6 +18,17 @@
 
 package org.apache.qpid.configuration;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * This class centralized the Qpid client properties.
  *
@@ -25,6 +36,8 @@ package org.apache.qpid.configuration;
  */
 public class ClientProperties
 {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClientProperties.class);
+
     /**
      * Currently with Qpid it is not possible to change the client ID.
      * If one is not specified upon connection construction, an id is generated automatically.
@@ -292,6 +305,48 @@ public class ClientProperties
      */
     public static final String QPID_USE_LEGACY_GETQUEUEDEPTH_BEHAVIOUR = "qpid.use_legacy_getqueuedepth_behavior";
 
+    static
+    {
+        // force load of common properties
+        Class<CommonProperties> commonPropertiesClass = CommonProperties.class;
+
+        Properties props = new Properties();
+        String initialProperties = System.getProperty("qpid.client_properties_file");
+        URL initialPropertiesLocation = null;
+        try
+        {
+            if (initialProperties == null)
+            {
+                initialPropertiesLocation = ClientProperties.class.getClassLoader().getResource("qpid-client.properties");
+            }
+            else
+            {
+                initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
+            }
+
+            if (initialPropertiesLocation != null)
+            {
+                props.load(initialPropertiesLocation.openStream());
+            }
+        }
+        catch (MalformedURLException e)
+        {
+            LOGGER.warn("Could not open client properties file '"+initialProperties+"'.", e);
+        }
+        catch (IOException e)
+        {
+            LOGGER.warn("Could not open client properties file '" + initialPropertiesLocation + "'.", e);
+        }
+
+        Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
+        propertyNames.removeAll(System.getProperties().stringPropertyNames());
+        for (String propName : propertyNames)
+        {
+            System.setProperty(propName, props.getProperty(propName));
+        }
+
+    }
+
     private ClientProperties()
     {
         //No instances
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
index 6bae93a1b8..a052a02748 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
@@ -20,6 +20,19 @@
  */
 package org.apache.qpid.configuration;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.common.QpidProperties;
+
 /**
  * Centralised record of Qpid common properties.
  *
@@ -27,6 +40,8 @@ package org.apache.qpid.configuration;
  */
 public class CommonProperties
 {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CommonProperties.class);
+
     /**
      * The timeout used by the IO layer for timeouts such as send timeout in IoSender, and the close timeout for IoSender and IoReceiver
      */
@@ -36,6 +51,45 @@ public class CommonProperties
     public static final String HANDSHAKE_TIMEOUT_PROP_NAME = "qpid.handshake_timeout";
     public static final int HANDSHAKE_TIMEOUT_DEFAULT = 2;
 
+    static
+    {
+
+        Properties props = new Properties(QpidProperties.asProperties());
+        String initialProperties = System.getProperty("qpid.common_properties_file");
+        URL initialPropertiesLocation = null;
+        try
+        {
+            if (initialProperties == null)
+            {
+                initialPropertiesLocation = CommonProperties.class.getClassLoader().getResource("qpid-common.properties");
+            }
+            else
+            {
+                initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
+            }
+
+            if (initialPropertiesLocation != null)
+            {
+                props.load(initialPropertiesLocation.openStream());
+            }
+        }
+        catch (MalformedURLException e)
+        {
+            LOGGER.warn("Could not open common properties file '"+initialProperties+"'.", e);
+        }
+        catch (IOException e)
+        {
+            LOGGER.warn("Could not open common properties file '" + initialPropertiesLocation + "'.", e);
+        }
+
+        Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
+        propertyNames.removeAll(System.getProperties().stringPropertyNames());
+        for (String propName : propertyNames)
+        {
+            System.setProperty(propName, props.getProperty(propName));
+        }
+
+    }
 
     private CommonProperties()
     {