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 2010/05/06 22:24:13 UTC
svn commit: r941896 - in /servicemix/smx4/features/trunk:
assembly/src/main/distribution/text/etc/activemq-broker.xml pom.xml
Author: gnodet
Date: Thu May 6 20:24:13 2010
New Revision: 941896
URL: http://svn.apache.org/viewvc?rev=941896&view=rev
Log:
SMX4NMR-186: Upgrade to ActiveMQ 5.3.2
Modified:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
servicemix/smx4/features/trunk/pom.xml
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=941896&r1=941895&r2=941896&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 Thu May 6 20:24:13 2010
@@ -113,7 +113,7 @@
<property name="brokerURL" value="tcp://localhost:61616" />
</bean>
- <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
+ <bean id="pooledConnectionFactoryFactory" class="org.apache.activemq.pool.PooledConnectionFactoryBean">
<property name="maxConnections" value="8" />
<property name="maximumActive" value="500" />
<property name="transactionManager" ref="transactionManager" />
@@ -121,6 +121,8 @@
<property name="resourceName" value="activemq.default" />
</bean>
+ <bean id="pooledConnectionFactory" factory-bean="pooledConnectionFactoryFactory" factory-method="getConnectionFactory" />
+
<bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
<property name="transactionManager" ref="transactionManager" />
<property name="connectionFactory" ref="activemqConnectionFactory" />
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=941896&r1=941895&r2=941896&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu May 6 20:24:13 2010
@@ -63,7 +63,7 @@
<maven.assembly.version>2.2-beta-4</maven.assembly.version>
<xfire.maven.plugin>4.1</xfire.maven.plugin>
<abdera.version>0.4.0-incubating_3</abdera.version>
- <activemq.version>5.3.0</activemq.version>
+ <activemq.version>5.3.2</activemq.version>
<acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0_3</ant.version>
<antlr2.version>2.7.7_2</antlr2.version>