geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r941980 - in /geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources: activemq-template.xml activemq.xml
Date Fri, 07 May 2010 01:16:38 GMT
Author: xuhaihong
Date: Fri May  7 01:16:38 2010
New Revision: 941980

URL: http://svn.apache.org/viewvc?rev=941980&view=rev
Log:
GERONIMO-5154 system property overrides to config-substitutions.properties does not work for
activemq.xml

Modified:
    geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq.xml

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml?rev=941980&r1=941979&r2=941980&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
Fri May  7 01:16:38 2010
@@ -35,6 +35,9 @@
             <!--<value>file://${activemq.home}/conf/credentials.properties</value>-->
             <value>${activemq.geronimo.home.url}/var/config/config-substitutions.properties</value>
          </property>
+         <property name="systemPropertiesMode">
+            <value>2</value>
+         </property>
     </bean>
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}"
tmpDataDirectory="${activemq.data}/tmp_storage" useShutdownHook="false" start="false">

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq.xml?rev=941980&r1=941979&r2=941980&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
Fri May  7 01:16:38 2010
@@ -35,6 +35,9 @@
             <!--<value>file://${activemq.home}/conf/credentials.properties</value>-->
             <value>${activemq.geronimo.home.url}/var/config/config-substitutions.properties</value>
          </property>
+         <property name="systemPropertiesMode">
+            <value>2</value>
+         </property>
     </bean>
 
     <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}"
tmpDataDirectory="${activemq.data}/tmp_storage" useShutdownHook="false" start="false">



Mime
View raw message