Author: orudyy
Date: Tue Feb 2 11:32:16 2016
New Revision: 1728089
URL: http://svn.apache.org/viewvc?rev=1728089&view=rev
Log:
QPID-7039: [Java Broker] Allow overriding of default initial configuration
location via system property
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1728089&r1=1728088&r2=1728089&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
Tue Feb 2 11:32:16 2016
@@ -214,6 +214,11 @@ public class BrokerOptions
{
if(_initialConfigurationLocation == null)
{
+ String overriddenDefaultConfigurationLocation =
System.getProperty("qpid.initialConfigurationLocation");
+ if (overriddenDefaultConfigurationLocation != null)
+ {
+ return
BrokerOptions.class.getClassLoader().getResource(overriddenDefaultConfigurationLocation).toExternalForm();
+ }
return DEFAULT_INITIAL_CONFIG_LOCATION;
}
Modified: qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1728089&r1=1728088&r2=1728089&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
(original)
+++ qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java Tue
Feb 2 11:32:16 2016
@@ -152,9 +152,10 @@ public class Main
protected void execute() throws Exception
{
- BrokerOptions options = new BrokerOptions();
-
String initialProperties =
_commandLine.getOptionValue(OPTION_INITIAL_SYSTEM_PROPERTIES.getOpt());
+ Broker.populateSystemPropertiesFromDefaults(initialProperties);
+
+ BrokerOptions options = new BrokerOptions();
if (initialProperties != null)
{
options.setInitialSystemProperties(initialProperties);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
