You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/09 13:51:56 UTC
svn commit: r693441 -
/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
Author: gnodet
Date: Tue Sep 9 04:51:55 2008
New Revision: 693441
URL: http://svn.apache.org/viewvc?rev=693441&view=rev
Log:
Revert change committed unwillingly
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml?rev=693441&r1=693440&r2=693441&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml Tue Sep 9 04:51:55 2008
@@ -32,6 +32,7 @@
<!-- Destination specific policies using destination names or wildcards -->
<destinationPolicy>
<policyMap>
+
<policyEntries>
<policyEntry queue=">" memoryLimit="5mb"/>
<policyEntry topic=">" memoryLimit="5mb">
@@ -41,6 +42,7 @@
</policyEntry>
</policyEntries>
</policyMap>
+
</destinationPolicy>
<!-- Use the following to configure how ActiveMQ is exposed in JMX -->
@@ -51,6 +53,7 @@
<!-- The store and forward broker networks ActiveMQ will listen to -->
<networkConnectors>
<!-- by default just auto discover the other brokers -->
+
<networkConnector name="default-nc" uri="multicast://default"/>
<!-- Example of a static configuration:
<networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
@@ -81,6 +84,7 @@
<memoryUsage>
<memoryUsage limit="20 mb"/>
</memoryUsage>
+
<storeUsage>
<storeUsage limit="1 gb" name="foo"/>
</storeUsage>
@@ -90,7 +94,6 @@
</systemUsage>
</systemUsage>
-
<!-- The transport connectors ActiveMQ will listen to -->
<transportConnectors>
<transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
@@ -100,29 +103,28 @@
</broker>
<bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+
<property name="brokerURL" value="tcp://localhost:61616" />
</bean>
<bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
<property name="maxConnections" value="8" />
- <property name="connectionFactory" ref="activemqConnectionFactory" />
- <!-- if using a JTA transaction manager, uncomment the two following properties to
- enable integration
<property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
<property name="resourceName" value="activemq.${name}" />
- -->
</bean>
<bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
- <property name="transactionManager" ref="transactionManager" />
- <property name="connectionFactory" ref="activemqConnectionFactory" />
- <property name="resourceName" value="activemq.${name}" />
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
+ <property name="resourceName" value="activemq.${name}" />
</bean>
<osgi:reference id="transactionManager" interface="javax.transaction.TransactionManager"
cardinality="0..1"/>
<osgi:service ref="pooledConnectionFactory">
+
<osgi:interfaces>
<value>javax.jms.ConnectionFactory</value>
</osgi:interfaces>