From 3e22d7396383ee1027c92c3498777d930ac0b427 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 28 Sep 2011 15:52:09 -0400 Subject: [PATCH 1/4] INT-2150 fixed Twitter schema to remove Twitter4J references --- .../twitter/config/spring-integration-twitter-2.1.xsd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd index 28bcb5d1a2..24c4f22af5 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd @@ -127,9 +127,7 @@ - Reference to a [org.springframework.integration.twitter.core.TwitterOperations] bean. Spring - Integration provides [Twitter4jTemplate] template for your convenience. - NOTE: in future releases TwitterOperations usage will be migrated to using Spring Social's TwitterOperations + Reference to a [org.springframework.social.twitter.api.impl.TwitterTemplate] bean provided by SpringSocial project. From 6e76e12d2f78ce4908b534c045e9e1744bdd51ea Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 29 Sep 2011 08:42:12 -0400 Subject: [PATCH 2/4] INT-2150 removed one mroe reference for Twitter4J from xsd --- .../twitter/config/spring-integration-twitter-2.1.xsd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd index 24c4f22af5..231be65766 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd @@ -165,9 +165,7 @@ - Reference to a [org.springframework.integration.twitter.core.TwitterOperations] bean. Spring - Integration provides [Twitter4jTemplate] template for your convenience. - NOTE: in future releases TwitterOperations usage will be migrated to using Spring Social's TwitterOperations + Reference to a [org.springframework.social.twitter.api.impl.TwitterTemplate] bean provided by SpringSocial project. From 232335630b12c829c1619c197784e59e40014950 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 29 Sep 2011 09:32:26 -0400 Subject: [PATCH 3/4] INT-2150 polishing schema, updated expected-type --- .../twitter/config/spring-integration-twitter-2.1.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd index 231be65766..0c80f3325a 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd @@ -123,7 +123,7 @@ - + @@ -161,7 +161,7 @@ - + From 2c134cc4a9b44827624cb65da498284c878c43f5 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 29 Sep 2011 10:15:02 -0400 Subject: [PATCH 4/4] fixed copy/paste mistakes --- .../config/spring-integration-twitter-2.1.xsd | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd index 0c80f3325a..8469a71096 100644 --- a/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd +++ b/spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.1.xsd @@ -15,12 +15,13 @@ + --> + - Configures an inbound channel adapter that consumes message (representing your friends' timeline updates) - from twitter and sends Messages whose payloads are Tweet objects. + Configures an inbound channel adapter that consumes your friends' timeline updates + from Twitter and sends Messages whose payloads are Tweet objects. @@ -33,8 +34,8 @@ - Configures an inbound channel adapter that consumes message (representing mentions of your handle) - from twitter and sends Messages whose payloads are Status objects. + Configures an inbound channel adapter that consumes mentions of your handle + from Twitter and sends Messages whose payloads are Tweet objects. @@ -48,8 +49,8 @@ - Configures an inbound channel adapter that consumes message (representing mentions of your handle) - from twitter and sends Messages whose payloads are Status objects. + Configures an inbound channel adapter that consumes search results for a given query + from Twitter and sends Messages whose payloads are Tweet objects. @@ -58,7 +59,7 @@ - Twitter search query (e.g, #springintegration . + Twitter search query (e.g, #springintegration). For more info on Twitter queries please refer to this site: http://search.twitter.com/operators) @@ -71,7 +72,8 @@ - Configures an inbound channel adapter that consumes direct messages and forwards them to Spring Integration + Configures an inbound channel adapter that consumes direct messages from Twitter + and sends Messages whose payloads are DirectMessage objects. @@ -82,14 +84,14 @@ + OUTBOUND + --> - Configures an inbound channel adapter that consumes message (representing your friends' timeline updates) - from twitter and sends Messages whose payloads are Tweet objects. + Configures an outbound channel adapter that sends Direct Messages to a Twitter user as + specified in the header whose name is defined by the TwitterHeaders.DM_TARGET_USER_ID constant. @@ -103,8 +105,7 @@ - Configures an inbound channel adapter that consumes message (representing your friends' timeline updates) - from twitter and sends Messages whose payloads are Tweet objects. + Configures an outbound channel adapter that posts a status update to the authorized user's timeline. @@ -114,6 +115,10 @@ + + @@ -123,19 +128,19 @@ - + - Reference to a [org.springframework.social.twitter.api.impl.TwitterTemplate] bean provided by SpringSocial project. + Reference to a TwitterTemplate bean provided by the Spring Social project. - Lifecycle attribute signaling if this component should be started during Application Context startup. - Default is 'true' + Lifecycle attribute signaling whether this component should be started during Application Context startup. + Default is 'true'. @@ -147,10 +152,8 @@ - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). - + Message Channel to which messages will be sent by this adapter. + @@ -161,12 +164,12 @@ - + - Reference to a [org.springframework.social.twitter.api.impl.TwitterTemplate] bean provided by SpringSocial project. - + Reference to a TwitterTemplate bean provided by the Spring Social project. + @@ -177,9 +180,7 @@ - Identifies channel attached to this adapter. Depending on the type of the adapter - this channel could be the receiving channel (e.g., outbound-channel-adapter) or channel where - messages will be sent to by this adapter (e.g., inbound-channel-adapter). + Message Channel where this adapter receives messages to be handled by performing Twitter operations.