geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1398401 - in /geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint: pom.xml src/main/resources/OSGI-INF/blueprint/activemq.xml
Date Mon, 15 Oct 2012 17:22:37 GMT
Author: gawor
Date: Mon Oct 15 17:22:37 2012
New Revision: 1398401

URL: http://svn.apache.org/viewvc?rev=1398401&view=rev
Log:
GERONIMO-6396: Set activemq hostname via ActiveMQHostname property

Modified:
    geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/pom.xml
    geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml

Modified: geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/pom.xml?rev=1398401&r1=1398400&r2=1398401&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/pom.xml Mon Oct
15 17:22:37 2012
@@ -120,6 +120,7 @@
                             </config-xml-content>
                             <config-substitution key="ActiveMQStompPort">61613</config-substitution>
                             -->
+                            <config-substitution key="ActiveMQHostname">0.0.0.0</config-substitution>
                             <config-substitution key="ActiveMQPort">61616</config-substitution>
                             <config-substitution key="activemq.brokerName">DefaultActiveMQBroker</config-substitution>
                             <config-substitution key="activemq.data">${org.apache.geronimo.server.dir}/var/activemq</config-substitution>

Modified: geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml?rev=1398401&r1=1398400&r2=1398401&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
(original)
+++ geronimo/server/branches/3.0/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
Mon Oct 15 17:22:37 2012
@@ -33,7 +33,7 @@
         <ext:default-properties>
             <ext:property name="activemq.brokerName" value="DefaultActiveMQBroker"/>
             <ext:property name="activemq.data" value="var/activemq"/>
-            <ext:property name="ServerHostname" value="0.0.0.0"/>
+            <ext:property name="ActiveMQHostname" value="0.0.0.0"/>
             <ext:property name="ActiveMQPort" value="61616"/>
             <ext:property name="PortOffset" value="0"/>
         </ext:default-properties>
@@ -183,12 +183,12 @@
             http://activemq.apache.org/configuring-transports.html 
         -->
         <amq:transportConnectors>
-            <amq:transportConnector name="openwire" uri="tcp://${ServerHostname}:${ActiveMQPort
+ PortOffset}"/>
+            <amq:transportConnector name="openwire" uri="tcp://${ActiveMQHostname}:${ActiveMQPort
+ PortOffset}"/>
             <!--
-            <transportConnector name="openwire2" uri="tcp://${ServerHostname}:${* + ${PortOffset}}"
discoveryUri="multicast://default"/>
-            <transportConnector name="ssl" uri="ssl://${ServerHostname}:${61617 + ${PortOffset}}"/>
-            <transportConnector name="stomp" uri="stomp://${ServerHostname}:${61613 +
${PortOffset}}"/>
-            <transportConnector name="xmpp" uri="xmpp://${ServerHostname}:${61222 + ${PortOffset}}"/>
+            <transportConnector name="openwire2" uri="tcp://${ActiveMQHostname}:${* +
${PortOffset}}" discoveryUri="multicast://default"/>
+            <transportConnector name="ssl" uri="ssl://${ActiveMQHostname}:${61617 + ${PortOffset}}"/>
+            <transportConnector name="stomp" uri="stomp://${ActiveMQHostname}:${61613
+ ${PortOffset}}"/>
+            <transportConnector name="xmpp" uri="xmpp://${ActiveMQHostname}:${61222 +
${PortOffset}}"/>
             -->
         </amq:transportConnectors>
 



Mime
View raw message