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 53E39188C5 for ; Thu, 26 Nov 2015 09:05:21 +0000 (UTC) Received: (qmail 48458 invoked by uid 500); 26 Nov 2015 09:05:21 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 48323 invoked by uid 500); 26 Nov 2015 09:05:21 -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 48306 invoked by uid 99); 26 Nov 2015 09:05:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2015 09:05:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C447E0C6E; Thu, 26 Nov 2015 09:05:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Thu, 26 Nov 2015 09:05:22 -0000 Message-Id: In-Reply-To: <768a5741af1a4153a564833cca48d744@git.apache.org> References: <768a5741af1a4153a564833cca48d744@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] camel git commit: Component docs Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0c8d4e83 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0c8d4e83 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0c8d4e83 Branch: refs/heads/camel-2.16.x Commit: 0c8d4e83487069f96799d305ba072883ef107a67 Parents: fc2a194 Author: Claus Ibsen Authored: Thu Nov 26 10:04:07 2015 +0100 Committer: Claus Ibsen Committed: Thu Nov 26 10:05:12 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/impl/ScheduledPollEndpoint.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0c8d4e83/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java index f63e2ba..5ebc194 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java @@ -64,9 +64,9 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint { private boolean sendEmptyMessageWhenIdle; @UriParam(label = "consumer,scheduler", description = "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.") private boolean greedy; - @UriParam(enums = "spring,quartz2", label = "consumer,scheduler", description = "To use a cron scheduler from either camel-spring or camel-quartz2 component") + @UriParam(enums = "none,spring,quartz2", defaultValue = "none", label = "consumer,scheduler", description = "To use a cron scheduler from either camel-spring or camel-quartz2 component") private ScheduledPollConsumerScheduler scheduler; - private String schedulerName; // used when configuring scheduler using a string value + private String schedulerName = "none"; // used when configuring scheduler using a string value @UriParam(label = "consumer,scheduler", description = "To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler.") private Map schedulerProperties; @UriParam(label = "consumer,scheduler", @@ -112,7 +112,11 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint { } if (scheduler == null && schedulerName != null) { - // special for scheduler if its "spring" + if ("none".equals(schedulerName)) { + // no cron scheduler in use + scheduler = null; + } + // special for scheduler if its "spring" or "quartz2" if ("spring".equals(schedulerName)) { try { Class clazz = getCamelContext().getClassResolver().resolveMandatoryClass(SPRING_SCHEDULER, ScheduledPollConsumerScheduler.class);