From b2d73b9824b1f59706cc98c34750d1c2527e9a12 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 17 Jun 2009 19:39:51 +0000
Subject: [PATCH] The 'task' sub-element of the 'scheduled-tasks' element is
 now 'scheduled' to be consistent with the @Scheduled annotation (and to avoid
 task:task).

---
 .../config/ScheduledTasksBeanDefinitionParser.java        | 2 +-
 .../springframework/scheduling/config/spring-task-3.0.xsd | 6 +++---
 .../scheduling/config/scheduledTasksContext.xml           | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
index 6cccbd8186..4dffba517d 100644
--- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
+++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
@@ -53,7 +53,7 @@ public class ScheduledTasksBeanDefinitionParser extends AbstractSingleBeanDefini
 		NodeList childNodes = element.getChildNodes();
 		for (int i = 0; i < childNodes.getLength(); i++) {
 			Node child = childNodes.item(i);
-			if (!(child instanceof Element) || !child.getLocalName().equals("task")) {
+			if (!(child instanceof Element) || !child.getLocalName().equals("scheduled")) {
 				continue;
 			}
 			Element taskElement = (Element) child;
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 a8d7b4e00c..27bbfa1a60 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
@@ -155,7 +155,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="task" type="taskType" minOccurs="1" maxOccurs="unbounded"/>
+				<xsd:element name="scheduled" type="scheduledTaskType" minOccurs="1" maxOccurs="unbounded"/>
 			</xsd:sequence>
 			<xsd:attribute name="scheduler" type="xsd:string" use="optional">
 				<xsd:annotation>
@@ -173,10 +173,10 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:complexType name="taskType">
+	<xsd:complexType name="scheduledTaskType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
-	Element defining a method-invoking task and its corresponding trigger.
+	Element defining a scheduled method-invoking task and its corresponding trigger.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:attribute name="cron" type="xsd:string" use="optional">
diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml b/org.springframework.context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
index f7970c6374..2a830e338c 100644
--- a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
+++ b/org.springframework.context/src/test/resources/org/springframework/scheduling/config/scheduledTasksContext.xml
@@ -8,10 +8,10 @@
 				http://www.springframework.org/schema/task/spring-task.xsd">
 
 	<task:scheduled-tasks scheduler="testScheduler">
-		<task:task ref="testBean" method="test" fixed-rate="1000"/>
-		<task:task ref="testBean" method="test" fixed-rate="2000"/>
-		<task:task ref="testBean" method="test" fixed-delay="3000"/>
-		<task:task ref="testBean" method="test" cron="*/4 * 9-17 * * MON-FRI"/>
+		<task:scheduled ref="testBean" method="test" fixed-rate="1000"/>
+		<task:scheduled ref="testBean" method="test" fixed-rate="2000"/>
+		<task:scheduled ref="testBean" method="test" fixed-delay="3000"/>
+		<task:scheduled ref="testBean" method="test" cron="*/4 * 9-17 * * MON-FRI"/>
 	</task:scheduled-tasks>
 
 	<task:scheduler id="testScheduler"/>