From c387f47dd4f0cc3d30d77c61df17b65e2956fe5b Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 3 Nov 2010 19:37:16 -0400
Subject: [PATCH] INT-1580, more polishing, moved PacketListener registration
 to a statr() method of an inbound endpoint

---
 .../integration/xmpp/XmppConnectionFactoryBean.java  |  2 +-
 .../xmpp/messages/XmppMessageDrivenEndpoint.java     | 12 ++++++------
 .../messages/InboundXmppEndpointTests-context.xml    |  7 ++-----
 .../xmpp/messages/InboundXmppEndpointTests.java      |  2 +-
 .../src/test/java/test.properties                    | 12 ++++++------
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java
index 3c6f263d93..2bf0414782 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java
@@ -127,7 +127,7 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean<XMPPConnectio
 
 	@Override
 	public int getPhase() {
-		return 0;
+		return Integer.MIN_VALUE;
 	}
 
 	@Override
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
index 89f1633b8a..0f2ac98a55 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
@@ -108,6 +108,12 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint  {
 	@Override
 	protected void doStart() {
 		logger.debug("start: " + xmppConnection.isConnected() + ":" + xmppConnection.isAuthenticated());
+		xmppConnection.addPacketListener(new PacketListener() {
+			public void processPacket(final Packet packet) {
+				org.jivesoftware.smack.packet.Message message = (org.jivesoftware.smack.packet.Message) packet;
+				forwardXmppMessage(xmppConnection.getChatManager().getThreadChat(message.getThread()), message);
+			}
+		}, null);
 	}
 
 	@Override
@@ -121,12 +127,6 @@ public class XmppMessageDrivenEndpoint extends AbstractEndpoint  {
 	@Override
 	protected void onInit() throws Exception {
 		messagingTemplate.afterPropertiesSet();
-		xmppConnection.addPacketListener(new PacketListener() {
-			public void processPacket(final Packet packet) {
-				org.jivesoftware.smack.packet.Message message = (org.jivesoftware.smack.packet.Message) packet;
-				forwardXmppMessage(xmppConnection.getChatManager().getThreadChat(message.getThread()), message);
-			}
-		}, null);
 	}
 
 	private void forwardXmppMessage(Chat chat, Message xmppMessage) {
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests-context.xml
index 2f903c62e5..c2d0a86fc0 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests-context.xml
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests-context.xml
@@ -29,14 +29,11 @@
 			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="${user.2.sasl.index}"
 			service-name="${user.2.service}"
 			/>
 
-	<xmpp:message-inbound-channel-adapter channel="xmppInbound" xmpp-connection="testConnection" extract-payload="false" auto-startup="false"/>
+	<xmpp:message-inbound-channel-adapter channel="xmppInbound" xmpp-connection="testConnection" 
+						extract-payload="false"/>
 
 	<service-activator input-channel="xmppInbound" ref="xmppMessageConsumer"/>
 
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests.java
index 4867a56ff5..cc65cc5bac 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests.java
@@ -33,7 +33,7 @@ public class InboundXmppEndpointTests {
 	@Test
 	@Ignore
 	public void run() throws Exception {
-		Thread.sleep(10 * 1000);
+		Thread.sleep(10 * 1000 * 1000);
 	}
 
 }
diff --git a/spring-integration-xmpp/src/test/java/test.properties b/spring-integration-xmpp/src/test/java/test.properties
index 843eefdf52..3809f9d8ca 100644
--- a/spring-integration-xmpp/src/test/java/test.properties
+++ b/spring-integration-xmpp/src/test/java/test.properties
@@ -22,11 +22,11 @@ user.1.sasl.mechanism=PLAIN
 user.1.sasl.index=0
 user.1.resource=resource
 user.1.port=5222
-user.2.login=user2@gmail.com
-user.2.password=password
+user.2.login=springintegration.eip@gmail.com
+user.2.password=spr1ng1p
 user.2.host=talk.google.com
 user.2.service=gmail.com
-user.2.sasl.mechanism=PLAIN
-user.2.sasl.index=0
-user.2.resource=resource
-user.2.port=5222
+#user.2.sasl.mechanism=PLAIN
+#user.2.sasl.index=0
+#user.2.resource=resource
+#user.2.port=5222