From b2db1c0b168e367e3353027bf4871d55f3441df9 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 5 Sep 2008 17:44:08 +0000
Subject: [PATCH] Replaced the 'target' attribute with 'channel' on the
 <wire-tap/> element.

---
 .../springframework/integration/config/WireTapParser.java | 4 ++--
 .../integration/config/spring-integration-core-1.0.xsd    | 2 +-
 .../integration/config/wireTapParserTests.xml             | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java
index e3a99a48e0..a13931396f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java
@@ -34,9 +34,9 @@ public class WireTapParser implements BeanDefinitionRegisteringParser {
 
 	public String parse(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(WireTap.class);
-		String targetRef = element.getAttribute("target");
+		String targetRef = element.getAttribute("channel");
 		if (!StringUtils.hasText(targetRef)) {
-			throw new ConfigurationException("the 'target' attribute is required");
+			throw new ConfigurationException("the 'channel' attribute is required");
 		}
 		builder.addConstructorArgReference(targetRef);
 		String selectorRef = element.getAttribute("selector");
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 f4061f007f..8a5f1d5cd4 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
@@ -429,7 +429,7 @@
 	Defines a Wire Tap Channel Interceptor.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="target" type="xsd:string" use="required"/>
+		<xsd:attribute name="channel" type="xsd:string" use="required"/>
 		<xsd:attribute name="selector" type="xsd:string" use="optional"/>
 		<xsd:attribute name="timeout" type="xsd:long" use="optional"/>
 	</xsd:complexType>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
index d1a92b74f3..c99e9d8388 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
@@ -14,28 +14,28 @@
 	<channel id="noSelectors">
 		<queue capacity="10"/>
 		<interceptors>
-			<wire-tap target="wireTapChannel"/>
+			<wire-tap channel="wireTapChannel"/>
 		</interceptors>
 	</channel>
 
 	<channel id="accepting">
 		<queue capacity="10"/>
 		<interceptors>
-			<wire-tap target="wireTapChannel" selector="acceptingSelector"/>
+			<wire-tap channel="wireTapChannel" selector="acceptingSelector"/>
 		</interceptors>
 	</channel>
 
 	<channel id="rejecting">
 		<queue capacity="10"/>
 		<interceptors>
-			<wire-tap target="wireTapChannel" selector="rejectingSelector"/>
+			<wire-tap channel="wireTapChannel" selector="rejectingSelector"/>
 		</interceptors>
 	</channel>
 
 	<channel id="timeout">
 		<queue capacity="10"/>
 		<interceptors>
-			<wire-tap target="wireTapChannel" timeout="1234"/>
+			<wire-tap channel="wireTapChannel" timeout="1234"/>
 		</interceptors>
 	</channel>