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

INTSAMPLES-106 JMS: Eliminate Hijack of stdout

Browse Source 
Caused unusual behavior when exceptions occurred, or debug
logging enabled.

Now uses Spring profiles to route the output to a QueueChannel
instead.
This commit is contained in:
Gary Russell
2013-02-20 16:12:55 -05:00
committed by Gunnar Hillert
parent 078a72eeeb
commit 99fe63dc35
5 changed files with 64 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
basic/jms/src/main/resources/META-INF/spring/integration/inboundChannelAdapter.xml
View File

@@ -13,12 +13,27 @@
http://www.springframework.org/schema/integration/stream
http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<jms:message-driven-channel-adapter id="jmsin"
<jms:message-driven-channel-adapter id="jmsIn"
destination="requestQueue"
channel="jmsinToStdoutChannel"/>
channel="jmsInChannel" />
<channel id="jmsinToStdoutChannel"/>
<channel id="jmsInChannel" />
<stream:stdout-channel-adapter id="stdout" channel="jmsinToStdoutChannel" append-newline="true"/>
<beans:beans profile="default">
<stream:stdout-channel-adapter id="stdout" channel="jmsInChannel" append-newline="true"/>
</beans:beans>
<beans:beans profile="testCase">
<bridge input-channel="jmsInChannel" output-channel="queueChannel"/>
<channel id="queueChannel">
<queue />
</channel>
</beans:beans>
</beans:beans>

21
basic/jms/src/main/resources/META-INF/spring/integration/outboundGateway.xml
View File

@@ -21,10 +21,25 @@
<jms:outbound-gateway request-channel="stdinToJmsoutChannel"
request-destination="requestQueue"
reply-channel="jmsReplyToStdoutChannel"/>
reply-channel="jmsReplyChannel"/>
<channel id="jmsReplyToStdoutChannel"/>
<channel id="jmsReplyChannel" />
<stream:stdout-channel-adapter channel="jmsReplyToStdoutChannel" append-newline="true"/>
<beans:beans profile="default">
<stream:stdout-channel-adapter channel="jmsReplyChannel" append-newline="true"/>
</beans:beans>
<beans:beans profile="testCase">
<bridge input-channel="jmsReplyChannel" output-channel="queueChannel"/>
<channel id="queueChannel">
<queue />
</channel>
</beans:beans>
</beans:beans>

29
basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java
View File

@@ -15,15 +15,13 @@
*/
package org.springframework.integration.samples.jms;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import junit.framework.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.support.MessageBuilder;
/**
@@ -37,29 +35,24 @@ public class ChannelAdapterDemoTest {
"/META-INF/spring/integration/outboundChannelAdapter.xml"
};
private final ByteArrayOutputStream out = new ByteArrayOutputStream();
@Before
public void setupStreams() {
System.setOut(new PrintStream(this.out));
}
private void resetStreams() {
this.out.reset();
}
@Test
public void testChannelAdapterDemo() throws InterruptedException {
System.setProperty("spring.profiles.active", "testCase");
final GenericXmlApplicationContext applicationContext = new GenericXmlApplicationContext(configFilesChannelAdapterDemo);
final MessageChannel stdinToJmsoutChannel = applicationContext.getBean("stdinToJmsoutChannel", MessageChannel.class);
resetStreams();
stdinToJmsoutChannel.send(MessageBuilder.withPayload("jms test").build());
Thread.sleep(1000);
Assert.assertEquals("jms test\n", out.toString());
final QueueChannel queueChannel = applicationContext.getBean("queueChannel", QueueChannel.class);
@SuppressWarnings("unchecked")
Message<String> reply = (Message<String>) queueChannel.receive(20000);
Assert.assertNotNull(reply);
String out = reply.getPayload();
Assert.assertEquals("jms test", out);
applicationContext.close();
}

30
basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java
View File

@@ -15,15 +15,13 @@
*/
package org.springframework.integration.samples.jms;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import junit.framework.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.support.MessageBuilder;
/**
@@ -37,29 +35,25 @@ public class GatewayDemoTest {
"/META-INF/spring/integration/outboundGateway.xml"
};
private final ByteArrayOutputStream out = new ByteArrayOutputStream();
@Before
public void setupStreams() {
System.setOut(new PrintStream(this.out));
}
private void resetStreams() {
this.out.reset();
}
@Test
public void testGatewayDemo() throws InterruptedException {
System.setProperty("spring.profiles.active", "testCase");
final GenericXmlApplicationContext applicationContext = new GenericXmlApplicationContext(configFilesGatewayDemo);
final MessageChannel stdinToJmsoutChannel = applicationContext.getBean("stdinToJmsoutChannel", MessageChannel.class);
resetStreams();
stdinToJmsoutChannel.send(MessageBuilder.withPayload("jms test").build());
Thread.sleep(1000);
Assert.assertEquals("JMS response: JMS TEST\n", out.toString());
final QueueChannel queueChannel = applicationContext.getBean("queueChannel", QueueChannel.class);
@SuppressWarnings("unchecked")
Message<String> reply = (Message<String>) queueChannel.receive(20000);
Assert.assertNotNull(reply);
String out = reply.getPayload();
Assert.assertEquals("JMS response: JMS TEST", out);
applicationContext.close();
}