You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/10/16 11:54:25 UTC
svn commit: r825828 - in /servicemix/smx4/features/trunk: assembly/pom.xml
assembly/src/main/distribution/text/etc/activemq-broker.xml
assembly/src/main/filtered-resources/features.xml pom.xml
Author: ccustine
Date: Fri Oct 16 09:54:25 2009
New Revision: 825828
URL: http://svn.apache.org/viewvc?rev=825828&view=rev
Log:
SM-1903 Upgrade Apache ActiveMQ 5.3
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq-broker.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=825828&r1=825827&r2=825828&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Oct 16 09:54:25 2009
@@ -559,6 +559,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>kahadb</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
<version>${activemq.version}</version>
</dependency>
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=825828&r1=825827&r2=825828&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 Fri Oct 16 09:54:25 2009
@@ -33,11 +33,21 @@
<destinationPolicy>
<policyMap>
<policyEntries>
- <policyEntry queue=">" memoryLimit="5mb"/>
- <policyEntry topic=">" memoryLimit="5mb">
- <subscriptionRecoveryPolicy>
- <lastImageSubscriptionRecoveryPolicy/>
- </subscriptionRecoveryPolicy>
+ <policyEntry topic=">" producerFlowControl="true" memoryLimit="1mb">
+ <pendingSubscriberPolicy>
+ <vmCursor />
+ </pendingSubscriberPolicy>
+ </policyEntry>
+ <policyEntry queue=">" producerFlowControl="true" memoryLimit="1mb">
+ <!-- Use VM cursor for better latency
+ For more information, see:
+
+ http://activemq.apache.org/message-cursors.html
+
+ <pendingQueuePolicy>
+ <vmQueueCursor/>
+ </pendingQueuePolicy>
+ -->
</policyEntry>
</policyEntries>
</policyMap>
@@ -58,7 +68,7 @@
</networkConnectors>
<persistenceAdapter>
- <amqPersistenceAdapter syncOnWrite="false" directory="${karaf.base}/data/activemq/default" maxFileLength="20 mb"/>
+ <kahaDB directory="${karaf.base}/data/activemq/default" />
</persistenceAdapter>
<!-- Use the following if you wish to configure the journal with JDBC -->
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=825828&r1=825827&r2=825828&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Fri Oct 16 09:54:25 2009
@@ -44,6 +44,7 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo.j2ee.management.version}</bundle>
<bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.activemq/kahadb/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-ra/${activemq.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-console/${activemq.version}</bundle>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=825828&r1=825827&r2=825828&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Oct 16 09:54:25 2009
@@ -62,7 +62,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_1</abdera.version>
- <activemq.version>5.2.0</activemq.version>
+ <activemq.version>5.3.0</activemq.version>
<acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0_1</ant.version>
<antlr.version>3.0.1_1</antlr.version>