diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index 8edbda06ae7..edb74e204ba 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -31,6 +31,7 @@ import java.lang.annotation.Target;
* void return type.
*
* @author Mark Fisher
+ * @author Dave Syer
* @since 3.0
* @see ScheduledAnnotationBeanPostProcessor
*/
@@ -39,10 +40,29 @@ import java.lang.annotation.Target;
@Documented
public @interface Scheduled {
+ /**
+ * A cron-like expression, extending the usual UN*X definition to include
+ * triggers on the second as well as minute, hour, day of month, month
+ * and day of week. e.g. "0 * * * * MON-FRI" means once
+ * per minute on weekdays (at the top of the minute - the 0th second).
+ *
+ * @return an expression that can be parsed to a cron schedule
+ */
String cron() default "";
+ /**
+ * Execute the annotated method with a fixed period between the end
+ * of the last invocation and the start of the next.
+ *
+ * @return the delay in milliseconds
+ */
long fixedDelay() default -1;
+ /**
+ * Execute the annotated method with a fixed period between invocations.
+ *
+ * @return the period in milliseconds
+ */
long fixedRate() default -1;
}
diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
index b87680766a3..c929c71c261 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
@@ -20,7 +20,7 @@