You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/03/15 10:04:13 UTC
svn commit: r754635 - in
/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources:
activemq-template.xml activemq.xml
Author: xuhaihong
Date: Sun Mar 15 09:04:12 2009
New Revision: 754635
URL: http://svn.apache.org/viewvc?rev=754635&view=rev
Log:
GERONIMO-4475 Improve JMS portlet for AMQ 5.3 Broker configuration.
Update the temp storage path and binding host name with the values in the config-substitutions.properties
Modified:
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml?rev=754635&r1=754634&r2=754635&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq-template.xml Sun Mar 15 09:04:12 2009
@@ -37,7 +37,7 @@
</property>
</bean>
- <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}">
+ <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage">
<!--
Configure per-destination policies on the broker. The policies
@@ -181,10 +181,10 @@
-->
<transportConnectors>
<!--
- <transportConnector name="openwire" uri="tcp://localhost:${* + ${PortOffset}}" />
- <transportConnector name="openwire2" uri="tcp://localhost:${* + ${PortOffset}}" discoveryUri="multicast://default"/>
- <transportConnector name="ssl" uri="ssl://localhost:${* + ${PortOffset}}"/>
- <transportConnector name="stomp" uri="stomp://localhost:${* + ${PortOffset}}"/>
+ <transportConnector name="openwire" uri="tcp://${ServerHostname}:${* + ${PortOffset}}" />
+ <transportConnector name="openwire2" uri="tcp://${ServerHostname}:${* + ${PortOffset}}" discoveryUri="multicast://default"/>
+ <transportConnector name="ssl" uri="ssl://${ServerHostname}:${* + ${PortOffset}}"/>
+ <transportConnector name="stomp" uri="stomp://${ServerHostname}:${* + ${PortOffset}}"/>
-->
</transportConnectors>
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml?rev=754635&r1=754634&r2=754635&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/resources/activemq.xml Sun Mar 15 09:04:12 2009
@@ -37,7 +37,7 @@
</property>
</bean>
- <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}">
+ <broker xmlns="http://activemq.apache.org/schema/core" brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage">
<!--
Configure per-destination policies on the broker. The policies
@@ -180,12 +180,12 @@
http://activemq.apache.org/configuring-transports.html
-->
<transportConnectors>
- <transportConnector name="openwire" uri="tcp://localhost:${${ActiveMQPort} + ${PortOffset}}" />
+ <transportConnector name="openwire" uri="tcp://${ServerHostname}:${${ActiveMQPort} + ${PortOffset}}" />
<!--
- <transportConnector name="openwire2" uri="tcp://localhost:${* + ${PortOffset}}" discoveryUri="multicast://default"/>
- <transportConnector name="ssl" uri="ssl://localhost:${61617 + ${PortOffset}}"/>
- <transportConnector name="stomp" uri="stomp://localhost:${61613 + ${PortOffset}}"/>
- <transportConnector name="xmpp" uri="xmpp://localhost:${61222 + ${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}}"/>
-->
</transportConnectors>