Repository: servicemix Updated Branches: refs/heads/servicemix-6.x e9cd2ac5c -> f18e642db
[SM-3123] Use values from system.properties in several ActiveMQ configurartion files Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f18e642d Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f18e642d Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f18e642d Branch: refs/heads/servicemix-6.x Commit: f18e642db9dda9f93db4236de8d1f7ce28a8ce4d Parents: e9cd2ac Author: Krzysztof Sobkowiak <krzys.sobkow...@gmail.com> Authored: Sun Oct 16 01:24:49 2016 +0200 Committer: Krzysztof Sobkowiak <krzys.sobkow...@gmail.com> Committed: Sun Oct 16 01:29:03 2016 +0200 ---------------------------------------------------------------------- .../resources/OSGI-INF/blueprint/activemq-service.xml | 8 ++++---- .../resources/etc/org.apache.activemq.webconsole.cfg | 8 ++++---- .../src/main/resources/etc/org.apache.cxf.wsn.cfg | 6 +++--- .../src/main/resources/etc/system.properties | 11 +++++++---- 4 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/f18e642d/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml ---------------------------------------------------------------------- diff --git a/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml b/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml index b8ccb6e..4e74d64 100644 --- a/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml +++ b/activemq/activemq-service/src/main/resources/OSGI-INF/blueprint/activemq-service.xml @@ -29,8 +29,8 @@ <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"> <property name="brokerURL" value="vm://${broker-name}?create=false&waitForStart=10000"/> - <property name="userName" value="$[activemq.jmx.user]" /> - <property name="password" value="$[activemq.jmx.password]" /> + <property name="userName" value="$[activemq.jms.user]" /> + <property name="password" value="$[activemq.jms.password]" /> </bean> <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"> @@ -48,8 +48,8 @@ <bean id="jmsXaConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory"> <property name="brokerURL" value="vm://${broker-name}?create=false&waitForStart=10000"/> - <property name="userName" value="$[activemq.jmx.user]" /> - <property name="password" value="$[activemq.jmx.password]" /> + <property name="userName" value="$[activemq.jms.user]" /> + <property name="password" value="$[activemq.jms.password]" /> <property name="redeliveryPolicy"> <bean class="org.apache.activemq.RedeliveryPolicy"> <property name="maximumRedeliveries" value="0"/> http://git-wip-us.apache.org/repos/asf/servicemix/blob/f18e642d/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg index 16e4adc..fad9a98 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg +++ b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg @@ -17,7 +17,7 @@ webconsole.jms.url=${activemq.url} webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name} -webconsole.jmx.user=smx -webconsole.jmx.password=smx -webconsole.jms.user=smx -webconsole.jms.password=smx \ No newline at end of file +webconsole.jmx.user=${activemq.jmx.user} +webconsole.jmx.password=${activemq.jmx.password} +webconsole.jms.user=${activemq.jms.user} +webconsole.jms.password=${activemq.jms.password} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix/blob/f18e642d/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg index c51994d..6de6e11 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg +++ b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg @@ -17,8 +17,8 @@ # limitations under the License. # # -cxf.wsn.activemq = vm:localhost +cxf.wsn.activemq = ${activemq.url.vm} cxf.wsn.rootUrl = http://0.0.0.0:8182 cxf.wsn.context = /wsn -cxf.wsn.activemq.username=smx -cxf.wsn.activemq.password=smx +cxf.wsn.activemq.username=${activemq.jms.user} +cxf.wsn.activemq.password=${activemq.jms.password} http://git-wip-us.apache.org/repos/asf/servicemix/blob/f18e642d/assemblies/apache-servicemix/src/main/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/system.properties b/assemblies/apache-servicemix/src/main/resources/etc/system.properties index 02446f5..e957ea7 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/system.properties +++ b/assemblies/apache-servicemix/src/main/resources/etc/system.properties @@ -163,17 +163,20 @@ servicemix.home=${karaf.home} # # Activemq configuration # +activemq.broker.name = amq-broker activemq.port = 61616 activemq.host = localhost activemq.url = tcp://${activemq.host}:${activemq.port} - +activemq.url.vm = vm://${activemq.broker.name}?create=false&waitForStart=10000 +activemq.jms.user = smx +activemq.jms.password = smx # # Activemq JMX configuration # -activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name} -activemq.jmx.user=smx -activemq.jmx.password=smx +activemq.jmx.url = service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name} +activemq.jmx.user = ${activemq.jms.user} +activemq.jmx.password = ${activemq.jms.password} # # CXF Log configuration
