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 89e2c9a87c..11595d0e3b 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 @@ -25,6 +25,7 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.endpoint.DefaultEndpointPoller; +import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; @@ -108,8 +109,8 @@ public abstract class IntegrationNamespaceUtils { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(DefaultEndpointPoller.class); if (txElement != null) { builder.addPropertyReference("transactionManager", txElement.getAttribute("transaction-manager")); - builder.addPropertyValue("propagationBehaviorName", txElement.getAttribute("propagation")); - builder.addPropertyValue("isolationLevelName", txElement.getAttribute("isolation")); + builder.addPropertyValue("propagationBehaviorName", DefaultTransactionDefinition.PREFIX_PROPAGATION + txElement.getAttribute("propagation")); + builder.addPropertyValue("isolationLevelName", DefaultTransactionDefinition.PREFIX_ISOLATION + txElement.getAttribute("isolation")); builder.addPropertyValue("transactionTimeout", txElement.getAttribute("timeout")); builder.addPropertyValue("transactionReadOnly", txElement.getAttribute("read-only")); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/DefaultEndpointPoller.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/DefaultEndpointPoller.java index 55ce9e5f07..9ce0d5b905 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/DefaultEndpointPoller.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/DefaultEndpointPoller.java @@ -19,6 +19,7 @@ package org.springframework.integration.endpoint; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.InitializingBean; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.MessageTarget; @@ -34,7 +35,7 @@ import org.springframework.transaction.support.TransactionTemplate; * * @author Mark Fisher */ -public class DefaultEndpointPoller extends SimplePoller { +public class DefaultEndpointPoller extends SimplePoller implements InitializingBean { private final Log logger = LogFactory.getLog(this.getClass());