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

Merge pull request #687 from ghillert/INT-2840

Browse Source 
* INT-2840: Fix build failure against Spring 3.0.7

For reference see: https://jira.springsource.org/browse/INT-2840
This commit is contained in:
Mark Fisher
2012-11-30 11:56:47 -05:00
parent 734eae72a7 911ddc11af
commit 28fa4407b9
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
View File

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

3
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
View File

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

4
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-hsql-context.xml
View File

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