[SMX4-911]use system properties to define activemq url
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1166012 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/src/main/distribution/text/etc/activemq-broker.xml b/assembly/src/main/distribution/text/etc/activemq-broker.xml
index 034ba95..8d8f44c 100644
--- a/assembly/src/main/distribution/text/etc/activemq-broker.xml
+++ b/assembly/src/main/distribution/text/etc/activemq-broker.xml
@@ -101,7 +101,7 @@
<!-- The transport connectors ActiveMQ will listen to -->
<transportConnectors>
- <transportConnector name="openwire" uri="tcp://localhost:61616"/>
+ <transportConnector name="openwire" uri="${activemq.url}"/>
<transportConnector name="stomp" uri="stomp://localhost:61613"/>
</transportConnectors>
@@ -109,7 +109,7 @@
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616" />
+ <property name="brokerURL" value="${activemq.url}" />
</bean>
<bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
diff --git a/assembly/src/main/distribution/text/etc/system.properties b/assembly/src/main/distribution/text/etc/system.properties
index bb46ae9..798a0c2 100644
--- a/assembly/src/main/distribution/text/etc/system.properties
+++ b/assembly/src/main/distribution/text/etc/system.properties
@@ -70,6 +70,13 @@
#
servicemix.home=${karaf.home}
+#
+# Activemq configuration
+#
+activemq.port = 61616
+activemq.host = localhost
+activemq.url = tcp://${activemq.host}:${activemq.port}
+
#
# Activemq JMX configuration
@@ -82,7 +89,7 @@
# Activemq Webconsole configuration
#
webconsole.type=properties
-webconsole.jms.url=tcp://localhost:61616
+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
