Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

INT-2840 - Fix build failure against Spring 3.0.7 #687

Merged
merged 1 commit into from

2 participants

@markfisher
Owner

LGTM; merging

@markfisher markfisher merged commit 911ddc1 into spring-projects:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 30, 2012
This page is out of date. Refresh to see the latest.
View
2  ...rg/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
@@ -61,7 +61,7 @@ public void test() throws InterruptedException {
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;
View
3  ...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"
View
4 .../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"/>
Something went wrong with that request. Please try again.