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:39 UTC

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

[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;