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 ", 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 @@
+
+
+
+
+
+
+
+
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);
+ }
+
+}