From 33379ce0259a46ed2dda81449856e5c7b025899a Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Fri, 7 May 2010 09:09:41 +0000
Subject: [PATCH] Fix build after broken update

---
 .../jdbcInboundChannelAdapterCommonConfig.xml   |  6 +++++-
 ...cOperationsJdbcInboundChannelAdapterTest.xml | 17 +----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml
index 94c00c6a26..5b4080cab2 100644
--- a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml
+++ b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml
@@ -10,8 +10,12 @@
 		<si:queue />
 	</si:channel>
 
+	<si:poller default="true">
+		<si:interval-trigger interval="100" />
+	</si:poller>
+
 	<jdbc:embedded-database type="HSQL" id="dataSource">
-		<jdbc:script location="org/springframework/integration/jdbc/config/outboundSchema.sql" />
+		<jdbc:script location="org/springframework/integration/jdbc/config/inboundSchema.sql" />
 	</jdbc:embedded-database>
 	
 	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml
index f504fc6ad0..938e07233a 100644
--- a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml
+++ b/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml
@@ -12,21 +12,6 @@
 	<inbound-channel-adapter query="select * from item where status=2"
 		channel="target" jdbc-operations="jdbcTemplate" />
 
-	<si:channel id="target">
-		<si:queue />
-	</si:channel>
-
-	<jdbc:embedded-database type="HSQL" id="dataSource">
-		<jdbc:script
-			location="org/springframework/integration/jdbc/config/inboundSchema.sql" />
-	</jdbc:embedded-database>
-
-	<beans:bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-		<beans:constructor-arg ref="dataSource" />
-	</beans:bean>
-
-	<si:poller default="true">
-		<si:interval-trigger interval="100" />
-	</si:poller>
+	<beans:import  resource="jdbcInboundChannelAdapterCommonConfig.xml" />
 
 </beans:beans>