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 2016/05/03 20:16:38 UTC

[1/3] camel git commit: [CAMEL-9930] Add supported formats to UriParam annotation

Repository: camel
Updated Branches:
  refs/heads/master 6e8d58bc3 -> 02f6569e1


[CAMEL-9930] Add supported formats to UriParam annotation


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb4d34ea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb4d34ea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb4d34ea

Branch: refs/heads/master
Commit: cb4d34ea35a8e54b4c26e66e85a25bb96a2059c9
Parents: 705a5ee
Author: Josef Ludvicek <jl...@redhat.com>
Authored: Tue May 3 12:41:18 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 3 19:49:54 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/timer/TimerEndpoint.java | 3 ++-
 .../main/java/org/apache/camel/impl/ScheduledPollEndpoint.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cb4d34ea/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
index 4f10903..860a1e1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
@@ -43,7 +43,8 @@ import org.apache.camel.spi.UriPath;
 public class TimerEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
     @UriPath @Metadata(required = "true")
     private String timerName;
-    @UriParam(defaultValue = "1000")
+    @UriParam(defaultValue = "1000", description = "If greater than 0, generate periodic events every period milliseconds."
+            + " You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).")
     private long period = 1000;
     @UriParam(defaultValue = "1000")
     private long delay = 1000;

http://git-wip-us.apache.org/repos/asf/camel/blob/cb4d34ea/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 21e1d53..2d4c97e 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
@@ -48,7 +48,8 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
             description = "Whether the scheduler should be auto started.")
     private boolean startScheduler = true;
     @UriParam(optionalPrefix = "consumer.", defaultValue = "1000", label = "consumer,scheduler",
-            description = "Milliseconds before the first poll starts.")
+            description = "Milliseconds before the first poll starts."
+                    + " You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).")
     private long initialDelay = 1000;
     @UriParam(optionalPrefix = "consumer.", defaultValue = "500", label = "consumer,scheduler",
             description = "Milliseconds before the next poll.")


[2/3] camel git commit: [CAMEL-9930] Add supported formats to period javadoc

Posted by da...@apache.org.
[CAMEL-9930] Add supported formats to period javadoc


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/705a5eeb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/705a5eeb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/705a5eeb

Branch: refs/heads/master
Commit: 705a5eeb96477c3a9086a253977ff3adef51a5b5
Parents: 6e8d58b
Author: Josef Ludvicek <jl...@redhat.com>
Authored: Mon May 2 17:58:32 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 3 19:49:54 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/timer/TimerEndpoint.java     | 2 ++
 .../main/java/org/apache/camel/impl/ScheduledPollEndpoint.java   | 4 ++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/705a5eeb/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
index 9473bc7..4f10903 100644
--- a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
@@ -177,6 +177,8 @@ public class TimerEndpoint extends DefaultEndpoint implements MultipleConsumersS
      * If greater than 0, generate periodic events every period milliseconds.
      * <p/>
      * The default value is 1000.
+     * You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).
+     * @see <a href="http://camel.apache.org/how-do-i-specify-time-period-in-a-human-friendly-syntax.html">human friendly syntax</a>
      */
     @ManagedAttribute(description = "Timer Period")
     public void setPeriod(long period) {

http://git-wip-us.apache.org/repos/asf/camel/blob/705a5eeb/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 6d1b938..21e1d53 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
@@ -251,6 +251,10 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
 
     /**
      * Milliseconds before the first poll starts.
+     * <p/>
+     * The default value is 1000.
+     * You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).
+     * @see <a href="http://camel.apache.org/how-do-i-specify-time-period-in-a-human-friendly-syntax.html">human friendly syntax</a>
      */
     public void setInitialDelay(long initialDelay) {
         this.initialDelay = initialDelay;


[3/3] camel git commit: CAMEL-9930: Updated component docs. This closes #972

Posted by da...@apache.org.
CAMEL-9930: Updated component docs. This closes #972


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02f6569e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02f6569e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02f6569e

Branch: refs/heads/master
Commit: 02f6569e1f4c03babf96ebce6f5a7140b35a5cfa
Parents: cb4d34e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 3 20:16:29 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 3 20:16:29 2016 +0200

----------------------------------------------------------------------
 components/camel-aws/src/main/docs/aws-ddbstream.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-kinesis.adoc   | 4 +++-
 components/camel-aws/src/main/docs/aws-s3.adoc        | 4 +++-
 components/camel-aws/src/main/docs/aws-sqs.adoc       | 4 +++-
 components/camel-ftp/src/main/docs/ftp.adoc           | 4 +++-
 components/camel-hipchat/src/main/docs/hipchat.adoc   | 4 +++-
 components/camel-ibatis/src/main/docs/ibatis.adoc     | 4 +++-
 components/camel-ironmq/src/main/docs/ironmq.adoc     | 4 +++-
 components/camel-jpa/src/main/docs/jpa.adoc           | 4 +++-
 components/camel-jt400/src/main/docs/jt400.adoc       | 4 +++-
 components/camel-krati/src/main/docs/krati.adoc       | 4 +++-
 components/camel-twitter/src/main/docs/twitter.adoc   | 4 +++-
 components/camel-yammer/src/main/docs/yammer.adoc     | 4 +++-
 13 files changed, 39 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-aws/src/main/docs/aws-ddbstream.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-ddbstream.adoc b/components/camel-aws/src/main/docs/aws-ddbstream.adoc
index cf16e4c..d9b25fe 100644
--- a/components/camel-aws/src/main/docs/aws-ddbstream.adoc
+++ b/components/camel-aws/src/main/docs/aws-ddbstream.adoc
@@ -37,6 +37,7 @@ The AWS DynamoDB Streams component has no options.
 
 
 
+
 // endpoint options: START
 The AWS DynamoDB Streams component supports 24 endpoint options which are listed below:
 
@@ -59,7 +60,7 @@ The AWS DynamoDB Streams component supports 24 endpoint options which are listed
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -71,6 +72,7 @@ The AWS DynamoDB Streams component supports 24 endpoint options which are listed
 // endpoint options: END
 
 
+
 Required DynampDBStream component options
 
 You have to provide the�amazonDynamoDbStreamsClient in the

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-aws/src/main/docs/aws-kinesis.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-kinesis.adoc b/components/camel-aws/src/main/docs/aws-kinesis.adoc
index 8328a83..375f458 100644
--- a/components/camel-aws/src/main/docs/aws-kinesis.adoc
+++ b/components/camel-aws/src/main/docs/aws-kinesis.adoc
@@ -38,6 +38,7 @@ The AWS Kinesis component has no options.
 
 
 
+
 // endpoint options: START
 The AWS Kinesis component supports 25 endpoint options which are listed below:
 
@@ -61,7 +62,7 @@ The AWS Kinesis component supports 25 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -74,6 +75,7 @@ The AWS Kinesis component supports 25 endpoint options which are listed below:
 
 
 
+
 Required Kinesis component options
 
 You have to provide the�amazonKinesisClient in the

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-aws/src/main/docs/aws-s3.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-s3.adoc b/components/camel-aws/src/main/docs/aws-s3.adoc
index e291580..ba508d8 100644
--- a/components/camel-aws/src/main/docs/aws-s3.adoc
+++ b/components/camel-aws/src/main/docs/aws-s3.adoc
@@ -39,6 +39,7 @@ The AWS S3 Storage Service component has no options.
 
 
 
+
 // endpoint options: START
 The AWS S3 Storage Service component supports 38 endpoint options which are listed below:
 
@@ -75,7 +76,7 @@ The AWS S3 Storage Service component supports 38 endpoint options which are list
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -90,6 +91,7 @@ The AWS S3 Storage Service component supports 38 endpoint options which are list
 
 
 
+
 |=======================================================================
 
 Required S3 component options

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-aws/src/main/docs/aws-sqs.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-sqs.adoc b/components/camel-aws/src/main/docs/aws-sqs.adoc
index 2988bf6..12b8ce3 100644
--- a/components/camel-aws/src/main/docs/aws-sqs.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs.adoc
@@ -38,6 +38,7 @@ The AWS Simple Queue Service component has no options.
 
 
 
+
 // endpoint options: START
 The AWS Simple Queue Service component supports 45 endpoint options which are listed below:
 
@@ -81,7 +82,7 @@ The AWS Simple Queue Service component supports 45 endpoint options which are li
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -94,6 +95,7 @@ The AWS Simple Queue Service component supports 45 endpoint options which are li
 
 
 
+
 Required SQS component options
 
 You have to provide the amazonSQSClient in the

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-ftp/src/main/docs/ftp.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/docs/ftp.adoc b/components/camel-ftp/src/main/docs/ftp.adoc
index ea72ae9..87240d0 100644
--- a/components/camel-ftp/src/main/docs/ftp.adoc
+++ b/components/camel-ftp/src/main/docs/ftp.adoc
@@ -110,6 +110,7 @@ link:file2.html[File] is inherited.
 The FTP component has no options.
 // component options: END
 
+
 // endpoint options: START
 The FTP component supports 100 endpoint options which are listed below:
 
@@ -202,7 +203,7 @@ The FTP component supports 100 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -220,6 +221,7 @@ The FTP component supports 100 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [Info]
 ====
 FTPS component default trust store

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-hipchat/src/main/docs/hipchat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-hipchat/src/main/docs/hipchat.adoc b/components/camel-hipchat/src/main/docs/hipchat.adoc
index 2d8a4ef..b72708e 100644
--- a/components/camel-hipchat/src/main/docs/hipchat.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat.adoc
@@ -37,6 +37,7 @@ The Hipchat component has no options.
 
 
 
+
 // endpoint options: START
 The Hipchat component supports 24 endpoint options which are listed below:
 
@@ -59,7 +60,7 @@ The Hipchat component supports 24 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -72,6 +73,7 @@ The Hipchat component supports 24 endpoint options which are listed below:
 
 
 
+
 [[Hipchat-ScheduledPollConsumer]]
 Scheduled Poll Consumer
 ^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-ibatis/src/main/docs/ibatis.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ibatis/src/main/docs/ibatis.adoc b/components/camel-ibatis/src/main/docs/ibatis.adoc
index 5ad8137..8744730 100644
--- a/components/camel-ibatis/src/main/docs/ibatis.adoc
+++ b/components/camel-ibatis/src/main/docs/ibatis.adoc
@@ -73,6 +73,7 @@ The iBatis component supports 3 options which are listed below.
 
 
 
+
 // endpoint options: START
 The iBatis component supports 28 endpoint options which are listed below:
 
@@ -99,7 +100,7 @@ The iBatis component supports 28 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -111,6 +112,7 @@ The iBatis component supports 28 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [[iBATIS-MessageHeaders]]
 Message Headers
 ^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-ironmq/src/main/docs/ironmq.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ironmq/src/main/docs/ironmq.adoc b/components/camel-ironmq/src/main/docs/ironmq.adoc
index 70961bf..24f0600 100644
--- a/components/camel-ironmq/src/main/docs/ironmq.adoc
+++ b/components/camel-ironmq/src/main/docs/ironmq.adoc
@@ -42,6 +42,7 @@ Options
 
 
 
+
 // endpoint options: START
 The ironmq component supports 31 endpoint options which are listed below:
 
@@ -71,7 +72,7 @@ The ironmq component supports 31 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -84,6 +85,7 @@ The ironmq component supports 31 endpoint options which are listed below:
 
 
 
+
 [[IronMQ-IronMQComponentOptions]]
 IronMQComponent Options
 ^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-jpa/src/main/docs/jpa.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/main/docs/jpa.adoc b/components/camel-jpa/src/main/docs/jpa.adoc
index 937f461..f71b39e 100644
--- a/components/camel-jpa/src/main/docs/jpa.adoc
+++ b/components/camel-jpa/src/main/docs/jpa.adoc
@@ -106,6 +106,7 @@ The JPA component supports 4 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JPA component supports 42 endpoint options which are listed below:
 
@@ -146,7 +147,7 @@ The JPA component supports 42 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -158,6 +159,7 @@ The JPA component supports 42 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [[JPA-MessageHeaders]]
 Message Headers
 ^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-jt400/src/main/docs/jt400.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jt400/src/main/docs/jt400.adoc b/components/camel-jt400/src/main/docs/jt400.adoc
index 02fdad7..610d010 100644
--- a/components/camel-jt400/src/main/docs/jt400.adoc
+++ b/components/camel-jt400/src/main/docs/jt400.adoc
@@ -56,6 +56,7 @@ The JT400 component supports 1 options which are listed below.
 
 
 
+
 // endpoint options: START
 The JT400 component supports 33 endpoint options which are listed below:
 
@@ -87,7 +88,7 @@ The JT400 component supports 33 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -99,6 +100,7 @@ The JT400 component supports 33 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [[JT400-Usage]]
 Usage
 ^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-krati/src/main/docs/krati.adoc
----------------------------------------------------------------------
diff --git a/components/camel-krati/src/main/docs/krati.adoc b/components/camel-krati/src/main/docs/krati.adoc
index 72c7d8f..8e2595b 100644
--- a/components/camel-krati/src/main/docs/krati.adoc
+++ b/components/camel-krati/src/main/docs/krati.adoc
@@ -53,6 +53,7 @@ The Krati component has no options.
 
 
 
+
 // endpoint options: START
 The Krati component supports 30 endpoint options which are listed below:
 
@@ -81,7 +82,7 @@ The Krati component supports 30 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 500 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -93,6 +94,7 @@ The Krati component supports 30 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [source,java]
 ------------------------------------------------------------------------------------------------
 krati:/tmp/krati?operation=CamelKratiGet&initialCapacity=10000&keySerializer=#myCustomSerializer

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-twitter/src/main/docs/twitter.adoc
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/docs/twitter.adoc b/components/camel-twitter/src/main/docs/twitter.adoc
index c578656..eb8d487 100644
--- a/components/camel-twitter/src/main/docs/twitter.adoc
+++ b/components/camel-twitter/src/main/docs/twitter.adoc
@@ -142,6 +142,7 @@ URI options
 
 
 
+
 // endpoint options: START
 The Twitter component supports 43 endpoint options which are listed below:
 
@@ -172,7 +173,7 @@ The Twitter component supports 43 endpoint options which are listed below:
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | delay | scheduler | 60000 | long | Milliseconds before the next poll.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -197,6 +198,7 @@ The Twitter component supports 43 endpoint options which are listed below:
 
 
 
+
 [[Twitter-Messageheaders]]
 Message headers
 ^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/02f6569e/components/camel-yammer/src/main/docs/yammer.adoc
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/docs/yammer.adoc b/components/camel-yammer/src/main/docs/yammer.adoc
index cd5dd20..65ac601 100644
--- a/components/camel-yammer/src/main/docs/yammer.adoc
+++ b/components/camel-yammer/src/main/docs/yammer.adoc
@@ -66,6 +66,7 @@ You can also configure these options directly in the endpoint.
 Endpoint options
 ^^^^^^^^^^^^^^^^^
 
+
 // endpoint options: START
 The Yammer component supports 29 endpoint options which are listed below:
 
@@ -93,7 +94,7 @@ The Yammer component supports 29 endpoint options which are listed below:
 | backoffIdleThreshold | scheduler |  | int | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.
 | backoffMultiplier | scheduler |  | int | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.
 | greedy | scheduler | false | boolean | If greedy is enabled then the ScheduledPollConsumer will run immediately again if the previous run polled 1 or more messages.
-| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts.
+| initialDelay | scheduler | 1000 | long | Milliseconds before the first poll starts. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour).
 | runLoggingLevel | scheduler | TRACE | LoggingLevel | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.
 | scheduledExecutorService | scheduler |  | ScheduledExecutorService | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.
 | scheduler | scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler from either camel-spring or camel-quartz2 component
@@ -105,6 +106,7 @@ The Yammer component supports 29 endpoint options which are listed below:
 // endpoint options: END
 
 
+
 [[Yammer-Consumingmessages]]
 Consuming messages
 ^^^^^^^^^^^^^^^^^^