Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A045D7166 for ; Mon, 1 Aug 2011 22:40:50 +0000 (UTC) Received: (qmail 35398 invoked by uid 500); 1 Aug 2011 22:40:50 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 35339 invoked by uid 500); 1 Aug 2011 22:40:50 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 35332 invoked by uid 99); 1 Aug 2011 22:40:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Aug 2011 22:40:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Aug 2011 22:40:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E795D238896F for ; Mon, 1 Aug 2011 22:40:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1152957 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/ Date: Mon, 01 Aug 2011 22:40:27 -0000 To: commits@camel.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110801224027.E795D238896F@eris.apache.org> Author: cschneider Date: Mon Aug 1 22:40:24 2011 New Revision: 1152957 URL: http://svn.apache.org/viewvc?rev=1152957&view=rev Log: CAMEL-4244 Moved default values to createProcessor 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/DelayDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.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=1152957&r1=1152956&r2=1152957&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 Mon Aug 1 22:40:24 2011 @@ -70,7 +70,7 @@ public class AggregateDefinition extends @XmlAttribute private Boolean parallelProcessing; @XmlAttribute - private String executorServiceRef = "Aggregator"; + private String executorServiceRef; @XmlAttribute private String aggregationRepositoryRef; @XmlAttribute @@ -98,18 +98,21 @@ public class AggregateDefinition extends } public AggregateDefinition(Predicate predicate) { + this(); if (predicate != null) { setExpression(new ExpressionDefinition(predicate)); } } public AggregateDefinition(Expression correlationExpression) { + this(); if (correlationExpression != null) { setExpression(new ExpressionDefinition(correlationExpression)); } } public AggregateDefinition(ExpressionDefinition correlationExpression) { + this(); this.expression = correlationExpression; } @@ -151,12 +154,13 @@ public class AggregateDefinition extends AggregationStrategy strategy = createAggregationStrategy(routeContext); if (executorService == null) { + String ref = executorServiceRef != null ? executorServiceRef : "Aggregator"; // executor service is mandatory for the Aggregator ExecutorServiceManager executorServiceManager = routeContext.getCamelContext().getExecutorServiceManager(); if (isParallelProcessing()) { - executorService = executorServiceManager.getDefaultExecutorService(executorServiceRef, this); + executorService = executorServiceManager.getDefaultExecutorService(ref, this); } else { - executorService = executorServiceManager.newSynchronousExecutorService(executorServiceRef, this); + executorService = executorServiceManager.newSynchronousExecutorService(ref, this); } } AggregateProcessor answer = new AggregateProcessor(routeContext.getCamelContext(), processor, correlation, strategy, executorService); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?rev=1152957&r1=1152956&r2=1152957&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java Mon Aug 1 22:40:24 2011 @@ -48,7 +48,7 @@ public class DelayDefinition extends Exp @XmlTransient private ExecutorService executorService; @XmlAttribute - private String executorServiceRef = "Delay"; + private String executorServiceRef; @XmlAttribute private Boolean asyncDelayed; @XmlAttribute @@ -83,8 +83,9 @@ public class DelayDefinition extends Exp ScheduledExecutorService scheduled = null; if (getAsyncDelayed() != null && getAsyncDelayed()) { + String ref = executorServiceRef != null ? executorServiceRef : "Delay"; ExecutorServiceManager manager = routeContext.getCamelContext().getExecutorServiceManager(); - scheduled = manager.getScheduledExecutorService(executorServiceRef, this); + scheduled = manager.getScheduledExecutorService(ref, this); } Delayer answer = new Delayer(childProcessor, delay, scheduled); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java?rev=1152957&r1=1152956&r2=1152957&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java Mon Aug 1 22:40:24 2011 @@ -49,7 +49,7 @@ public class MulticastDefinition extends @XmlTransient private ExecutorService executorService; @XmlAttribute - private String executorServiceRef = "Multicast"; + private String executorServiceRef; @XmlAttribute private Boolean streaming; @XmlAttribute @@ -219,7 +219,8 @@ public class MulticastDefinition extends ExecutorServiceManager executorServiceManager = routeContext.getCamelContext().getExecutorServiceManager(); if (isParallelProcessing() && executorService == null) { - executorService = executorServiceManager.getDefaultExecutorService(executorServiceRef, this); + String ref = this.executorServiceRef != null ? this.executorServiceRef : "Delay"; + executorService = executorServiceManager.getDefaultExecutorService(ref, this); } long timeout = getTimeout() != null ? getTimeout() : 0; if (timeout > 0 && !isParallelProcessing()) { Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java?rev=1152957&r1=1152956&r2=1152957&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java Mon Aug 1 22:40:24 2011 @@ -33,6 +33,7 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.processor.OnCompletionProcessor; import org.apache.camel.processor.UnitOfWorkProcessor; +import org.apache.camel.spi.ExecutorServiceManager; import org.apache.camel.spi.RouteContext; /** @@ -50,7 +51,7 @@ public class OnCompletionDefinition exte @XmlElement(name = "onWhen") private WhenDefinition onWhen; @XmlAttribute - private String executorServiceRef = "OnCompletion"; + private String executorServiceRef; @XmlAttribute(name = "useOriginalMessage") private Boolean useOriginalMessagePolicy; @XmlElementRef @@ -97,7 +98,9 @@ public class OnCompletionDefinition exte when = onWhen.getExpression().createPredicate(routeContext); } - executorService = routeContext.getCamelContext().getExecutorServiceManager().getDefaultExecutorService(executorServiceRef, this); + String ref = this.executorServiceRef != null ? this.executorServiceRef : "OnCompletion"; + ExecutorServiceManager manager = routeContext.getCamelContext().getExecutorServiceManager(); + executorService = manager.getDefaultExecutorService(ref, this); // should be false by default boolean original = getUseOriginalMessagePolicy() != null ? getUseOriginalMessagePolicy() : false; 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=1152957&r1=1152956&r2=1152957&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 Mon Aug 1 22:40:24 2011 @@ -30,6 +30,7 @@ import org.apache.camel.model.language.E import org.apache.camel.processor.RecipientList; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; +import org.apache.camel.spi.ExecutorServiceManager; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; @@ -52,7 +53,7 @@ public class RecipientListDefinition