Author: davsclaus
Date: Wed Feb 17 14:33:56 2010
New Revision: 910993
URL: http://svn.apache.org/viewvc?rev=910993&view=rev
Log:
CAMEL-1686: Overhaul of aggregator.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
(contents, props changed)
- copied, changed from r910967,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationRepository.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationRepository.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=910993&r1=910992&r2=910993&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
Wed Feb 17 14:33:56 2010
@@ -34,7 +34,7 @@
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.camel.processor.aggregate.AggregateProcessor;
-import org.apache.camel.processor.aggregate.AggregationRepository;
+import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
import org.apache.camel.spi.RouteContext;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=910993&r1=910992&r2=910993&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
Wed Feb 17 14:33:56 2010
@@ -151,6 +151,17 @@
}
/**
+ * Set the aggregationStrategy
+ *
+ * @param aggregationStrategyRef a reference to a strategy to lookup
+ * @return the builder
+ */
+ public RecipientListDefinition aggregationStrategyRef(String
aggregationStrategyRef) {
+ setStrategyRef(aggregationStrategyRef);
+ return this;
+ }
+
+ /**
* Doing the recipient list work in parallel
*
* @return the builder
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=910993&r1=910992&r2=910993&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Wed Feb 17 14:33:56 2010
@@ -33,6 +33,7 @@
import org.apache.camel.impl.LoggingExceptionHandler;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.processor.Traceable;
+import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.util.DefaultTimeoutMap;
import org.apache.camel.util.ExchangeHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java?rev=910993&r1=910992&r2=910993&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
Wed Feb 17 14:33:56 2010
@@ -21,9 +21,10 @@
import org.apache.camel.Exchange;
import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.spi.AggregationRepository;
/**
- * A memory based {...@link
org.apache.camel.processor.aggregate.AggregationRepository} which stores in
memory only.
+ * A memory based {...@link org.apache.camel.spi.AggregationRepository} which
stores in memory only.
*
* @version $Revision$
*/
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
(from r910967,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationRepository.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationRepository.java&r1=910967&r2=910993&rev=910993&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationRepository.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
Wed Feb 17 14:33:56 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.processor.aggregate;
+package org.apache.camel.spi;
import org.apache.camel.Exchange;
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/AggregationRepository.java
------------------------------------------------------------------------------
svn:keywords = Rev Date