From a0b603b0fe0acb2bdae5e10bc0c3dbe678bbd0df Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 5 Aug 2008 16:37:32 +0000
Subject: [PATCH] The <poller/> element now accepts the "initial-delay" and
 "fixed-rate" (boolean) attributes (INT-326).

---
 .../integration/config/IntegrationNamespaceUtils.java  | 10 ++++++++++
 .../integration/config/spring-integration-core-1.0.xsd |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
index 51bbaefc70..acf3d3da09 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java
@@ -148,6 +148,16 @@ public abstract class IntegrationNamespaceUtils {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PollingDispatcher.class);
 		Long period = Long.valueOf(element.getAttribute("period"));
 		PollingSchedule schedule = new PollingSchedule(period);
+		String initialDelay = element.getAttribute("initial-delay");
+		if (StringUtils.hasText(initialDelay)) {
+			schedule.setInitialDelay(Long.valueOf(initialDelay));
+		}
+		if ("true".equals(element.getAttribute("fixed-rate").toLowerCase())) {
+			schedule.setFixedRate(true);
+		}
+		else {
+			schedule.setFixedRate(false);
+		}
 		String templateBeanName = parseMessageExhangeTemplate(element, parserContext);
 		builder.addConstructorArgReference(sourceBeanName);
 		builder.addConstructorArgValue(schedule);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
index eaa5772f8b..b254b6156c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
@@ -229,6 +229,8 @@
 				<xsd:element name="transactional" type="transactionalType" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
 			<xsd:attribute name="period" type="xsd:long" use="required"/>
+			<xsd:attribute name="initial-delay" type="xsd:long"/>
+			<xsd:attribute name="fixed-rate" type="xsd:boolean"/>
 			<xsd:attribute name="receive-timeout" type="xsd:long"/>
 			<xsd:attribute name="send-timeout" type="xsd:long"/>
 			<xsd:attribute name="max-messages-per-poll" type="xsd:long"/>