You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/11/26 10:05:21 UTC
[1/2] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x fc2a19483 -> 0c8d4e834
refs/heads/master 34859c7dc -> e5c130b3e
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e5c130b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e5c130b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e5c130b3
Branch: refs/heads/master
Commit: e5c130b3e8b25c117a08ca67d877074e83ee4fea
Parents: 34859c7
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Nov 26 10:04:07 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Nov 26 10:04:07 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/e5c130b3/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<String, Object> 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<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(SPRING_SCHEDULER, ScheduledPollConsumerScheduler.class);
[2/2] camel git commit: Component docs
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Thu Nov 26 10:04:07 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
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<String, Object> 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<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(SPRING_SCHEDULER, ScheduledPollConsumerScheduler.class);