From 1867ca5c91d365b742f3b740ef04584b5f547d89 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Wed, 1 Feb 2012 01:39:01 -0500
Subject: [PATCH] INTSAMPLES-59 - Remove Twitter4j reference For reference see:
 https://jira.springsource.org/browse/INTSAMPLES-59

---
 basic/twitter/README.md                                      | 2 +-
 .../META-INF/spring/integration/TwitterSearch-context.xml    | 5 +++--
 .../spring/integration/TwitterSendUpdates-context.xml        | 2 +-
 .../spring/integration/TwitterTimelineUpdates-context.xml    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/basic/twitter/README.md b/basic/twitter/README.md
index f89ef61d..dec07027 100644
--- a/basic/twitter/README.md
+++ b/basic/twitter/README.md
@@ -13,7 +13,7 @@ To use OAuth authentication/authorization with Twitter you must create new Appli
 Follow the directions below to create a new application and obtain consumer keys and access token:
 
 * Go to http://dev.twitter.com/
-* Click on 'Register an app' link and fill out all required fields on the form provided; 
+* Click on 'Create an app' link and fill out all required fields on the form provided; 
 * Set 'Application Type' to 'Client' and depending on the nature of your application 
 * Select 'Default Access Type' as 'Read & Write' or 'Read-only'
 * Submit the form. 
diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml
index 31d4aebb..8c8edeba 100644
--- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml
+++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml
@@ -12,14 +12,15 @@
 	<context:property-placeholder location="classpath:oauth.properties"/>
 
 	<bean id="twitterTemplate"
-		class="org.springframework.integration.twitter.core.Twitter4jTemplate">
+		class="org.springframework.social.twitter.api.impl.TwitterTemplate">
 		<constructor-arg value="${twitter.oauth.consumerKey}" />
 		<constructor-arg value="${twitter.oauth.consumerSecret}" />
 		<constructor-arg value="${twitter.oauth.accessToken}" />
 		<constructor-arg value="${twitter.oauth.accessTokenSecret}" />
 	</bean>
 	
-	<int-twitter:search-inbound-channel-adapter id="searchAdapter" channel="sourceExtractor" query="#springintegration">
+	<int-twitter:search-inbound-channel-adapter id="searchAdapter" channel="sourceExtractor" 
+	                                            query="#springintegration" twitter-template="twitterTemplate">
     	<int:poller fixed-rate="3000" max-messages-per-poll="5" />
     </int-twitter:search-inbound-channel-adapter>
    
diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml
index e9a5c55f..340889c4 100644
--- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml
+++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml
@@ -12,7 +12,7 @@
 	<context:property-placeholder location="classpath:oauth.properties"/>    
 	
 	<bean id="twitterTemplate"
-		class="org.springframework.integration.twitter.core.Twitter4jTemplate">
+		class="org.springframework.social.twitter.api.impl.TwitterTemplate">
 		<constructor-arg value="${twitter.oauth.consumerKey}" />
 		<constructor-arg value="${twitter.oauth.consumerSecret}" />
 		<constructor-arg value="${twitter.oauth.accessToken}" />
diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml
index 8a44dbda..ff863550 100644
--- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml
+++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml
@@ -12,7 +12,7 @@
 	<context:property-placeholder location="classpath:oauth.properties"/>
 
 	<bean id="twitterTemplate"
-		class="org.springframework.integration.twitter.core.Twitter4jTemplate">
+		class="org.springframework.social.twitter.api.impl.TwitterTemplate">
 		<constructor-arg value="${twitter.oauth.consumerKey}" />
 		<constructor-arg value="${twitter.oauth.consumerSecret}" />
 		<constructor-arg value="${twitter.oauth.accessToken}" />