QPID-6339 : Use variable interpolation for help url and initial virtual host config

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

5 files changed, 19 insertions, 5 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
index ce1022c2d9..fa35e725c9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
@@ -27,6 +27,11 @@ import org.apache.qpid.server.store.DurableConfigurationStore;
 @ManagedObject(category=true, managesChildren=false)
 public interface VirtualHostNode<X extends VirtualHostNode<X>> extends ConfiguredObject<X>
 {
+    String QPID_INITIAL_CONFIG_VIRTUALHOST_CONFIG_VAR = "qpid.initial_config_virtualhost_config";
+    @ManagedContextDefault(name = QPID_INITIAL_CONFIG_VIRTUALHOST_CONFIG_VAR)
+    String DEFAULT_INITIAL_CONFIG_VIRTUALHOST_CONFIG_VAR = "{ \"type\" : \"DERBY\" }";
+
+
     String VIRTUALHOST_INITIAL_CONFIGURATION = "virtualHostInitialConfiguration";
 
     String VIRTUALHOST_BLUEPRINT_CONTEXT_VAR = "virtualhostBlueprint";
diff --git a/qpid/java/broker-core/src/main/resources/initial-config.json b/qpid/java/broker-core/src/main/resources/initial-config.json
index 012cdc9017..12411fc436 100644
--- a/qpid/java/broker-core/src/main/resources/initial-config.json
+++ b/qpid/java/broker-core/src/main/resources/initial-config.json
@@ -65,7 +65,7 @@
   "virtualhostnodes" : [ {
     "name" : "default",
     "type" : "JSON",
-    "virtualHostInitialConfiguration" : "{ \"type\" : \"DERBY\" }"
+    "virtualHostInitialConfiguration" : "${qpid.initial_config_virtualhost_config}"
   } ],
   "plugins" : [ {
     "type" : "MANAGEMENT-HTTP",
diff --git a/qpid/java/broker-core/src/main/resources/system.properties b/qpid/java/broker-core/src/main/resources/system.properties
index 6559636f75..661b0cba77 100644
--- a/qpid/java/broker-core/src/main/resources/system.properties
+++ b/qpid/java/broker-core/src/main/resources/system.properties
@@ -17,4 +17,4 @@
 # under the License.
 #
 
-qpid.helpURL = http://qpid.apache.org/releases/qpid-${project.version}/java-broker/book
+
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
index 445ce996ef..018b23daaf 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
@@ -45,6 +45,10 @@ public interface HttpManagementConfiguration<X extends HttpManagementConfigurati
     @ManagedAttribute( defaultValue = "600" )
     public int getSessionTimeout();
 
+    String QPID_HELP_URL = "qpid.helpURL";
+    @ManagedContextDefault(name = QPID_HELP_URL)
+    String DEFAULT_HELP_URL = "http://qpid.apache.org/releases/qpid-${qpid.version}/java-broker/book";
+
     String HTTP_MANAGEMENT_COMPRESS_RESPONSES = "httpManagement.compressResponses";
     @ManagedContextDefault(name = HTTP_MANAGEMENT_COMPRESS_RESPONSES)
     boolean DEFAULT_COMPRESS_RESPONSES = false;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index f4c6926a17..5f32dd3352 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -328,14 +328,19 @@ public class Main
             initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
         }
 
-        Properties props = new Properties();
-        props.load(initialPropertiesLocation.openStream());
+        Properties props = new Properties(QpidProperties.asProperties());
+        if(initialPropertiesLocation != null)
+        {
+            props.load(initialPropertiesLocation.openStream());
+        }
+
         Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
         propertyNames.removeAll(System.getProperties().stringPropertyNames());
-        for(String propName : propertyNames)
+        for (String propName : propertyNames)
         {
             System.setProperty(propName, props.getProperty(propName));
         }
+
     }
 
     private void copyInitialConfigFile(final BrokerOptions options, final File destinationFile)