diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index 82dad4615..b8df7276b 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -47,18 +47,27 @@
 		</dependency>
 		<!-- optional dependency from infrastructure -->
 		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-			<version>3.0</version>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>easymock</groupId>
-			<artifactId>easymock</artifactId>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<!-- Spring Dependencies -->
 		<dependency>
@@ -67,13 +76,29 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-context</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -81,6 +106,119 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-sql</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<typedef resource="foundrylogic/vpp/typedef.properties" />
+								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
+								<!-- Scripts for DAO tests - N.B. under source control. -->
+								<vppcopy todir="${basedir}/src/test/resources/org/springframework/batch/execution/repository/dao" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/hsqldb.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="*.sql.vpp" excludes="schema*" />
+									<mapper type="glob" from="*.sql.vpp" to="*.sql" />
+								</vppcopy>
+								<!-- Reference script for HSQLDB - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/hsqldb.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
+								</vppcopy>
+								<!-- Reference script for DB2 - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/db2.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/db2.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-db2.sql" />
+								</vppcopy>
+								<!-- Reference script for Derby - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/derby.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/derby.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-derby.sql" />
+								</vppcopy>
+								<!-- Reference script for Oracle - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/oracle10g.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/oracle10g.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-oracle10g.sql" />
+								</vppcopy>
+								<!-- Reference script for PostgreSQL - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/postgresql.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/postgresql.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
+								</vppcopy>
+								<!-- Reference script for MySQL - N.B. not under source control, but packaged in jar. -->
+								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
+									<config>
+										<context>
+											<property key="includes" value="src/main/sql" />
+											<property file="${basedir}/src/main/sql/mysql.properties" />
+										</context>
+										<engine>
+											<property key="velocimacro.library" value="src/main/sql/mysql.vpp" />
+										</engine>
+									</config>
+									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp" to="*-mysql.sql" />
+								</vppcopy>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/job/AbstractJob.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/job/AbstractJob.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/job/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/job/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemHandler.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemHandler.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/TaskletStep.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/TaskletStep.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/package.html
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/package.html
similarity index 100%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/package.html
rename to spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/package.html
diff --git a/spring-batch-execution/src/main/resources/batch.template.properties b/spring-batch-core/src/main/resources/batch.template.properties
similarity index 100%
rename from spring-batch-execution/src/main/resources/batch.template.properties
rename to spring-batch-core/src/main/resources/batch.template.properties
diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql
similarity index 100%
rename from spring-batch-execution/src/main/resources/schema-db2.sql
rename to spring-batch-core/src/main/resources/schema-db2.sql
diff --git a/spring-batch-execution/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql
similarity index 100%
rename from spring-batch-execution/src/main/resources/schema-derby.sql
rename to spring-batch-core/src/main/resources/schema-derby.sql
diff --git a/spring-batch-execution/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql
similarity index 100%
rename from spring-batch-execution/src/main/resources/schema-hsqldb.sql
rename to spring-batch-core/src/main/resources/schema-hsqldb.sql
diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql
similarity index 100%
rename from spring-batch-execution/src/main/resources/schema-mysql.sql
rename to spring-batch-core/src/main/resources/schema-mysql.sql
diff --git a/spring-batch-execution/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql
similarity index 100%
rename from spring-batch-execution/src/main/resources/schema-oracle10g.sql
rename to spring-batch-core/src/main/resources/schema-oracle10g.sql
diff --git a/spring-batch-execution/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql
similarity index 100%
rename from spring-batch-execution/src/main/resources/schema-postgresql.sql
rename to spring-batch-core/src/main/resources/schema-postgresql.sql
diff --git a/spring-batch-execution/src/main/sql/db2.properties b/spring-batch-core/src/main/sql/db2.properties
similarity index 100%
rename from spring-batch-execution/src/main/sql/db2.properties
rename to spring-batch-core/src/main/sql/db2.properties
diff --git a/spring-batch-execution/src/main/sql/db2.vpp b/spring-batch-core/src/main/sql/db2.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/db2.vpp
rename to spring-batch-core/src/main/sql/db2.vpp
diff --git a/spring-batch-execution/src/main/sql/derby.properties b/spring-batch-core/src/main/sql/derby.properties
similarity index 100%
rename from spring-batch-execution/src/main/sql/derby.properties
rename to spring-batch-core/src/main/sql/derby.properties
diff --git a/spring-batch-execution/src/main/sql/derby.vpp b/spring-batch-core/src/main/sql/derby.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/derby.vpp
rename to spring-batch-core/src/main/sql/derby.vpp
diff --git a/spring-batch-execution/src/main/sql/destroy.sql.vpp b/spring-batch-core/src/main/sql/destroy.sql.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/destroy.sql.vpp
rename to spring-batch-core/src/main/sql/destroy.sql.vpp
diff --git a/spring-batch-execution/src/main/sql/hsqldb.properties b/spring-batch-core/src/main/sql/hsqldb.properties
similarity index 100%
rename from spring-batch-execution/src/main/sql/hsqldb.properties
rename to spring-batch-core/src/main/sql/hsqldb.properties
diff --git a/spring-batch-execution/src/main/sql/hsqldb.vpp b/spring-batch-core/src/main/sql/hsqldb.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/hsqldb.vpp
rename to spring-batch-core/src/main/sql/hsqldb.vpp
diff --git a/spring-batch-execution/src/main/sql/init.sql.vpp b/spring-batch-core/src/main/sql/init.sql.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/init.sql.vpp
rename to spring-batch-core/src/main/sql/init.sql.vpp
diff --git a/spring-batch-execution/src/main/sql/mysql.properties b/spring-batch-core/src/main/sql/mysql.properties
similarity index 100%
rename from spring-batch-execution/src/main/sql/mysql.properties
rename to spring-batch-core/src/main/sql/mysql.properties
diff --git a/spring-batch-execution/src/main/sql/mysql.vpp b/spring-batch-core/src/main/sql/mysql.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/mysql.vpp
rename to spring-batch-core/src/main/sql/mysql.vpp
diff --git a/spring-batch-execution/src/main/sql/oracle10g.properties b/spring-batch-core/src/main/sql/oracle10g.properties
similarity index 100%
rename from spring-batch-execution/src/main/sql/oracle10g.properties
rename to spring-batch-core/src/main/sql/oracle10g.properties
diff --git a/spring-batch-execution/src/main/sql/oracle10g.vpp b/spring-batch-core/src/main/sql/oracle10g.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/oracle10g.vpp
rename to spring-batch-core/src/main/sql/oracle10g.vpp
diff --git a/spring-batch-execution/src/main/sql/postgresql.properties b/spring-batch-core/src/main/sql/postgresql.properties
similarity index 100%
rename from spring-batch-execution/src/main/sql/postgresql.properties
rename to spring-batch-core/src/main/sql/postgresql.properties
diff --git a/spring-batch-execution/src/main/sql/postgresql.vpp b/spring-batch-core/src/main/sql/postgresql.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/postgresql.vpp
rename to spring-batch-core/src/main/sql/postgresql.vpp
diff --git a/spring-batch-execution/src/main/sql/schema.sql.vpp b/spring-batch-core/src/main/sql/schema.sql.vpp
similarity index 100%
rename from spring-batch-execution/src/main/sql/schema.sql.vpp
rename to spring-batch-core/src/main/sql/schema.sql.vpp
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/JobSupport.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/job/JobSupport.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
similarity index 94%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
index b2cfbf444..aeab819b0 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
@@ -93,6 +93,10 @@ public class ItemOrientedStepTests extends TestCase {
 	}
 
 	protected void setUp() throws Exception {
+		MapJobInstanceDao.clear();
+		MapStepExecutionDao.clear();
+		MapJobExecutionDao.clear();
+
 		transactionManager = new ResourcelessTransactionManager();
 
 		itemOrientedStep = (ItemOrientedStep) getStep(new String[] { "foo", "bar", "spam" });
@@ -141,7 +145,8 @@ public class ItemOrientedStepTests extends TestCase {
 
 	public void testRepository() throws Exception {
 
-		SimpleJobRepository repository = new SimpleJobRepository(new MapJobInstanceDao(), new MapJobExecutionDao(), new MapStepExecutionDao());
+		SimpleJobRepository repository = new SimpleJobRepository(new MapJobInstanceDao(), new MapJobExecutionDao(),
+		        new MapStepExecutionDao());
 		itemOrientedStep.setJobRepository(repository);
 
 		JobExecution jobExecution = repository.createJobExecution(jobInstance.getJob(), jobInstance.getJobParameters());
@@ -174,8 +179,7 @@ public class ItemOrientedStepTests extends TestCase {
 
 		try {
 			itemOrientedStep.execute(stepExecution);
-		}
-		catch (Exception ex) {
+		} catch (Exception ex) {
 			assertEquals(stepExecution.getRollbackCount(), new Integer(1));
 		}
 
@@ -204,16 +208,15 @@ public class ItemOrientedStepTests extends TestCase {
 
 		try {
 			itemOrientedStep.execute(stepExecution);
-		}
-		catch (Exception ex) {
+		} catch (Exception ex) {
 			ExitStatus status = stepExecution.getExitStatus();
 			assertFalse(status.isContinuable());
 		}
 	}
 
 	/*
-	 * make sure a job that has never been executed before, but does have
-	 * saveExecutionAttributes = true, doesn't have restoreFrom called on it.
+	 * make sure a job that has never been executed before, but does have saveExecutionAttributes = true, doesn't have
+	 * restoreFrom called on it.
 	 */
 	public void testNonRestartedJob() throws Exception {
 		MockRestartableItemReader tasklet = new MockRestartableItemReader();
@@ -251,16 +254,14 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected BatchCriticalException");
-		}
-		catch (UnexpectedJobExecutionException e) {
+		} catch (UnexpectedJobExecutionException e) {
 			assertEquals("foo", e.getCause().getMessage());
 		}
 		assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus());
 	}
 
 	/*
-	 * make sure a job that has been executed before, and is therefore being
-	 * restarted, is restored.
+	 * make sure a job that has been executed before, and is therefore being restarted, is restored.
 	 */
 	// public void testRestartedJob() throws Exception {
 	// String step = "stepName";
@@ -282,9 +283,8 @@ public class ItemOrientedStepTests extends TestCase {
 	// assertTrue(tasklet.isGetExecutionAttributesCalled());
 	// }
 	/*
-	 * Test that a job that is being restarted, but has saveExecutionAttributes
-	 * set to false, doesn't have restore or getExecutionAttributes called on
-	 * it.
+	 * Test that a job that is being restarted, but has saveExecutionAttributes set to false, doesn't have restore or
+	 * getExecutionAttributes called on it.
 	 */
 	public void testNoSaveExecutionAttributesRestartableJob() {
 		MockRestartableItemReader tasklet = new MockRestartableItemReader();
@@ -294,8 +294,7 @@ public class ItemOrientedStepTests extends TestCase {
 
 		try {
 			itemOrientedStep.execute(stepExecution);
-		}
-		catch (Throwable t) {
+		} catch (Throwable t) {
 			fail();
 		}
 
@@ -303,9 +302,8 @@ public class ItemOrientedStepTests extends TestCase {
 	}
 
 	/*
-	 * Even though the job is restarted, and saveExecutionAttributes is true,
-	 * nothing will be restored because the Tasklet does not implement
-	 * Restartable.
+	 * Even though the job is restarted, and saveExecutionAttributes is true, nothing will be restored because the
+	 * Tasklet does not implement Restartable.
 	 */
 	public void testRestartJobOnNonRestartableTasklet() throws Exception {
 		itemOrientedStep.setItemHandler(new SimpleItemHandler(new AbstractItemReader() {
@@ -324,6 +322,7 @@ public class ItemOrientedStepTests extends TestCase {
 			public Object read() throws Exception {
 				return "foo";
 			}
+
 			public void update(ExecutionContext executionContext) {
 				// TODO Auto-generated method stub
 				executionContext.putString("foo", "bar");
@@ -344,11 +343,11 @@ public class ItemOrientedStepTests extends TestCase {
 	}
 
 	public void testDirectlyInjectedItemStream() throws Exception {
-		itemOrientedStep.setStreams(new ItemStream[] {new ItemStreamSupport() {
+		itemOrientedStep.setStreams(new ItemStream[] { new ItemStreamSupport() {
 			public void update(ExecutionContext executionContext) {
 				executionContext.putString("foo", "bar");
 			}
-		}});
+		} });
 		JobExecution jobExecution = new JobExecution(jobInstance);
 		StepExecution stepExecution = new StepExecution(itemOrientedStep, jobExecution);
 
@@ -364,6 +363,7 @@ public class ItemOrientedStepTests extends TestCase {
 			public void beforeStep(StepExecution stepExecution) {
 				list.add("foo");
 			}
+
 			public ExitStatus afterStep(StepExecution stepExecution) {
 				list.add("bar");
 				return null;
@@ -380,32 +380,33 @@ public class ItemOrientedStepTests extends TestCase {
 			public void beforeStep(StepExecution stepExecution) {
 				list.add("foo");
 			}
+
 			public void open(ExecutionContext executionContext) throws ItemStreamException {
 				assertEquals(1, list.size());
 			}
 		};
-		itemOrientedStep.setStreams(new ItemStream[] {reader});
+		itemOrientedStep.setStreams(new ItemStream[] { reader });
 		itemOrientedStep.registerStepListener(reader);
 		StepExecution stepExecution = new StepExecution(itemOrientedStep, new JobExecution(jobInstance));
 		itemOrientedStep.execute(stepExecution);
 		assertEquals(1, list.size());
 	}
-	
-	public void testAfterStep() throws Exception{
-		
+
+	public void testAfterStep() throws Exception {
+
 		final ExitStatus customStatus = new ExitStatus(false, "custom code");
-		
-		itemOrientedStep.setStepListeners(new StepListener[] {new StepListenerSupport() {
+
+		itemOrientedStep.setStepListeners(new StepListener[] { new StepListenerSupport() {
 			public ExitStatus afterStep(StepExecution stepExecution) {
 				list.add("afterStepCalled");
 				return customStatus;
 			}
-		}});
-		
+		} });
+
 		RepeatTemplate stepTemplate = new RepeatTemplate();
 		stepTemplate.setCompletionPolicy(new SimpleCompletionPolicy(5));
 		itemOrientedStep.setStepOperations(stepTemplate);
-		
+
 		JobExecution jobExecution = new JobExecution(jobInstance);
 		StepExecution stepExecution = new StepExecution(itemOrientedStep, jobExecution);
 		itemOrientedStep.execute(stepExecution);
@@ -443,13 +444,14 @@ public class ItemOrientedStepTests extends TestCase {
 			public Object read() throws Exception {
 				return "foo";
 			}
+
 			public void update(ExecutionContext executionContext) {
 				// TODO Auto-generated method stub
 				executionContext.putString("foo", "bar");
 			}
 		};
 		itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter));
-		itemOrientedStep.setStreams(new ItemStream[] {reader});
+		itemOrientedStep.setStreams(new ItemStream[] { reader });
 		JobExecution jobExecution = new JobExecution(jobInstance);
 		StepExecution stepExecution = new StepExecution(itemOrientedStep, jobExecution);
 
@@ -499,12 +501,11 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected StepInterruptedException");
-		}
-		catch (JobInterruptedException ex) {
+		} catch (JobInterruptedException ex) {
 			assertEquals(BatchStatus.STOPPED, stepExecution.getStatus());
 			String msg = stepExecution.getExitStatus().getExitDescription();
 			assertTrue("Message does not contain JobInterruptedException: " + msg, msg
-					.contains("JobInterruptedException"));
+			        .contains("JobInterruptedException"));
 		}
 	}
 
@@ -527,8 +528,7 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected RuntimeException");
-		}
-		catch (RuntimeException ex) {
+		} catch (RuntimeException ex) {
 			assertEquals(BatchStatus.FAILED, stepExecution.getStatus());
 			// The original rollback was caused by this one:
 			assertEquals("Foo", ex.getMessage());
@@ -560,8 +560,7 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected BatchCriticalException");
-		}
-		catch (UnexpectedJobExecutionException ex) {
+		} catch (UnexpectedJobExecutionException ex) {
 			assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus());
 			String msg = stepExecution.getExitStatus().getExitDescription();
 			assertTrue("Message does not contain ResetFailedException: " + msg, msg.contains("ResetFailedException"));
@@ -588,8 +587,7 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected BatchCriticalException");
-		}
-		catch (UnexpectedJobExecutionException ex) {
+		} catch (UnexpectedJobExecutionException ex) {
 			assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus());
 			String msg = stepExecution.getExitStatus().getExitDescription();
 			assertEquals("", msg);
@@ -604,7 +602,7 @@ public class ItemOrientedStepTests extends TestCase {
 
 		itemOrientedStep.setJobRepository(new JobRepositorySupport() {
 			public void saveOrUpdate(StepExecution stepExecution) {
-				if (stepExecution.getEndTime()!=null) {
+				if (stepExecution.getEndTime() != null) {
 					throw new RuntimeException("Bar");
 				}
 				super.saveOrUpdate(stepExecution);
@@ -617,8 +615,7 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected RuntimeException");
-		}
-		catch (RuntimeException ex) {
+		} catch (RuntimeException ex) {
 			// The job actually completeed, but teh streams couldn't be closed.
 			assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
 			String msg = stepExecution.getExitStatus().getExitDescription();
@@ -651,8 +648,7 @@ public class ItemOrientedStepTests extends TestCase {
 		try {
 			itemOrientedStep.execute(stepExecution);
 			fail("Expected InfrastructureException");
-		}
-		catch (UnexpectedJobExecutionException ex) {
+		} catch (UnexpectedJobExecutionException ex) {
 			// The job actually completeed, but the streams couldn't be closed.
 			assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
 			String msg = stepExecution.getExitStatus().getExitDescription();
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/StepSupport.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/StepSupport.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java
similarity index 100%
rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java
diff --git a/spring-batch-execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
similarity index 100%
rename from spring-batch-execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
rename to spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml
similarity index 100%
rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml
rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml
diff --git a/spring-batch-execution/.springBeans b/spring-batch-execution/.springBeans
index 0d78bec76..c0fa1b743 100644
--- a/spring-batch-execution/.springBeans
+++ b/spring-batch-execution/.springBeans
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/test-context.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -19,8 +14,6 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
-				<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -28,7 +21,6 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -36,8 +28,6 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
-				<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
 			</configs>
 		</configSet>
 	</configSets>
diff --git a/spring-batch-execution/pom.xml b/spring-batch-execution/pom.xml
index 5ff3cdff4..ae023a746 100644
--- a/spring-batch-execution/pom.xml
+++ b/spring-batch-execution/pom.xml
@@ -102,123 +102,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-sql</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<typedef resource="foundrylogic/vpp/typedef.properties" />
-								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
-								<!-- Scripts for DAO tests - N.B. under source control. -->
-								<vppcopy todir="${basedir}/src/test/resources/org/springframework/batch/execution/repository/dao" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/hsqldb.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="*.sql.vpp" excludes="schema*" />
-									<mapper type="glob" from="*.sql.vpp" to="*.sql" />
-								</vppcopy>
-								<!-- Reference script for HSQLDB - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/hsqldb.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
-								</vppcopy>
-								<!-- Reference script for DB2 - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/db2.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/db2.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-db2.sql" />
-								</vppcopy>
-								<!-- Reference script for Derby - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/derby.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/derby.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-derby.sql" />
-								</vppcopy>
-								<!-- Reference script for Oracle - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/oracle10g.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/oracle10g.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-oracle10g.sql" />
-								</vppcopy>
-								<!-- Reference script for PostgreSQL - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/postgresql.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/postgresql.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
-								</vppcopy>
-								<!-- Reference script for MySQL - N.B. not under source control, but packaged in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/mysql.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/mysql.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-mysql.sql" />
-								</vppcopy>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/spring-batch-infrastructure/.springBeans b/spring-batch-infrastructure/.springBeans
index 15db1a370..133aca434 100644
--- a/spring-batch-infrastructure/.springBeans
+++ b/spring-batch-infrastructure/.springBeans
@@ -7,7 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/database/data-source-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/item/file/mapping/bean-wrapper.xml</config>
 	</configs>
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java
index ab2af4969..871b22923 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java
@@ -10,7 +10,7 @@ import org.springframework.util.Assert;
 
 /**
  * Tests for {@link AbstractMethodInvokingDelegator}
- * 
+ *
  * @author Robert Kasanicky
  */
 public class AbstractDelegatorTests extends TestCase {
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 98982f56f..64cbe27a3 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -41,11 +41,6 @@
 	</profiles>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-execution</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>