Author: gnodet
Date: Thu Jun 5 02:35:23 2008
New Revision: 663510
URL: http://svn.apache.org/viewvc?rev=663510&view=rev
Log:
SM-1363, SM-1381: upgrade to activemq 5.1.0 and change the default persistence
adapter
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
servicemix/smx3/trunk/pom.xml
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml?rev=663510&r1=663509&r2=663510&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
Thu Jun 5 02:35:23 2008
@@ -30,13 +30,15 @@
</bean>
</amq:managementContext>
- <!-- Use journaled JDBC persistence -->
+ <!-- Use AMQ Message Store as default broker persistence adapter -->
<amq:persistenceAdapter>
+ <amq:amqPersistenceAdapter directory="file://./data/amq"/>
+
+ <!-- Examples for journaledJDBC if JDBC is required -->
+ <!--
<amq:journaledJDBC journalLogFiles="5" dataDirectory="./data/amq"/>
- <!-- To use a different datasource, use th following syntax : -->
- <!--
<amq:journaledJDBC journalLogFiles="5" dataDirectory="../data"
dataSource="#postgres-ds"/>
- -->
+ -->
</amq:persistenceAdapter>
<amq:transportConnectors>
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml?rev=663510&r1=663509&r2=663510&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
Thu Jun 5 02:35:23 2008
@@ -21,7 +21,7 @@
<!-- START SNIPPET: jndi -->
<beans xmlns:jencks="http://jencks.org/2.0";
xmlns:amq="http://activemq.org/config/1.0";
- xmlns:amqra="http://activemq.org/ra/1.0";
+ xmlns:amqra="http://activemq.apache.org/schema/ra";
xmlns:util="http://www.springframework.org/schema/util";>
<bean id="jndi" depends-on="broker"
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=663510&r1=663509&r2=663510&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Thu Jun 5 02:35:23 2008
@@ -211,8 +211,8 @@
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
<xbean-version>3.2</xbean-version>
<spring-version>2.0.6</spring-version>
- <activemq-version>4.1.1</activemq-version>
- <activeio-version>3.0.0-incubator</activeio-version>
+ <activemq-version>5.1.0</activemq-version>
+ <activeio-version>3.1.0</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
<camel-version>1.3.0</camel-version>
<jencks-version>2.1</jencks-version>
