From 630fb2497297f07dfe326cdb573385865b21eaa8 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 8 Nov 2010 12:43:50 -0500
Subject: [PATCH] INT-1553 fixed the schema, renamed twitter-connection to
 twitter-template, fixed tests

---
 .../config/TwitterReceivingMessageSourceParser.java    |  2 +-
 .../config/TwitterSendingMessageHandlerParser.java     |  2 +-
 .../twitter/config/spring-integration-twitter-2.0.xsd  | 10 +++++-----
 .../TestReceivingMessageSourceParser-context.xml       |  6 +++---
 .../config/TestSendingMessageHandlerParser-context.xml |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java
index 6babd4dc9d..2c4202ee45 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterReceivingMessageSourceParser.java
@@ -53,7 +53,7 @@ public class TwitterReceivingMessageSourceParser extends AbstractPollingInboundC
 			parserContext.getReaderContext().error("element '" + elementName + "' is not supported by this parser.", element);
 		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(className);
-		builder.addConstructorArgReference(element.getAttribute("twitter-connection"));
+		builder.addConstructorArgReference(element.getAttribute("twitter-template"));
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-startup");
 		String name = BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry());
 		return new RuntimeBeanReference(name);
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java
index fee83a1af7..f20180ee3d 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/TwitterSendingMessageHandlerParser.java
@@ -44,7 +44,7 @@ public class TwitterSendingMessageHandlerParser extends AbstractOutboundChannelA
 			className = BASE_PACKAGE + ".outbound.DirectMessageSendingMessageHandler";
 		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(className);
-		builder.addConstructorArgReference(element.getAttribute("twitter-connection"));
+		builder.addConstructorArgReference(element.getAttribute("twitter-template"));
 		return builder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd
index 703273deb8..f2f8f2dbaa 100644
--- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd
+++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.0.xsd
@@ -38,7 +38,7 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute use="required" name="twitter-connection" type="xsd:string">
+			<xsd:attribute use="required" name="twitter-template" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -60,7 +60,7 @@
 			<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:sequence>
-			<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
+			<xsd:attribute name="twitter-template" use="required" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -95,7 +95,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
+			<xsd:attribute name="twitter-template" use="required" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -131,7 +131,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
+			<xsd:attribute name="twitter-template" use="required" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -162,7 +162,7 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="id" type="xsd:string"/>
-			<xsd:attribute name="twitter-connection" use="required" type="xsd:string">
+			<xsd:attribute name="twitter-template" use="required" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParser-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParser-context.xml
index 4392700bc9..a121b53d08 100644
--- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParser-context.xml
+++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestReceivingMessageSourceParser-context.xml
@@ -22,20 +22,20 @@
 	<channel id="inbound_mentions"/>
 	
     <twitter:inbound-mention-channel-adapter id="mentionAdapter" 
-    					twitter-connection="twitter" 
+    					twitter-template="twitter" 
     					channel="inbound_mentions" 
     					auto-startup="false">
     	<poller fixed-rate="5000" max-messages-per-poll="3"/>
     </twitter:inbound-mention-channel-adapter>
     
     <twitter:inbound-dm-channel-adapter id="dmAdapter" 
-    					twitter-connection="twitter" 
+    					twitter-template="twitter" 
     					channel="inbound_mentions" 
     					auto-startup="false">
     	<poller fixed-rate="5000" max-messages-per-poll="3"/>
     </twitter:inbound-dm-channel-adapter>
     <twitter:inbound-update-channel-adapter id="updateAdapter" 
-    					twitter-connection="twitter" 
+    					twitter-template="twitter" 
     					channel="inbound_mentions" 
     					auto-startup="false">
     	<poller fixed-rate="5000" max-messages-per-poll="3"/>
diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml
index 54ba5ac776..430171a956 100644
--- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml
+++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml
@@ -24,9 +24,9 @@
 	
    <channel id="inputChannel"/>
 
-	<twitter:outbound-dm-channel-adapter twitter-connection="twitter" channel="inputChannel" />
+	<twitter:outbound-dm-channel-adapter twitter-template="twitter" channel="inputChannel" />
 	
-	<twitter:outbound-update-channel-adapter twitter-connection="twitter" channel="inputChannel" />
+	<twitter:outbound-update-channel-adapter twitter-template="twitter" channel="inputChannel" />
    
 </beans:beans>