You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/02/02 16:18:02 UTC
svn commit: r1728147 - in /qpid/java/branches/6.0.x: ./
broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
broker/src/main/java/org/apache/qpid/server/Main.java
Author: orudyy
Date: Tue Feb 2 15:18:02 2016
New Revision: 1728147
URL: http://svn.apache.org/viewvc?rev=1728147&view=rev
Log:
QPID-7039: [Java Broker] Allow overriding of default initial configuration location via system property
merged from trunk
svn merge -c 1728089 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/java/branches/6.0.x/broker/src/main/java/org/apache/qpid/server/Main.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 2 15:18:02 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1728089
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1728147&r1=1728146&r2=1728147&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java Tue Feb 2 15:18:02 2016
@@ -238,6 +238,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/branches/6.0.x/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1728147&r1=1728146&r2=1728147&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/java/branches/6.0.x/broker/src/main/java/org/apache/qpid/server/Main.java Tue Feb 2 15:18:02 2016
@@ -158,9 +158,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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org