From 911ddc11af42960b98829208bd849a9044ca3b68 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Fri, 30 Nov 2012 00:06:56 -0500
Subject: [PATCH] INT-2840 - Fix build failure against Spring 3.0.7 For
 reference see: https://jira.springsource.org/browse/INT-2840

---
 .../store/channel/AbstractTxTimeoutMessageStoreTests.java     | 2 +-
 .../jdbc/store/channel/DataSource-derby-context.xml           | 3 +--
 .../jdbc/store/channel/DataSource-hsql-context.xml            | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
index 86227ad3ad..ae1d65188d 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
@@ -61,7 +61,7 @@ abstract class AbstractTxTimeoutMessageStoreTests {
 		final TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
 
 		transactionTemplate.setIsolationLevel(Isolation.READ_COMMITTED.value());
-		transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER);
+		transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
 
 		for (int i = 1; i <= maxMessages; ++i) {
 			final String message = "TEST MESSAGE " + i;
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
index 1fdaabf9ca..8e6a6130c4 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
@@ -24,8 +24,7 @@
 		/> </bean> -->
 
 	<jdbc:initialize-database data-source="dataSource">
-		<jdbc:script
-			location="classpath:org/springframework/integration/jdbc/store/channel/schema-derby.sql" />
+		<jdbc:script location="classpath:org/springframework/integration/jdbc/store/channel/schema-derby.sql" />
 	</jdbc:initialize-database>
 
 	<bean id="queryProvider"
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
index d09f51bf53..b75c8e7a64 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
@@ -17,8 +17,8 @@
 	</bean>
 
 	<jdbc:initialize-database data-source="dataSource" ignore-failures="DROPS">
-		<jdbc:script execution="INIT" location="classpath:org/springframework/integration/jdbc/store/channel/schema-drop-hsql.sql"/>
-		<jdbc:script execution="INIT" location="classpath:org/springframework/integration/jdbc/store/channel/schema-hsql.sql"/>
+		<jdbc:script location="classpath:org/springframework/integration/jdbc/store/channel/schema-drop-hsql.sql"/>
+		<jdbc:script location="classpath:org/springframework/integration/jdbc/store/channel/schema-hsql.sql"/>
 	</jdbc:initialize-database>
 
 	<bean id="queryProvider" class="org.springframework.integration.jdbc.store.channel.HsqlChannelMessageStoreQueryProvider"/>