From 824a813aaf42d426cf1f690ef0d13237fbf4edef Mon Sep 17 00:00:00 2001
From: Josh Long <josh.long@springsource.com>
Date: Tue, 12 Oct 2010 13:42:32 -0700
Subject: [PATCH] fixing some code in the twitter adapter...

---
 ...essTokenInitialRequestProcessListener.java | 10 ++-----
 ...essTokenInitialRequestProcessListener.java |  3 +-
 .../twitter/sending_updates_using_ns.xml      |  2 +-
 .../messages/OutboundXmppEndpointTests.java   |  2 +-
 .../OutboundXmppEndpointTests-context.xml     | 28 ++++++++++---------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java
index 372e193a77..70bbf7a821 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/AccessTokenInitialRequestProcessListener.java
@@ -26,15 +26,11 @@ import twitter4j.http.AccessToken;
  * @author Josh Long
  */
 public interface AccessTokenInitialRequestProcessListener {
+
+
 	String openUrlAndReturnPin(String urlToOpen) throws Exception;
 
-	void persistReturnedAccessToken(AccessToken accessToken)
-			throws Exception;
+	void persistReturnedAccessToken(AccessToken accessToken) throws Exception;
 
-	/**
-	 * Callback in case something goes wrong at any point in the process. Up to client to intervene
-	 *
-	 * @param t the exception thrown (if any). Could be null if none available
-	 */
 	void failure(Throwable t);
 }
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/ConsoleBasedAccessTokenInitialRequestProcessListener.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/ConsoleBasedAccessTokenInitialRequestProcessListener.java
index 0cfc0b4d9f..726eb4b871 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/ConsoleBasedAccessTokenInitialRequestProcessListener.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/oauth/ConsoleBasedAccessTokenInitialRequestProcessListener.java
@@ -88,7 +88,8 @@ public class ConsoleBasedAccessTokenInitialRequestProcessListener implements Acc
         String key = StringUtils.trim(props.getProperty("twitter.oauth.consumerKey"));
         String secret = StringUtils.trim(  props.getProperty("twitter.oauth.consumerSecret") ) ;
 
-        ConsoleBasedAccessTokenInitialRequestProcessListener consoleBasedAccessTokenInitialRequestProcessListener = new ConsoleBasedAccessTokenInitialRequestProcessListener();
+        ConsoleBasedAccessTokenInitialRequestProcessListener consoleBasedAccessTokenInitialRequestProcessListener =
+				new ConsoleBasedAccessTokenInitialRequestProcessListener();
 
         Twitter twitter = new TwitterFactory().getOAuthAuthorizedInstance( key, secret);
 
diff --git a/spring-integration-twitter/src/test/resources/org/springframework/integration/twitter/sending_updates_using_ns.xml b/spring-integration-twitter/src/test/resources/org/springframework/integration/twitter/sending_updates_using_ns.xml
index 73ad9f6f10..360e2973c6 100644
--- a/spring-integration-twitter/src/test/resources/org/springframework/integration/twitter/sending_updates_using_ns.xml
+++ b/spring-integration-twitter/src/test/resources/org/springframework/integration/twitter/sending_updates_using_ns.xml
@@ -39,7 +39,7 @@
 	<context:property-placeholder
 			location="file://${user.home}/Desktop/twitter.properties"
 			ignore-unresolvable="true"/>
-
+        
 	<twitter:twitter-connection
 			id="tc"
 			access-token="${twitter.oauth.accessToken}"
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests.java
index 1b9e094517..88a20eaf92 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 public class OutboundXmppEndpointTests {
 
 	@Test
-	@Ignore
+	//@Ignore
 	public void run() throws Exception {
 		Thread.sleep(10 * 1000);
 	}
diff --git a/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
index 33dd691865..8fe816d197 100644
--- a/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/resources/org/springframework/integration/xmpp/messages/OutboundXmppEndpointTests-context.xml
@@ -26,25 +26,27 @@
 
 	<context:component-scan base-package="org.springframework.integration.xmpp"/>
 
-	<context:property-placeholder location="file://${user.home}/Desktop/test.properties" ignore-unresolvable="true"/>
+	<context:property-placeholder location="file://${user.home}/Desktop/xmpp.properties" ignore-unresolvable="true"/>
 
-	<beans:bean id="xmppProducer" class="org.springframework.integration.xmpp.messages.XmppMessageProducer" p:recipient="${user.2.login}"/>
+	<beans:bean id="xmppProducer"
+                class="org.springframework.integration.xmpp.messages.XmppMessageProducer"
+                p:recipient="starbuxman@gmail.com"/>
 
 	<poller default="true">
 		<interval-trigger fixed-rate="true" interval="10" time-unit="SECONDS"/>
 	</poller>
+    <xmpp:xmpp-connection
+            id="testConnection"
+            user="${user.2.login}"
+            password="${user.2.password}"
+            host="${user.2.host}"
+            port="${user.2.port}"
+            resource="${user.2.resource}"
+            sasl-mechanism-supported="${user.2.sasl.mechanism}"
+            sasl-mechanism-supported-index="0"
+            service-name="${user.2.service}"
+            />
 
-	<xmpp:xmpp-connection
-			id="testConnection"
-			user="${user.1.login}"
-			password="${user.1.password}"
-			host="${user.1.host}"
-			port="${user.1.port}"
-			resource="${user.1.resource}"
-			sasl-mechanism-supported="${user.1.sasl.mechanism}"
-			sasl-mechanism-supported-index="${user.1.sasl.index}"
-			service-name="${user.1.service}"
-			/>
 
 
 	<inbound-channel-adapter ref="xmppProducer" channel="outboundChannel"/>