From 8be2af40a5f27ad6e0c9916ae501de4b6467e21a Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 3 Sep 2009 15:34:49 +0000
Subject: [PATCH] INT-788 Fixed 'cron-trigger' parser. It now refers to the
 core Spring CronTrigger.

---
 .../integration/config/xml/PollerParser.java  |  2 +-
 .../xml/CronTriggerParserTests-context.xml    | 14 +++++
 .../config/xml/CronTriggerParserTests.java    | 57 +++++++++++++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml
 create mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
index 95b4d78414..cf5c7c4069 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
@@ -133,7 +133,7 @@ public class PollerParser extends AbstractBeanDefinitionParser {
 			parserContext.getReaderContext().error("the 'expression' attribute is required for a <cron-trigger/>", element);
 		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
-				IntegrationNamespaceUtils.BASE_PACKAGE + ".scheduling.CronTrigger");
+				"org.springframework.scheduling.support.CronTrigger");
 		builder.addConstructorArgValue(cronExpression);
 		return BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry());
 	}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml
new file mode 100644
index 0000000000..c90b6ff7f6
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<poller id="poller" receive-timeout="1234">
+		<cron-trigger expression="*/10 * 9-17 * * MON-FRI"/>
+	</poller>
+
+</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java
new file mode 100644
index 0000000000..62bb79931f
--- /dev/null
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.config.xml;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.integration.scheduling.PollerMetadata;
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class CronTriggerParserTests {
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void checkConfig() {
+		Object poller = context.getBean("poller");
+		assertEquals(PollerMetadata.class, poller.getClass());
+		PollerMetadata metadata = (PollerMetadata) poller;
+		Trigger trigger = metadata.getTrigger();
+		assertEquals(CronTrigger.class, trigger.getClass());
+		DirectFieldAccessor accessor = new DirectFieldAccessor(trigger);
+		String expression = (String) new DirectFieldAccessor(
+				accessor.getPropertyValue("sequenceGenerator"))
+				.getPropertyValue("expression");
+		assertEquals("*/10 * 9-17 * * MON-FRI", expression);
+	}
+
+}