You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/07/19 19:26:34 UTC
svn commit: r965567 - in /james/server/trunk: pom.xml
spoolmanager/src/main/java/org/apache/james/transport/camel/AbstractProcessorRouteBuilder.java
Author: norman
Date: Mon Jul 19 17:26:33 2010
New Revision: 965567
URL: http://svn.apache.org/viewvc?rev=965567&view=rev
Log:
Upgrade camel to fix (JAMES-1026), we need specify the aggregateStrategy explicit because this changed in camel 2.3.0+ (JAMES-1013)
Modified:
james/server/trunk/pom.xml
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/AbstractProcessorRouteBuilder.java
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=965567&r1=965566&r2=965567&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Jul 19 17:26:33 2010
@@ -1109,7 +1109,7 @@
<javax.mail.artifactId>mail</javax.mail.artifactId>
<productName>Apache-James Mail Server</productName>
<derby.version>10.5.3.0_1</derby.version>
- <camel.version>2.2.0</camel.version>
+ <camel.version>2.4.0</camel.version>
<spring.version>3.0.2.RELEASE</spring.version>
<imap.version>0.1-M2-SNAPSHOT</imap.version>
<protocols.version>1.1</protocols.version>
Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/AbstractProcessorRouteBuilder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/AbstractProcessorRouteBuilder.java?rev=965567&r1=965566&r2=965567&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/AbstractProcessorRouteBuilder.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/camel/AbstractProcessorRouteBuilder.java Mon Jul 19 17:26:33 2010
@@ -32,6 +32,7 @@ import javax.mail.MessagingException;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ChoiceDefinition;
+import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
@@ -77,6 +78,7 @@ public abstract class AbstractProcessorR
this.mailetLoader = mailetLoader;
}
+ private final UseLatestAggregationStrategy aggr = new UseLatestAggregationStrategy();
/*
* (non-Javadoc)
* @see org.apache.camel.builder.RouteBuilder#configure()
@@ -197,9 +199,15 @@ public abstract class AbstractProcessorR
// do splitting of the mail based on the stored matcher
.split().method(MatcherSplitter.class)
+ // set the aggregationStrategy. This is needed because the default has
+ // change.
+ // See:
+ // https://issues.apache.org/jira/browse/JAMES-1013
+ // http://camel.apache.org/camel-230-release.html
+ .aggregationStrategy(aggr)
+
// speed up things by processing in parallel
.parallelProcessing()
-
// start first choice
.choice()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org