Author: ccustine
Date: Mon Mar 29 03:37:15 2010
New Revision: 928585
URL: http://svn.apache.org/viewvc?rev=928585&view=rev
Log:
SMX4NMR-186 - Upgrade to ActiveMQ 5.3.1
- Rolling this back due to some failures in clustering, defer to next release
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=928585&r1=928584&r2=928585&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
Mon Mar 29 03:37:15 2010
@@ -121,8 +121,6 @@
<property name="resourceName" value="activemq.default" />
</bean>
- <bean id="pooledConnectionFactoryBean"
factory-bean="pooledConnectionFactory" 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" />
@@ -131,7 +129,7 @@
<osgi:reference id="transactionManager"
interface="javax.transaction.TransactionManager" />
- <osgi:service ref="pooledConnectionFactoryBean">
+ <osgi:service ref="pooledConnectionFactory">
<osgi:interfaces>
<value>javax.jms.ConnectionFactory</value>
</osgi:interfaces>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=928585&r1=928584&r2=928585&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Mar 29 03:37:15 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.1</activemq.version>
+ <activemq.version>5.3.0</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>
