BATCH-1919: Switch to using <jdbc:/> namespace in samples

spring-batch-samples/src/main/resources/batch-derby.properties

@@ -6,11 +6,9 @@ batch.jdbc.user=app
 batch.jdbc.password=
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.jdbc.verifyCursorPosition=false
 batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-derby.sql
 batch.schema.script=classpath:/org/springframework/batch/core/schema-derby.sql
 batch.business.schema.script=business-schema-derby.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer
 batch.database.incrementer.parent=columnIncrementerParent
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler

spring-batch-samples/src/main/resources/batch-h2.properties

@@ -6,11 +6,9 @@ batch.jdbc.user=sa
 batch.jdbc.password=
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.jdbc.verifyCursorPosition=true
 batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-h2.sql
 batch.schema.script=classpath:/org/springframework/batch/core/schema-h2.sql
 batch.business.schema.script=classpath:/business-schema-h2.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.H2SequenceMaxValueIncrementer
 batch.database.incrementer.parent=sequenceIncrementerParent
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler

spring-batch-samples/src/main/resources/batch-hsql.properties

@@ -9,11 +9,9 @@ batch.jdbc.user=sa
 batch.jdbc.password=
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.jdbc.verifyCursorPosition=true
 batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-hsqldb.sql
 batch.schema.script=classpath:/org/springframework/batch/core/schema-hsqldb.sql
 batch.business.schema.script=classpath:/business-schema-hsqldb.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer
 batch.database.incrementer.parent=columnIncrementerParent
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler

spring-batch-samples/src/main/resources/batch-mysql.properties

@@ -6,11 +6,9 @@ batch.jdbc.user=test
 batch.jdbc.password=test
 batch.jdbc.testWhileIdle=true
 batch.jdbc.validationQuery=SELECT 1
-batch.jdbc.verifyCursorPosition=true
 batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-mysql.sql
 batch.schema.script=classpath:/org/springframework/batch/core/schema-mysql.sql
 batch.business.schema.script=classpath:business-schema-mysql.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.MySQLMaxValueIncrementer
 batch.database.incrementer.parent=columnIncrementerParent
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler

spring-batch-samples/src/main/resources/batch-oracle.properties

@@ -6,11 +6,9 @@ batch.jdbc.user=spring
 batch.jdbc.password=spring
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.jdbc.verifyCursorPosition=true
 batch.drop.script=classpath:/org/springframework/batch/core/schema-drop-oracle10g.sql
 batch.schema.script=classpath:/org/springframework/batch/core/schema-oracle10g.sql
 batch.business.schema.script=business-schema-oracle10g.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer
 batch.database.incrementer.parent=sequenceIncrementerParent
 batch.lob.handler.class=org.springframework.jdbc.support.lob.OracleLobHandler

spring-batch-samples/src/main/resources/batch-sqlserver.properties

@@ -6,11 +6,9 @@ batch.jdbc.user=sa
 batch.jdbc.password=sa
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.jdbc.verifyCursorPosition=true
 batch.drop.script=/org/springframework/batch/core/schema-drop-sqlserver.sql
 batch.schema.script=/org/springframework/batch/core/schema-sqlserver.sql
 batch.business.schema.script=business-schema-sqlserver.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.SqlServerMaxValueIncrementer
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler
 batch.database.incrementer.parent=columnIncrementerParent

spring-batch-samples/src/main/resources/batch-sybase.properties

@@ -6,11 +6,9 @@ batch.jdbc.user=spring
 batch.jdbc.password=spring
 batch.jdbc.testWhileIdle=false
 batch.jdbc.validationQuery=
-batch.jdbc.verifyCursorPosition=true
 batch.drop.script=/org/springframework/batch/core/schema-drop-sybase.sql
 batch.schema.script=/org/springframework/batch/core/schema-sybase.sql
 batch.business.schema.script=business-schema-sybase.sql
-batch.data.source.init=true
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.SybaseMaxValueIncrementer
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler
 batch.database.incrementer.parent=columnIncrementerParent

spring-batch-samples/src/main/resources/data-source-context.xml

@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+	http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
 
 	<!--  Initialise the database before every test case: -->
-	<bean id="dataSourceInitializer" class="test.jdbc.datasource.DataSourceInitializer">
-		<property name="dataSource" ref="dataSource"/>
-		<property name="initialize" value="${batch.data.source.init}"/>
-		<property name="initScripts">
-			<list>
-				<value>${batch.drop.script}</value>
-				<value>${batch.schema.script}</value>
-				<value>${batch.business.schema.script}</value>
-			</list>
-		</property>
-	</bean>
+    <jdbc:initialize-database data-source="dataSource">
+        <jdbc:script location="${batch.drop.script}"/>
+        <jdbc:script location="${batch.schema.script}"/>
+        <jdbc:script location="${batch.business.schema.script}"/>
+    </jdbc:initialize-database>
 
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
 		<property name="driverClassName" value="${batch.jdbc.driver}" />
@@ -72,5 +66,4 @@
 	</bean>
 
 	<bean id="lobHandler" class="${batch.lob.handler.class}"/>
-
 </beans>