svn commit: r1166012 - in /servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc: activemq-broker.xml system.properties

[ffang]

Author: ffang
Date: Wed Sep  7 06:28:36 2011
New Revision: 1166012

URL: http://svn.apache.org/viewvc?rev=1166012&view=rev
Log:
[SMX4-911]use system properties to define activemq url

Modified:
    
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
    
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties

Modified: 
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml?rev=1166012&r1=1166011&r2=1166012&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
 (original)
+++ 
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
 Wed Sep  7 06:28:36 2011
@@ -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">

Modified: 
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties?rev=1166012&r1=1166011&r2=1166012&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
 (original)
+++ 
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/system.properties
 Wed Sep  7 06:28:36 2011
@@ -70,6 +70,13 @@ org.osgi.service.http.port=8181
 #
 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.jmx.password=smx
 # 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