From 52db954eff896e36edbddf3aa1f4b06e2011e45c Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 10 Apr 2013 15:16:07 -0400
Subject: [PATCH] INT-2989 Increase JMS Test Timeouts

The default 5 second timeout is insufficient in some cases
for the larger volume tests. In most cases, increase to
10 seconds; in some cases to 30 seconds.

Also, add code to keep the ActiveMQ VMTransport running for
the entire test class (by keeping a connection open).

Avoids cycling the broker, which can cause other issues.

Also close the context in a finally block in PipeLineJmsTests.

Clean up some whitespace violations in config files.

This, together with the try/finally block makes the commit
look bigger than it really is; suggest using 'git log -p -b'
to review.

Increase overall test timeout for PipelineNamedReplyQueuesJmsTests.
---
 .../jms/ActiveMQMultiContextTests.java        | 46 ++++++++++++++
 .../jms/request_reply/PipelineJmsTests.java   | 63 ++++++++++---------
 .../PipelineNamedReplyQueuesJmsTests.java     |  5 +-
 ...eplyScenariosWithCachedConsumersTests.java |  6 +-
 ...nariosWithCorrelationKeyProvidedTests.java |  7 ++-
 ...yScenariosWithNonCachedConsumersTests.java |  6 +-
 ...eplyScenariosWithTempReplyQueuesTests.java |  7 ++-
 .../jms/request_reply/pipeline-01.xml         |  6 +-
 .../jms/request_reply/pipeline-02.xml         |  6 +-
 .../jms/request_reply/pipeline-03.xml         |  6 +-
 .../jms/request_reply/pipeline-04.xml         |  6 +-
 .../jms/request_reply/pipeline-05.xml         |  6 +-
 .../jms/request_reply/pipeline-06.xml         |  6 +-
 .../jms/request_reply/pipeline-07.xml         |  6 +-
 .../jms/request_reply/pipeline-08.xml         |  6 +-
 .../jms/request_reply/pipeline-09.xml         |  6 +-
 .../request_reply/pipeline-named-queue-01.xml |  7 ++-
 .../request_reply/pipeline-named-queue-02.xml | 21 ++++---
 .../pipeline-named-queue-02a.xml              | 19 +++---
 .../request_reply/pipeline-named-queue-03.xml | 21 ++++---
 .../pipeline-named-queue-03a.xml              | 19 +++---
 .../request_reply/pipeline-named-queue-04.xml | 12 ++--
 .../request_reply/pipeline-named-queue-05.xml | 12 ++--
 .../request_reply/pipeline-named-queue-06.xml | 12 ++--
 .../request_reply/pipeline-named-queue-07.xml | 12 ++--
 .../producer-cached-consumers.xml             |  6 +-
 .../producer-no-cached-consumers.xml          | 12 ++--
 .../producer-temp-reply-consumers.xml         |  3 +-
 28 files changed, 227 insertions(+), 123 deletions(-)
 create mode 100644 spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java

diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java
new file mode 100644
index 0000000000..9b6475385f
--- /dev/null
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/ActiveMQMultiContextTests.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.integration.jms;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.transport.vm.VMTransport;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.springframework.jms.connection.CachingConnectionFactory;
+
+/**
+ * Keeps an ActiveMQ {@link VMTransport} open for the duration of
+ * all tests (avoids cycling the transport each time the last
+ * connection is closed).
+ * @author Gary Russell
+ * @since 3.0
+ *
+ */
+public abstract class ActiveMQMultiContextTests {
+
+	private static final CachingConnectionFactory connectionFactory = new CachingConnectionFactory(
+			new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"));
+
+	@BeforeClass
+	public static void startUp() throws Exception {
+		connectionFactory.createConnection().close();
+	}
+
+	@AfterClass
+	public static void shutDown() {
+		connectionFactory.resetConnection();
+	}
+}
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java
index 922b0375f5..05a4c42090 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,12 +27,14 @@ import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.MessageTimeoutException;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.config.ActiveMqTestUtils;
 import org.springframework.integration.message.GenericMessage;
 /**
  * @author Oleg Zhurakousky
+ * @author Gary Russell
  */
-public class PipelineJmsTests {
+public class PipelineJmsTests extends ActiveMQMultiContextTests {
 
 	private final Executor executor = Executors.newFixedThreadPool(30);
 
@@ -128,7 +130,7 @@ public class PipelineJmsTests {
 		this.test("pipeline-09.xml");
 	}
 
-	public void test(String contextConfig) throws Exception{
+	public void test(String contextConfig) throws Exception {
 		ActiveMqTestUtils.prepare();
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(contextConfig, this.getClass());
 		final RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class);
@@ -136,33 +138,36 @@ public class PipelineJmsTests {
 		final AtomicInteger successCounter = new AtomicInteger();
 		final AtomicInteger timeoutCounter = new AtomicInteger();
 		final AtomicInteger failureCounter = new AtomicInteger();
-
-		for (int i = 0; i < requests; i++) {
-			final int y = i;
-			executor.execute(new Runnable() {
-				public void run() {
-					try {
-						assertEquals(y, gateway.exchange(new GenericMessage<Integer>(y)).getPayload());
-						successCounter.incrementAndGet();
-					} catch (MessageTimeoutException e) {
-						timeoutCounter.incrementAndGet();
-					} catch (Throwable t) {
-						failureCounter.incrementAndGet();
-					} finally {
-						latch.countDown();
+		try {
+			for (int i = 0; i < requests; i++) {
+				final int y = i;
+				executor.execute(new Runnable() {
+					public void run() {
+						try {
+							assertEquals(y, gateway.exchange(new GenericMessage<Integer>(y)).getPayload());
+							successCounter.incrementAndGet();
+						} catch (MessageTimeoutException e) {
+							timeoutCounter.incrementAndGet();
+						} catch (Throwable t) {
+							failureCounter.incrementAndGet();
+						} finally {
+							latch.countDown();
+						}
 					}
-				}
-			});
+				});
+			}
+			latch.await();
+		}
+		finally {
+			System.out.println("Success: " + successCounter.get());
+			System.out.println("Timeout: " + timeoutCounter.get());
+			System.out.println("Failure: " + failureCounter.get());
+			// technically all we care that its > 0,
+			// but reality of this test it has to be something more then 0
+			assertTrue(successCounter.get() > 10);
+			assertEquals(0, failureCounter.get());
+			assertEquals(requests, successCounter.get() + timeoutCounter.get());
+			context.destroy();
 		}
-		latch.await();
-		System.out.println("Success: " + successCounter.get());
-		System.out.println("Timeout: " + timeoutCounter.get());
-		System.out.println("Failure: " + failureCounter.get());
-		// technically all we care that its > 0,
-		// but reality of this test it has to be something more then 0
-		assertTrue(successCounter.get() > 10);
-		assertEquals(0, failureCounter.get());
-		assertEquals(requests, successCounter.get() + timeoutCounter.get());
-		context.destroy();
 	}
 }
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java
index 86e14bee52..57b28a08e6 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java
@@ -28,6 +28,7 @@ import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.MessageTimeoutException;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.config.ActiveMqTestUtils;
 import org.springframework.integration.message.GenericMessage;
 /**
@@ -35,7 +36,7 @@ import org.springframework.integration.message.GenericMessage;
  * @author Gary Russell
  * @author Artem Bilan
  */
-public class PipelineNamedReplyQueuesJmsTests {
+public class PipelineNamedReplyQueuesJmsTests extends ActiveMQMultiContextTests {
 
 	private final Executor executor = Executors.newFixedThreadPool(30);
 
@@ -165,7 +166,7 @@ public class PipelineNamedReplyQueuesJmsTests {
 					}
 				});
 			}
-			assertTrue(latch.await(60, TimeUnit.SECONDS));
+			assertTrue(latch.await(120, TimeUnit.SECONDS));
 			// technically all we care that its > 0,
 			// but reality of this test it has to be something more then 0
 			assertTrue(successCounter.get() > 10);
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java
index d8ba775b31..cda4827623 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.MessageTimeoutException;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.JmsOutboundGateway;
 import org.springframework.integration.jms.config.ActiveMqTestUtils;
 import org.springframework.integration.message.GenericMessage;
@@ -44,8 +45,9 @@ import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.support.converter.SimpleMessageConverter;
 /**
  * @author Oleg Zhurakousky
+ * @author Gary Russell
  */
-public class RequestReplyScenariosWithCachedConsumersTests {
+public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMultiContextTests {
 
 	private final SimpleMessageConverter converter = new SimpleMessageConverter();
 
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java
index 1a9c34ae06..9dbbef8f86 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,18 @@ package org.springframework.integration.jms.request_reply;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.JmsOutboundGateway;
 import org.springframework.integration.jms.config.ActiveMqTestUtils;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.integration.test.util.TestUtils;
 /**
  * @author Oleg Zhurakousky
+ * @author Gary Russell
  */
-public class RequestReplyScenariosWithCorrelationKeyProvidedTests {
+public class RequestReplyScenariosWithCorrelationKeyProvidedTests extends ActiveMQMultiContextTests {
 
 	@Test
 	public void messageCorrelationBasedCustomCorrelationKey() throws Exception{
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java
index 981880a978..465977d514 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,14 +29,16 @@ import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.MessageTimeoutException;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.config.ActiveMqTestUtils;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessageCreator;
 /**
  * @author Oleg Zhurakousky
+ * @author Gary Russell
  */
-public class RequestReplyScenariosWithNonCachedConsumersTests {
+public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMultiContextTests {
 
 	@Test(expected=MessageTimeoutException.class)
 	public void messageCorrelationBasedOnRequestMessageIdOptimized() throws Exception{
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java
index 78909846d0..62261c251b 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,10 +37,10 @@ import javax.jms.TextMessage;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.junit.Test;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.MessageDeliveryException;
 import org.springframework.integration.gateway.RequestReplyExchanger;
+import org.springframework.integration.jms.ActiveMQMultiContextTests;
 import org.springframework.integration.jms.config.ActiveMqTestUtils;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.test.util.TestUtils;
@@ -52,8 +52,9 @@ import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.support.converter.SimpleMessageConverter;
 /**
  * @author Oleg Zhurakousky
+ * @author Gary Russell
  */
-public class RequestReplyScenariosWithTempReplyQueuesTests {
+public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMultiContextTests {
 
 	private final SimpleMessageConverter converter = new SimpleMessageConverter();
 
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml
index cd4d508a17..aa4f67fba6 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml
@@ -10,7 +10,8 @@
 	<int:gateway default-request-channel="pipeline01" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline01"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination-name="pipeline01-queue-01">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -30,7 +31,8 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination-name="pipeline01-queue-02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml
index 2ba818721f..7152098a06 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline02" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline02"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline02-queue-01"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -31,7 +32,8 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination-name="pipeline02-queue-02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml
index ed49ea884b..1814912d38 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline03" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline03"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline03-queue-01"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -31,8 +32,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline03-queue-02"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml
index ec984f8778..cd007f3404 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml
@@ -10,7 +10,8 @@
 	<int:gateway default-request-channel="pipeline04" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline04"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination-name="pipeline04-queue-01">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -30,8 +31,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline04-queue-02"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml
index b75748535d..bcb4fc108c 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline05" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline05"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline05-queue-01"
+		receive-timeout="10000"
 		correlation-key="foo">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -32,7 +33,8 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination-name="pipeline05-queue-02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml
index fb24222086..b96400d9dd 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml
@@ -10,7 +10,8 @@
 	<int:gateway default-request-channel="pipeline06" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline06"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination-name="pipeline06-queue-01">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -30,8 +31,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline06-queue-02"
+		receive-timeout="10000"
 		correlation-key="foo">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml
index d929c700d0..0c3d8f4ab8 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline07" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline07"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline07-queue-01"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -31,8 +32,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline07-queue-02"
+		receive-timeout="10000"
 		correlation-key="foo">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml
index 6e984dd632..aadf866d58 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline08" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline08"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline08-queue-01"
+		receive-timeout="10000"
 		correlation-key="foo">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -32,8 +33,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline08-queue-02"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml
index 826130c0b4..5439ea7daf 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline09" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline09"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline09-queue-01"
+		receive-timeout="10000"
 		correlation-key="foo">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -32,8 +33,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="pipeline09-queue-02"
+		receive-timeout="10000"
 		correlation-key="bar">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml
index a04ada98af..6fad0625ab 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml
@@ -10,8 +10,9 @@
 	<int:gateway default-request-channel="pipeline01" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline01"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline01-01"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline01-01"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue01-01">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -31,7 +32,7 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination-name="anotherGatewayQueue01-01">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml
index f9cb3231e3..9469ab08e0 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline02" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline02"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline02-01"
-	    correlation-key="corr02"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline02-01"
+		correlation-key="corr02"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -33,16 +34,17 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline02-02"
-	    correlation-key="corr02"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline02-02"
+		correlation-key="corr02"
+		receive-timeout="10000"
 		request-destination-name="anotherGatewayQueue02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
 
 	<int-jms:inbound-gateway request-channel="anotherIn"
 		request-destination-name="anotherGatewayQueue02"
-	    correlation-key="corr02"
+		correlation-key="corr02"
 		connection-factory="connectionFactory"
 		concurrent-consumers="10"
 		reply-timeout="10000"/>
@@ -50,8 +52,9 @@
 	<int:transformer input-channel="anotherIn" expression="payload" output-channel="toThird" />
 
 	<int-jms:outbound-gateway request-channel="toThird"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline02-03"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline02-03"
+		receive-timeout="10000"
 		request-destination-name="thirdGatewayQueue02">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml
index 2016557a78..c689aac67d 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline02" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline02"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline02a-01"
-	    correlation-key="corr02a"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline02a-01"
+		correlation-key="corr02a"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue02a">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -33,9 +34,10 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline02a-01"
-	   	correlation-key="corr02a"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline02a-01"
+		correlation-key="corr02a"
+		receive-timeout="10000"
 		request-destination-name="anotherGatewayQueue02a">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -50,9 +52,10 @@
 	<int:transformer input-channel="anotherIn" expression="payload" output-channel="toThird" />
 
 	<int-jms:outbound-gateway request-channel="toThird"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline02a-01"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline02a-01"
 		correlation-key="corr02a"
+		receive-timeout="10000"
 		request-destination-name="thirdGatewayQueue02a">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml
index 4e5ce8aad7..a27b2324a8 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline03" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline03"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline03-01"
-	    correlation-key="JMSCorrelationID"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline03-01"
+		correlation-key="JMSCorrelationID"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue03">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -32,9 +33,10 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline03-02"
-	    correlation-key="corr03"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline03-02"
+		correlation-key="corr03"
+		receive-timeout="10000"
 		request-destination-name="anotherGatewayQueue03">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -49,9 +51,10 @@
 	<int:transformer input-channel="anotherIn" expression="payload" output-channel="toThird" />
 
 	<int-jms:outbound-gateway request-channel="toThird"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline03-03"
-	    correlation-key="corr03"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline03-03"
+		correlation-key="corr03"
+		receive-timeout="10000"
 		request-destination-name="thirdGatewayQueue03">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml
index f8e1c33fd4..aa0d9ed4d4 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline03" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline03"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline03a-01"
-	    correlation-key="JMSCorrelationID"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline03a-01"
+		correlation-key="JMSCorrelationID"
+		receive-timeout="30000"
 		request-destination-name="siOutQueue03a">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -32,9 +33,10 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline03a-01"
-	    correlation-key="corr03a"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline03a-01"
+		correlation-key="corr03a"
+		receive-timeout="30000"
 		request-destination-name="anotherGatewayQueue03a">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -51,8 +53,9 @@
 	<int-jms:outbound-gateway request-channel="toThird"
 		reply-channel="add10kOnTheWayBack"
 		correlation-key="corr03a"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline03a-01"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline03a-01"
+		receive-timeout="30000"
 		request-destination-name="thirdGatewayQueue03a">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml
index 9a0dbd04fa..0c2fbd8076 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline04" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline04"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline04-01"
-	    correlation-key="foo"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline04-01"
+		correlation-key="foo"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue04">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -33,8 +34,9 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline04-02"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline04-02"
+		receive-timeout="10000"
 		request-destination-name="anotherGatewayQueue04">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml
index f4b1c3608b..4e8079c4ab 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline05" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline05"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline05-01"
-	    correlation-key="foo"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline05-01"
+		correlation-key="foo"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue05">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -33,9 +34,10 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline05-02"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline05-02"
 		request-destination-name="anotherGatewayQueue05"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml
index 14a2fbca2c..c84ee59835 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline06" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline06"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline06-01"
-	    correlation-key="JMSCorrelationID"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline06-01"
+		correlation-key="JMSCorrelationID"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue06">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -33,9 +34,10 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline06-02"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline06-02"
 		request-destination-name="anotherGatewayQueue06"
+		receive-timeout="10000"
 		correlation-key="foo">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml
index 518d753cdf..da10f2704e 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml
@@ -10,9 +10,10 @@
 	<int:gateway default-request-channel="pipeline07" default-request-timeout="10000" default-reply-timeout="10000"/>
 
 	<int-jms:outbound-gateway request-channel="pipeline07"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline07-01"
-	    correlation-key="foo"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline07-01"
+		correlation-key="foo"
+		receive-timeout="10000"
 		request-destination-name="siOutQueue07">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -33,9 +34,10 @@
 	</int:chain>
 
 	<int-jms:outbound-gateway request-channel="anotherGatewayChannel"
-	    connection-factory="connectionFactory"
-	    reply-destination-name="pipeline07-02"
+		connection-factory="connectionFactory"
+		reply-destination-name="pipeline07-02"
 		request-destination-name="anotherGatewayQueue07"
+		receive-timeout="10000"
 		correlation-key="bar">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml
index 94408f140b..7537227ccf 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml
@@ -9,9 +9,10 @@
 	<int:gateway id="standardMessageIdCopyingConsumerWithOptimization" default-request-channel="jmsInOptimizedA"/>
 
 	<int-jms:outbound-gateway request-channel="jmsInOptimizedA"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination="siOutQueueOptimizedA"
 		reply-destination="siInQueueOptimizedA"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -30,8 +31,9 @@
 	<int:gateway id="standardMessageIdCopyingConsumerWithoutOptimization" default-request-channel="jmsInNonOptimizedB"/>
 
 	<int-jms:outbound-gateway request-channel="jmsInNonOptimizedB"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination="siOutQueueNonOptimizedB"
+		receive-timeout="10000"
 		reply-destination="siInQueueNonOptimizedB">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml
index d8d76dbbdc..35b23eed08 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml
@@ -9,9 +9,10 @@
 	<int:gateway id="optimized" default-request-channel="jmsInOptimized"/>
 
 	<int-jms:outbound-gateway request-channel="jmsInOptimized"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination="siOutQueueA"
 		reply-destination="siInQueueA"
+		receive-timeout="10000"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
@@ -29,7 +30,8 @@
 	<int:gateway id="nonoptimized" default-request-channel="jmsInNonOptimized"/>
 
 	<int-jms:outbound-gateway request-channel="jmsInNonOptimized"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination="siOutQueueB"
 		reply-destination="siInQueueB">
 		<int-jms:reply-listener />
@@ -48,8 +50,9 @@
 	<int:gateway id="optimizedMessageId" default-request-channel="jmsInOptimizedC"/>
 
 	<int-jms:outbound-gateway request-channel="jmsInOptimizedC"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination="siOutQueueC"
+		receive-timeout="10000"
 		reply-destination="siInQueueC"
 		correlation-key="JMSCorrelationID">
 		<int-jms:reply-listener />
@@ -68,8 +71,9 @@
 	<int:gateway id="nonoptimizedMessageId" default-request-channel="jmsInNonOptimizedD"/>
 
 	<int-jms:outbound-gateway request-channel="jmsInNonOptimizedD"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
 		request-destination="siOutQueueD"
+		receive-timeout="10000"
 		reply-destination="siInQueueD">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml
index 0391393ed5..af49411e0e 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml
@@ -9,7 +9,8 @@
 	<int:gateway default-request-channel="jmsIn"/>
 
 	<int-jms:outbound-gateway request-channel="jmsIn"
-	    connection-factory="connectionFactory"
+		connection-factory="connectionFactory"
+		receive-timeout="10000"
 		request-destination="siOutQueue">
 		<int-jms:reply-listener />
 	</int-jms:outbound-gateway>