From e70696f4f7ae559bbe4f603451c5d9648c1f9833 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Mon, 6 Aug 2012 12:52:05 -0400
Subject: [PATCH] INTSAMPLES-85 - Upgrade Twitter Sample Spring Integration
 version

* Upgrade Twitter sample to latest Spring Integration version
* Twitter search test does not run with authentication by default
* Twitter search test will run every time the project builds
---
 basic/twitter/pom.xml                         | 17 +++++++----
 ...mple.java => TwitterSearchSampleTest.java} |  6 ++--
 .../integration/TwitterSearch-context.xml     | 30 +++++++++++++------
 basic/twitter/src/test/resources/log4j.xml    |  2 +-
 4 files changed, 36 insertions(+), 19 deletions(-)
 rename basic/twitter/src/test/java/org/springframework/integration/samples/twitter/{TwitterSearchSample.java => TwitterSearchSampleTest.java} (93%)

diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index dd168c71..5bfa833a 100644
--- a/basic/twitter/pom.xml
+++ b/basic/twitter/pom.xml
@@ -1,13 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.integration.samples</groupId>
-  <artifactId>twitter</artifactId>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.integration.samples</groupId>
+	<artifactId>twitter</artifactId>
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - Twitter Demo</name>
 	<packaging>jar</packaging>
+
+	<prerequisites>
+		<maven>2.2.1</maven>
+	</prerequisites>
+
 	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.3.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -34,7 +39,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>2.5.1</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
diff --git a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSampleTest.java
similarity index 93%
rename from basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java
rename to basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSampleTest.java
index 18dc5744..76e57839 100644
--- a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java
+++ b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSampleTest.java
@@ -23,12 +23,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * @author Oleg Zhurakousky
  *
  */
-public class TwitterSearchSample {
+public class TwitterSearchSampleTest {
 
 	@Test
 	public void runDemo() throws Exception{
 		new ClassPathXmlApplicationContext("META-INF/spring/integration/TwitterSearch-context.xml");
-		
-		Thread.sleep(20000);
+
+		Thread.sleep(5000);
 	}
 }
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 8c8edeba..60f77ba9 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
@@ -8,9 +8,13 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-twitter="http://www.springframework.org/schema/integration/twitter">
-	
+
 	<context:property-placeholder location="classpath:oauth.properties"/>
 
+<!-- While authentication is certainly support for executing Twitter searches,
+	 authentication is not required.  -->
+<!--
+
 	<bean id="twitterTemplate"
 		class="org.springframework.social.twitter.api.impl.TwitterTemplate">
 		<constructor-arg value="${twitter.oauth.consumerKey}" />
@@ -18,13 +22,21 @@
 		<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" twitter-template="twitterTemplate">
-    	<int:poller fixed-rate="3000" max-messages-per-poll="5" />
-    </int-twitter:search-inbound-channel-adapter>
-   
+
+	<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>
+
+-->
+
+	<!-- Search Twitter without authentication -->
+	<int-twitter:search-inbound-channel-adapter id="searchAdapter" channel="sourceExtractor"
+		query="springintegration OR springframework OR #grails">
+		<int:poller fixed-rate="3000" max-messages-per-poll="5" />
+	</int-twitter:search-inbound-channel-adapter>
+
 	<int:transformer input-channel="sourceExtractor" output-channel="twitterOut" expression="payload.getText()"/>
-	
-	<int:logging-channel-adapter id="twitterOut"/>
+
+	<int:logging-channel-adapter id="twitterOut" level="INFO"/>
 </beans>
diff --git a/basic/twitter/src/test/resources/log4j.xml b/basic/twitter/src/test/resources/log4j.xml
index 40d94ca5..c80a153b 100644
--- a/basic/twitter/src/test/resources/log4j.xml
+++ b/basic/twitter/src/test/resources/log4j.xml
@@ -12,7 +12,7 @@
 
 	<!-- Loggers -->
 	<logger name="org.springframework.integration">
-		<level value="warn" />
+		<level value="info" />
 	</logger>
 
 	<logger name="org.springframework.integration.samples">