Merge pull request #21 from ghillert/INTTEMPLATES-24

INTTEMPLATES-24 Update SI dep. to 2.2.4.RELEASE

si-template-projects/adapter/build.gradle

@@ -28,8 +28,8 @@ ext {
 	junitVersion = '4.11'
 	log4jVersion = '1.2.17'
 	mockitoVersion = '1.9.5'
-	springVersion = '3.2.2.RELEASE'
-	springIntegrationVersion = '2.2.3.RELEASE'
+	springVersion = '3.2.3.RELEASE'
+	springIntegrationVersion = '2.2.4.RELEASE'
 
 	idPrefix = 'siAdapterLowerPrefix'
 }
@@ -263,5 +263,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.5'
+	gradleVersion = '1.6'
 }

si-template-projects/adapter/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 18 22:56:20 EDT 2013
-zipStorePath=wrapper/dists
+#Tue Jun 11 12:12:48 EDT 2013
 distributionBase=GRADLE_USER_HOME
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

si-template-projects/si-template-standalone-project/build.gradle

@@ -18,7 +18,7 @@ targetCompatibility=1.6
 ext {
 	junitVersion = '4.11'
 	log4jVersion = '1.2.17'
-	springIntegrationVersion = '2.2.3.RELEASE'
+	springIntegrationVersion = '2.2.4.RELEASE'
 }
 
 eclipse {
@@ -44,5 +44,5 @@ dependencies {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.5'
+	gradleVersion = '1.6'
 }

si-template-projects/si-template-standalone-project/pom.xml

@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.11</junit.version>
 	</properties>

si-template-projects/si-template-standalone-simple-project/build.gradle

@@ -18,7 +18,7 @@ targetCompatibility=1.6
 ext {
 	junitVersion = '4.11'
 	log4jVersion = '1.2.17'
-	springIntegrationVersion = '2.2.3.RELEASE'
+	springIntegrationVersion = '2.2.4.RELEASE'
 }
 
 eclipse {
@@ -42,5 +42,5 @@ dependencies {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.5'
+	gradleVersion = '1.6'
 }

si-template-projects/si-template-standalone-simple-project/pom.xml

@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.11</junit.version>
 	</properties>
@@ -48,7 +48,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
+				<version>3.1</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>

si-template-projects/si-template-war-project/README.md

@@ -9,6 +9,22 @@ Please keep in mind, that the provided Web UI is not necessary just to run *Spri
 
 # Running the Template
 
+*Twitter Search* requires authentication. Therefore, you must update the following properties in **oauth.properties** located at  `src/main/resources`:
+
+* twitter.oauth.consumerKey
+* twitter.oauth.consumerSecret
+* twitter.oauth.accessToken
+* twitter.oauth.accessTokenSecret
+
+Alternatively, you can also pass in those properties using system properties via the command-line, e.g.:
+
+	mvn jetty:run -Dtwitter.oauth.consumerKey=12345 \
+	-Dtwitter.oauth.consumerSecret=12345 \
+	-Dtwitter.oauth.accessToken=12345 \
+	-Dtwitter.oauth.accessTokenSecret=12345 \
+
+The keys can be setup at [http://dev.twitter.com/](http://dev.twitter.com/).
+
 ## Command Line using Tomcat 7
 
 	mvn tomcat7:run

si-template-projects/si-template-war-project/build.gradle

@@ -15,13 +15,13 @@ ext {
 	sourceCompatibility=1.6
 	targetCompatibility=1.6
 
-	springIntegrationVersion = '2.2.3.RELEASE'
-	springframeworkVersion = '3.2.2.RELEASE'
+	springIntegrationVersion = '2.2.4.RELEASE'
+	springframeworkVersion = '3.2.3.RELEASE'
 	guavaVersion = '14.0.1'
 	jacksonVersion = '1.9.11'
 	junitVersion = '4.11'
 	log4jVersion = '1.2.17'
-	wro4jVersion = '1.6.3'
+	wro4jVersion = '1.7.0'
 
 }
 

si-template-projects/si-template-war-project/pom.xml

@@ -16,13 +16,13 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.3.RELEASE</spring.integration.version>
-		<spring.version>3.2.2.RELEASE</spring.version>
+		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
+		<spring.version>3.2.3.RELEASE</spring.version>
 		<guava.version>14.0.1</guava.version>
 		<jackson.version>1.9.11</jackson.version>
 		<junit.version>4.11</junit.version>
 		<log4j.version>1.2.17</log4j.version>
-		<wro4j.version>1.6.3</wro4j.version>
+		<wro4j.version>1.7.0</wro4j.version>
 	</properties>
 
 	<repositories>
@@ -38,7 +38,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
+				<version>3.1</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -50,7 +50,7 @@
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>8.1.10.v20130312</version>
+				<version>8.1.11.v20130520</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.3</version>
+			<version>1.7.5</version>
 		</dependency>
 
 		<!-- Servlet -->

si-template-projects/si-template-war-project/src/main/java/sipackage/model/TwitterMessage.java

@@ -24,7 +24,7 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
  * Represents some common Twitter related fields.

si-template-projects/si-template-war-project/src/main/resources/META-INF/spring/integration/spring-integration-context.xml

@@ -12,9 +12,21 @@
 
 	<context:component-scan base-package="sipackage" />
 
+	<context:property-placeholder location="classpath:oauth.properties"/>
+
+	<!-- As of Twitter API version 1.1, users must be authenticated to perform searches -->
+
+	<bean id="twitterTemplate"
+		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>
+
 	<!-- See also: http://static.springsource.org/spring-integration/reference/htmlsingle/#twitter -->
-	<int-twitter:search-inbound-channel-adapter id="twitter"
-		query="springsource OR springintegration OR cloudfoundry OR grails OR rabbitmq OR groovylang OR springframework"
+	<int-twitter:search-inbound-channel-adapter id="twitter" twitter-template="twitterTemplate"
+		query="springsource OR springintegration OR cloudfoundry OR #grails OR rabbitmq OR groovylang OR springframework"
 		channel="twitterChannel" auto-startup="false">
 		<int:poller fixed-rate="20000" max-messages-per-poll="3" />
 	</int-twitter:search-inbound-channel-adapter>

si-template-projects/si-template-war-project/src/main/resources/oauth.properties

@@ -0,0 +1,4 @@
+twitter.oauth.consumerKey=
+twitter.oauth.consumerSecret=
+twitter.oauth.accessToken=
+twitter.oauth.accessTokenSecret=