Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1580, more polishing, moved PacketListener registration to a statr() method of an inbound endpoint

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-11-03 19:37:16 -04:00
parent ad37847162
commit c387f47dd4
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java
View File

@@ -127,7 +127,7 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean<XMPPConnectio
@Override
public int getPhase() {
return 0;
return Integer.MIN_VALUE;
}
@Override

12
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
View File

@@ -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) {

7
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests-context.xml
View File

@@ -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"/>

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/InboundXmppEndpointTests.java
View File

@@ -33,7 +33,7 @@ public class InboundXmppEndpointTests {
@Test
@Ignore
public void run() throws Exception {
Thread.sleep(10 * 1000);
Thread.sleep(10 * 1000 * 1000);
}
}

12
spring-integration-xmpp/src/test/java/test.properties
View File

@@ -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