From 4ae4b5d4d7523cf7aebfcc39024c6a21dcfe1e31 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 28 Sep 2010 17:58:06 -0400
Subject: [PATCH] INT-1485 updated XSD schema to be more explicit about
 deprecated sub-elements on the poller

---
 .../config/xml/spring-integration-2.0.xsd     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
index 783d3b80da..ce725abcb3 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
@@ -1051,12 +1051,24 @@
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<!-- Poller sub-elements are deprecated since Spring Integration 2.0 -->
 			<xsd:choice minOccurs="0" maxOccurs="1">
-				<xsd:element name="interval-trigger" type="intervalTriggerType" />
-				<xsd:element name="cron-trigger" type="cronTriggerType" />
+				<xsd:element name="interval-trigger" type="intervalTriggerType">
+					<xsd:annotation>
+						<xsd:documentation>
+	NOTE: The 'interval-trigger' sub-element is deprecated as of Spring Integration 2.0 and will be removed in version 2.1.
+	Use one of the interval trigger attributes instead ('fixed-delay' or 'fixed-rate').			
+						</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="cron-trigger" type="cronTriggerType">
+					<xsd:annotation>
+						<xsd:documentation>
+	NOTE: The 'cron-trigger' sub-element is deprecated as of Spring Integration 2.0 and will be removed in version 2.1.
+	Use the 'cron' attribute instead.
+						</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
 			</xsd:choice>
-			<!-- Poller sub-elements are deprecated since Spring Integration 2.0 -->
 			<xsd:choice>
 				<xsd:element name="transactional" type="transactionalType" minOccurs="0" maxOccurs="1" />
 				<xsd:element name="advice-chain" minOccurs="0" maxOccurs="1">