You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/01/27 20:36:49 UTC
svn commit: r1655125 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/resources/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/
broker/src/main/java/org/apa...
Author: rgodfrey
Date: Tue Jan 27 19:36:48 2015
New Revision: 1655125
URL: http://svn.apache.org/r1655125
Log:
QPID-6339 : Use variable interpolation for help url and initial virtual host config
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
qpid/trunk/qpid/java/broker-core/src/main/resources/system.properties
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java?rev=1655125&r1=1655124&r2=1655125&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java Tue Jan 27 19:36:48 2015
@@ -27,6 +27,11 @@ import org.apache.qpid.server.store.Dura
@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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json?rev=1655125&r1=1655124&r2=1655125&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json Tue Jan 27 19:36:48 2015
@@ -65,7 +65,7 @@
"virtualhostnodes" : [ {
"name" : "default",
"type" : "JSON",
- "virtualHostInitialConfiguration" : "{ \"type\" : \"DERBY\" }"
+ "virtualHostInitialConfiguration" : "${qpid.initial_config_virtualhost_config}"
} ],
"plugins" : [ {
"type" : "MANAGEMENT-HTTP",
Modified: qpid/trunk/qpid/java/broker-core/src/main/resources/system.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/resources/system.properties?rev=1655125&r1=1655124&r2=1655125&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/resources/system.properties (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/resources/system.properties Tue Jan 27 19:36:48 2015
@@ -17,4 +17,4 @@
# under the License.
#
-qpid.helpURL = http://qpid.apache.org/releases/qpid-${project.version}/java-broker/book
+
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java?rev=1655125&r1=1655124&r2=1655125&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java Tue Jan 27 19:36:48 2015
@@ -45,6 +45,10 @@ public interface HttpManagementConfigura
@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;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1655125&r1=1655124&r2=1655125&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Tue Jan 27 19:36:48 2015
@@ -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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org