diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index 87f6f6bba..9d0265c41 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -1,251 +1,249 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<version>1</version>
-	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
-	<configSuffixes>
-		<configSuffix><![CDATA[xml]]></configSuffix>
-	</configSuffixes>
-	<configs>
-		<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
-		<config>src/main/resources/jobs/multilineJob.xml</config>
-		<config>src/main/resources/jobs/multilineOrderInputDescriptors.xml</config>
-		<config>src/main/resources/jobs/multilineOrderIo.xml</config>
-		<config>src/main/resources/jobs/multilineOrderJob.xml</config>
-		<config>src/main/resources/jobs/multilineOrderOutputDescriptors.xml</config>
-		<config>src/main/resources/jobs/tradeJob.xml</config>
-		<config>src/main/resources/jobs/tradeJobIo.xml</config>
-		<config>src/main/resources/jobs/restartSample.xml</config>
-		<config>src/main/resources/data-source-context.xml</config>
-		<config>src/main/resources/simple-container-definition.xml</config>
-		<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
-		<config>src/main/resources/jobs/adhocLoopJob.xml</config>
-		<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
-		<config>src/main/resources/data-source-context-init.xml</config>
-		<config>src/main/resources/jobs/xmlStaxJob.xml</config>
-		<config>src/main/resources/jobs/hibernateJob.xml</config>
-		<config>src/main/resources/jobs/ibatisJob.xml</config>
-		<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
-		<config>src/main/resources/jobs/footballJob.xml</config>
-		<config>src/main/resources/jobs/simpleTaskletJob.xml</config>
-		<config>src/main/resources/beanRefContext.xml</config>
-		<config>src/main/resources/jobs/delegatingJob.xml</config>
-		<config>src/main/resources/jobs/parallelJob.xml</config>
-		<config>src/main/resources/jobs/rollbackJob.xml</config>
-		<config>src/main/resources/jobs/retrySample.xml</config>
-	</configs>
-	<configSets>
-		<configSet>
-			<name><![CDATA[adhocLoop]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/jobs/adhocLoopJob.xml</config>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[beanWrapper]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[fixedLengthImport]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[infiniteLoop]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[multiline]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/jobs/multilineJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[restart]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/jobs/restartSample.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[trade]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/jobs/tradeJob.xml</config>
-				<config>src/main/resources/jobs/tradeJobIo.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[multilineOrder]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/jobs/multilineOrderInputDescriptors.xml</config>
-				<config>src/main/resources/jobs/multilineOrderIo.xml</config>
-				<config>src/main/resources/jobs/multilineOrderJob.xml</config>
-				<config>src/main/resources/jobs/multilineOrderOutputDescriptors.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[xmlStax]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-				<config>src/main/resources/jobs/xmlStaxJob.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[football]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-				<config>src/main/resources/jobs/footballJob.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[simpleTasklet]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/simpleTaskletJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[hibernate]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/hibernateJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[ibatis]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/ibatisJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[parallel]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/parallelJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[compositeProcessor]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/simple-container-definition.xml</config>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[delegating]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/delegatingJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[repositoryTest]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[staging]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[rollback]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/rollbackJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-				<config>src/main/resources/jobs/tradeJobIo.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[retry]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/jobs/retrySample.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/data-source-context-init.xml</config>
-			</configs>
-		</configSet>
-	</configSets>
-</beansProjectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<configs>
+		<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
+		<config>src/main/resources/jobs/multilineJob.xml</config>
+		<config>src/main/resources/jobs/multilineOrderInputDescriptors.xml</config>
+		<config>src/main/resources/jobs/multilineOrderIo.xml</config>
+		<config>src/main/resources/jobs/multilineOrderJob.xml</config>
+		<config>src/main/resources/jobs/multilineOrderOutputDescriptors.xml</config>
+		<config>src/main/resources/jobs/tradeJob.xml</config>
+		<config>src/main/resources/jobs/tradeJobIo.xml</config>
+		<config>src/main/resources/jobs/restartSample.xml</config>
+		<config>src/main/resources/data-source-context.xml</config>
+		<config>src/main/resources/simple-container-definition.xml</config>
+		<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
+		<config>src/main/resources/jobs/adhocLoopJob.xml</config>
+		<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
+		<config>src/main/resources/data-source-context-init.xml</config>
+		<config>src/main/resources/jobs/xmlStaxJob.xml</config>
+		<config>src/main/resources/jobs/hibernateJob.xml</config>
+		<config>src/main/resources/jobs/ibatisJob.xml</config>
+		<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
+		<config>src/main/resources/jobs/footballJob.xml</config>
+		<config>src/main/resources/beanRefContext.xml</config>
+		<config>src/main/resources/jobs/delegatingJob.xml</config>
+		<config>src/main/resources/jobs/parallelJob.xml</config>
+		<config>src/main/resources/jobs/rollbackJob.xml</config>
+		<config>src/main/resources/jobs/retrySample.xml</config>
+	</configs>
+	<configSets>
+		<configSet>
+			<name><![CDATA[adhocLoop]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/adhocLoopJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[beanWrapper]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[fixedLengthImport]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[infiniteLoop]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[multiline]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/multilineJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[restart]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/restartSample.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[trade]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/tradeJob.xml</config>
+				<config>src/main/resources/jobs/tradeJobIo.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[multilineOrder]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/multilineOrderInputDescriptors.xml</config>
+				<config>src/main/resources/jobs/multilineOrderIo.xml</config>
+				<config>src/main/resources/jobs/multilineOrderJob.xml</config>
+				<config>src/main/resources/jobs/multilineOrderOutputDescriptors.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[xmlStax]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/jobs/xmlStaxJob.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[football]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/jobs/footballJob.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[simpleTasklet]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[hibernate]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/jobs/hibernateJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[ibatis]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/jobs/ibatisJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[parallel]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/jobs/parallelJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[compositeProcessor]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[delegating]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/jobs/delegatingJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[repositoryTest]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[staging]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[rollback]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/jobs/rollbackJob.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/jobs/tradeJobIo.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[retry]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/retrySample.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+			</configs>
+		</configSet>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml b/spring-batch-samples/src/main/resources/jobs/simpleJob.xml
similarity index 92%
rename from spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
rename to spring-batch-samples/src/main/resources/jobs/simpleJob.xml
index ee68d384e..373b82ddd 100644
--- a/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/simpleJob.xml
@@ -10,10 +10,10 @@
 	<bean parent="stepScope"/>
 	<bean parent="jobConfigurationRegistryBeanPostProcessor"/>
 
-	<bean id="simpleTaskletJob" parent="simpleJob">
+	<bean id="simpleJob" parent="simpleJob">
 		<property name="steps">
 			<list>
-				<bean id="step1" parent="simpleStep">
+				<bean id="step1" parent="chunkedStep">
 					<property name="itemReader" ref="fileItemReader" />
 					<property name="itemWriter">
 						<bean
@@ -21,7 +21,7 @@
 							<property name="tradeDao" ref="tradeDao" />
 						</bean>
 					</property>
-					<property name="commitInterval" value="2" />
+					<property name="chunkSize" value="2" />
 				</bean>
 			</list>
 		</property>
diff --git a/spring-batch-samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-container-definition.xml
index 6e73bd522..8ff410255 100644
--- a/spring-batch-samples/src/main/resources/simple-container-definition.xml
+++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml
@@ -100,9 +100,11 @@
 		<property name="saveExecutionAttributes" value="true" />
 	</bean>
 
-	<bean id="abstractStep" class="org.springframework.batch.execution.step.simple.SimpleStep"
-		abstract="true" parent="taskletStep">
+	<bean id="abstractStep" class="org.springframework.batch.execution.step.simple.SimpleStep" abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
+		<property name="jobRepository" ref="jobRepository" />
+		<property name="allowStartIfComplete" value="true" />
+		<property name="saveExecutionAttributes" value="true" />
 	</bean>
 
 	<bean id="simpleStep" parent="abstractStep"
@@ -116,7 +118,18 @@
 		</property>
 		<property name="commitInterval" value="1" />
 	</bean>
-
+	
+	<bean id="chunkedStep" class="org.springframework.batch.execution.step.simple.ChunkedStep" abstract="true">
+		<property name="allowStartIfComplete" value="true" />
+		<property name="saveExecutionAttributes" value="true" />
+		<property name="jobRepository" ref="jobRepository" />
+		<property name="streamManager">
+			<bean class="org.springframework.batch.item.stream.SimpleStreamManager">
+				<constructor-arg ref="transactionManager" />
+			</bean>
+		</property>
+	</bean>
+	
 	<bean id="repeatOperationsStep" parent="abstractStep"
 		class="org.springframework.batch.execution.step.simple.RepeatOperationsStep"
 		abstract="true">
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java
similarity index 85%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java
index aa4a1d4af..2e2e0636e 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java
@@ -20,10 +20,10 @@ package org.springframework.batch.sample;
  * This job differs from FixedLengthImportJob only in internal job, therefore
  * the test is reused, only the job config location is overridden
  */
-public class SimpleTaskletJobFunctionalTests extends FixedLengthImportJobFunctionalTests {
+public class SimpleJobFunctionalTests extends FixedLengthImportJobFunctionalTests {
 	
 	protected String[] getConfigLocations() {
-		return new String[]{"jobs/simpleTaskletJob.xml"};
+		return new String[]{"jobs/simpleJob.xml"};
 	}
 
 }