diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java
index 98a941c96e..bf6543ce72 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java
@@ -34,17 +34,17 @@ public class MethodInvokingInboundChannelAdapterParser extends AbstractPollingIn
@Override
protected String parseSource(Element element, ParserContext parserContext) {
- String source = element.getAttribute("source");
- Assert.hasText(source, "The 'source' attribute is required.");
+ String sourceRef = element.getAttribute("ref");
+ Assert.hasText(sourceRef, "The 'ref' attribute is required.");
String methodName = element.getAttribute("method");
if (StringUtils.hasText(methodName)) {
BeanDefinitionBuilder invokerBuilder = BeanDefinitionBuilder.genericBeanDefinition(MethodInvokingSource.class);
- invokerBuilder.addPropertyReference("object", source);
+ invokerBuilder.addPropertyReference("object", sourceRef);
invokerBuilder.addPropertyValue("methodName", methodName);
- source = BeanDefinitionReaderUtils.registerWithGeneratedName(
+ sourceRef = BeanDefinitionReaderUtils.registerWithGeneratedName(
invokerBuilder.getBeanDefinition(), parserContext.getRegistry());
}
- return source;
+ return sourceRef;
}
}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java
index 16a2ebfebc..f6464aca7a 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java
@@ -35,19 +35,19 @@ public class MethodInvokingOutboundChannelAdapterParser extends AbstractOutbound
@Override
protected String parseAndRegisterConsumer(Element element, ParserContext parserContext) {
- String target = element.getAttribute("target");
- Assert.isTrue(StringUtils.hasText(target), "target is required");
+ String consumerRef = element.getAttribute("ref");
+ Assert.isTrue(StringUtils.hasText(consumerRef), "The 'ref' attribute is required.");
if (element.hasAttribute("method")) {
- target = BeanDefinitionReaderUtils.registerWithGeneratedName(
+ consumerRef = BeanDefinitionReaderUtils.registerWithGeneratedName(
this.parseConsumer(element, parserContext), parserContext.getRegistry());
}
- return target;
+ return consumerRef;
}
@Override
protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
BeanDefinitionBuilder invokerBuilder = BeanDefinitionBuilder.genericBeanDefinition(MethodInvokingConsumer.class);
- invokerBuilder.addConstructorArgReference(element.getAttribute("target"));
+ invokerBuilder.addConstructorArgReference(element.getAttribute("ref"));
invokerBuilder.addConstructorArgValue(element.getAttribute("method"));
return invokerBuilder.getBeanDefinition();
}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
index 499eb92006..61a2c08334 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
@@ -163,40 +163,32 @@
-
-
-
-
+
+
+
Defines a Channel Adapter that receives from a MessageSource and sends to a MessageChannel.
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
Defines a Channel Adapter that receives from a MessageChannel and sends to a MessageConsumer.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
index 46fd4cc36d..0f8c7b3c4a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
@@ -13,11 +13,11 @@
-
+
-
+
-
+