From c1b2db5a59acfac5eddf9142c6f3972d30962946 Mon Sep 17 00:00:00 2001
From: lucasward <lucasward@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sun, 10 Feb 2008 04:28:23 +0000
Subject: [PATCH] Fixed broken unit tests and sample jobs from move away from
 Tasklet.

---
 .../jobs/beanWrapperMapperSampleJob.xml       | 242 +++++++++---------
 .../jobs/compositeProcessorSampleJob.xml      |   5 -
 .../src/main/resources/jobs/delegatingJob.xml |  96 +++----
 .../resources/jobs/fixedLengthImportJob.xml   | 145 ++++++-----
 .../src/main/resources/jobs/footballJob.xml   |  55 ++--
 .../src/main/resources/jobs/hibernateJob.xml  |  19 +-
 .../src/main/resources/jobs/ibatisJob.xml     | 110 ++++----
 .../src/main/resources/jobs/multilineJob.xml  |  31 +--
 .../main/resources/jobs/multilineOrderJob.xml |   5 -
 .../src/main/resources/jobs/restartSample.xml |   7 +-
 .../src/main/resources/jobs/rollbackJob.xml   |  40 ++-
 .../src/main/resources/jobs/tradeJob.xml      |  19 +-
 .../src/main/resources/jobs/xmlStaxJob.xml    |  40 ++-
 13 files changed, 390 insertions(+), 424 deletions(-)

diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index c7935480c..16392034c 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -1,89 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-	<bean parent="stepScope"/>
-	<bean parent="jobConfigurationRegistryBeanPostProcessor"/>
+	<bean parent="stepScope" />
+	<bean parent="jobConfigurationRegistryBeanPostProcessor" />
 
 	<bean id="beanWrapperMapperJob" parent="simpleJob">
 		<property name="steps">
 			<list>
 				<bean id="step1" parent="simpleStep">
-					<property name="tasklet">
-						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader">
-								<bean
-									class="org.springframework.batch.item.reader.ValidatingItemReader">
-									<property name="itemReader" ref="fileInputTemplate" />
-									<property name="validator" ref="fixedValidator" />
-								</bean>
-							</property>
-							<property name="itemWriter">
-								<bean class="org.springframework.batch.sample.item.writer.TradeWriter">
-									<property name="dao" ref="tradeDao" />
-								</bean>
-							</property>
-						</bean>
-					</property>
-				</bean>
-				<bean id="step2" parent="simpleStep">
-					<property name="tasklet">
-						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader" ref="fileInputTemplate2" />
-							<property name="itemWriter">
-								<bean class="org.springframework.batch.sample.item.writer.PersonWriter" />
-							</property>
-						</bean>
-					</property>
-				</bean>
-
-			</list>
-		</property>
-	</bean>
-
-	<!-- INFRASTRUCTURE SETUP -->
-
-	<bean id="fileInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
-		scope="step" >
-		<aop:scoped-proxy />
-		<property name="resource" ref="fileLocator" />
-		<property name="tokenizer" ref="fixedFileDescriptor" />
-		<property name="fieldSetMapper" ref="fieldSetMapper" />
-	</bean>
-
-	<bean id="fileInputTemplate2" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
-		scope="step">
-		<aop:scoped-proxy />
-		<property name="resource" ref="fileLocator2" />
-		<property name="tokenizer" ref="fixedFileDescriptor2" />
-		<property name="fieldSetMapper" ref="fieldSetMapper2" />
-<!--		<property name="validator" ref="fixedValidator" />-->
-	</bean>
-
-	<bean id="fixedFileDescriptor"
-		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
-		<property name="names" value="ISIN,Quantity,price, CUSTOMER" />
-		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
-	</bean>
-
-	<bean id="fixedFileDescriptor2"
-		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
-		<property name="names" value="Title, FirstName, LastName, Age, Address.AddrLine1, children[0].name, children[1].name" />
-		<property name="columns" value="1-5, 6-20, 21-40, 41-45, 46-55, 56-65, 66-75" />
-	</bean>
-
-	<bean id="fixedValidator" class="org.springframework.batch.item.validator.SpringValidator">
-		<property name="validator">
-			<bean id="tradeValidator" class="org.springmodules.validation.valang.ValangValidator">
-				<property name="valang">
-					<value>
+					<property name="itemReader">
+						<bean
+							class="org.springframework.batch.item.reader.ValidatingItemReader">
+							<property name="itemReader"
+								ref="fileInputTemplate" />
+							<property name="validator"
+								ref="fixedValidator" />
+						</bean>
+					</property>
+					<property name="itemWriter">
+						<bean
+							class="org.springframework.batch.sample.item.writer.TradeWriter">
+							<property name="dao" ref="tradeDao" />
+						</bean>
+					</property>
+				</bean>
+				<bean id="step2" parent="simpleStep">
+					<property name="itemReader"
+						ref="fileInputTemplate2" />
+					<property name="itemWriter">
+						<bean
+							class="org.springframework.batch.sample.item.writer.PersonWriter" />
+					</property>
+				</bean>
+
+			</list>
+		</property>
+	</bean>
+
+	<!-- INFRASTRUCTURE SETUP -->
+
+	<bean id="fileInputTemplate"
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
+		scope="step">
+		<aop:scoped-proxy />
+		<property name="resource" ref="fileLocator" />
+		<property name="tokenizer" ref="fixedFileDescriptor" />
+		<property name="fieldSetMapper" ref="fieldSetMapper" />
+	</bean>
+
+	<bean id="fileInputTemplate2"
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
+		scope="step">
+		<aop:scoped-proxy />
+		<property name="resource" ref="fileLocator2" />
+		<property name="tokenizer" ref="fixedFileDescriptor2" />
+		<property name="fieldSetMapper" ref="fieldSetMapper2" />
+		<!--		<property name="validator" ref="fixedValidator" />-->
+	</bean>
+
+	<bean id="fixedFileDescriptor"
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
+		<property name="names" value="ISIN,Quantity,price, CUSTOMER" />
+		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
+	</bean>
+
+	<bean id="fixedFileDescriptor2"
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
+		<property name="names"
+			value="Title, FirstName, LastName, Age, Address.AddrLine1, children[0].name, children[1].name" />
+		<property name="columns"
+			value="1-5, 6-20, 21-40, 41-45, 46-55, 56-65, 66-75" />
+	</bean>
+
+	<bean id="fixedValidator"
+		class="org.springframework.batch.item.validator.SpringValidator">
+		<property name="validator">
+			<bean id="tradeValidator"
+				class="org.springmodules.validation.valang.ValangValidator">
+				<property name="valang">
+					<value>
 						<![CDATA[
 						{ isin : length(?) < 13 : 'ISIN too long' : 'isin_length' : 12}
 					]]>
@@ -93,42 +96,51 @@
 		</property>
 	</bean>
 
-	<bean id="tradeDao" class="org.springframework.batch.sample.dao.JdbcTradeDao">
-		<property name="jdbcTemplate" ref="jdbcTemplate" />
-		<property name="incrementer">
-			<bean parent="incrementerParent">
-				<property name="incrementerName" value="TRADE_SEQ" />
-			</bean>
-		</property>
-	</bean>
-
-
-
-	<bean id="fileLocator" class="org.springframework.core.io.ClassPathResource">
-		<constructor-arg type="java.lang.String"
-			value="data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt" />
-	</bean>
-
-	<bean id="fileLocator2" class="org.springframework.core.io.ClassPathResource">
-		<constructor-arg type="java.lang.String"
-			value="data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt" />
-	</bean>
-
-	<bean id="fieldSetMapper" class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
-		<property name="prototypeBeanName" value="trade"/>
-	</bean>
-
-	<bean id="fieldSetMapper2" class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
-		<property name="prototypeBeanName" value="person"/>
-	</bean>
-
-	<bean id="trade" class="org.springframework.batch.sample.domain.Trade" scope="prototype"/>
-
-	<bean id="person" class="org.springframework.batch.sample.domain.Person" scope="prototype"/>
-
-	<bean parent="customEditorConfigurer"/>
-
-	<!-- register the step scope with the application context -->
-	<bean class="org.springframework.batch.execution.scope.StepScope" />
-
-</beans>
+	<bean id="tradeDao"
+		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		<property name="jdbcTemplate" ref="jdbcTemplate" />
+		<property name="incrementer">
+			<bean parent="incrementerParent">
+				<property name="incrementerName" value="TRADE_SEQ" />
+			</bean>
+		</property>
+	</bean>
+
+
+
+	<bean id="fileLocator"
+		class="org.springframework.core.io.ClassPathResource">
+		<constructor-arg type="java.lang.String"
+			value="data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt" />
+	</bean>
+
+	<bean id="fileLocator2"
+		class="org.springframework.core.io.ClassPathResource">
+		<constructor-arg type="java.lang.String"
+			value="data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt" />
+	</bean>
+
+	<bean id="fieldSetMapper"
+		class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
+		<property name="prototypeBeanName" value="trade" />
+	</bean>
+
+	<bean id="fieldSetMapper2"
+		class="org.springframework.batch.io.file.mapping.BeanWrapperFieldSetMapper">
+		<property name="prototypeBeanName" value="person" />
+	</bean>
+
+	<bean id="trade"
+		class="org.springframework.batch.sample.domain.Trade"
+		scope="prototype" />
+
+	<bean id="person"
+		class="org.springframework.batch.sample.domain.Person"
+		scope="prototype" />
+
+	<bean parent="customEditorConfigurer" />
+
+	<!-- register the step scope with the application context -->
+	<bean class="org.springframework.batch.execution.scope.StepScope" />
+
+</beans>
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
index e11d1d852..dbb51a78d 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
@@ -13,9 +13,6 @@
 	<bean id="compositeProcessorJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
-					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
 								class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -38,8 +35,6 @@
 								</property>
 							</bean>
 						</property>
-					</bean>
-				</property>
 			</bean>
 		</property>
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
index d69d77a1c..0d3e1f13b 100644
--- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
@@ -1,52 +1,58 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8" ?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-<description>
-	The intent is to to give an example of how existing bean
-	definitions (e.g. from custom application's domain layer)
-	can be integrated into a batch job.
-</description>
+	<description>
+		The intent is to to give an example of how existing bean
+		definitions (e.g. from custom application's domain layer) can be
+		integrated into a batch job.
+	</description>
 
-	<bean class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
-		<property name="jobConfigurationRegistry" ref="jobConfigurationRegistry"/>
-	</bean>
-
-	<bean id="jobConfiguration" parent="simpleJob">
-		<property name="steps">
-			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
-					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-						<property name="itemReader">
-							<bean class="org.springframework.batch.item.reader.ItemReaderAdapter">
-								<property name="targetObject" ref="delegatingObject" />
-								<property name="targetMethod" value="getData" />
-							</bean>
-						</property>
-						<property name="itemWriter">
-							<bean class="org.springframework.batch.item.writer.PropertyExtractingDelegatingItemWriter">
-								<property name="targetObject" ref="delegatingObject" />
-								<property name="targetMethod" value="processPerson" />
-								<property name="fieldsUsedAsTargetMethodArguments">
-									<list>
-										<value>firstName</value>
-										<value>address.city</value>
-									</list>
-								</property>
-							</bean>
-						</property>
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="delegatingObject" class="org.springframework.batch.sample.domain.PersonService" />
-	
+	<bean
+		class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
+		<property name="jobConfigurationRegistry"
+			ref="jobConfigurationRegistry" />
+	</bean>
+
+	<bean id="jobConfiguration" parent="simpleJob">
+		<property name="steps">
+			<bean id="step1" parent="simpleStep">
+				<property name="itemReader">
+					<bean
+						class="org.springframework.batch.item.reader.ItemReaderAdapter">
+						<property name="targetObject"
+							ref="delegatingObject" />
+						<property name="targetMethod" value="getData" />
+					</bean>
+				</property>
+				<property name="itemWriter">
+					<bean
+						class="org.springframework.batch.item.writer.PropertyExtractingDelegatingItemWriter">
+						<property name="targetObject"
+							ref="delegatingObject" />
+						<property name="targetMethod"
+							value="processPerson" />
+						<property
+							name="fieldsUsedAsTargetMethodArguments">
+							<list>
+								<value>firstName</value>
+								<value>address.city</value>
+							</list>
+						</property>
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<bean id="delegatingObject"
+		class="org.springframework.batch.sample.domain.PersonService" />
+
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index 0bfa49a92..7ca677f25 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -1,62 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-	<bean parent="stepScope"/>
-	<bean parent="jobConfigurationRegistryBeanPostProcessor"/>
+	<bean parent="stepScope" />
+	<bean parent="jobConfigurationRegistryBeanPostProcessor" />
 
 	<bean id="fixedLengthImportJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
-					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-						<property name="itemReader">
-							<bean
-								class="org.springframework.batch.item.reader.ValidatingItemReader">
-								<property name="itemReader" ref="fileInputTemplate" />
-								<property name="validator" ref="fixedValidator" />
-							</bean>
-						</property>
-						<property name="itemWriter">
-							<bean class="org.springframework.batch.sample.item.writer.TradeWriter">
-								<property name="dao" ref="tradeDao" />
-							</bean>
-						</property>
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-	<!-- INFRASTRUCTURE SETUP -->
-
-	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
-	<bean id="testInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
-		<property name="resource" ref="fileLocator" />
-		<property name="tokenizer" ref="fixedFileDescriptor" />
-		<property name="fieldSetMapper" ref="fieldSetMapper" />
-	</bean>
-
-	<bean id="fileInputTemplate" parent="testInputTemplate" autowire-candidate="false" scope="step">
-		<aop:scoped-proxy/>
-	</bean>
-
-	<bean id="fixedFileDescriptor" class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
-		<property name="names" value="ISIN, Quantity, Price, Customer" />
-		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
-	</bean>
-
-	<bean id="fixedValidator" class="org.springframework.batch.item.validator.SpringValidator">
-		<property name="validator">
-			<bean id="tradeValidator" class="org.springmodules.validation.valang.ValangValidator">
-				<property name="valang">
-					<value>
+				<property name="itemReader">
+					<bean
+						class="org.springframework.batch.item.reader.ValidatingItemReader">
+						<property name="itemReader"
+							ref="fileInputTemplate" />
+						<property name="validator" ref="fixedValidator" />
+					</bean>
+				</property>
+				<property name="itemWriter">
+					<bean
+						class="org.springframework.batch.sample.item.writer.TradeWriter">
+						<property name="dao" ref="tradeDao" />
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<!-- INFRASTRUCTURE SETUP -->
+
+	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
+	<bean id="testInputTemplate"
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
+		<property name="resource" ref="fileLocator" />
+		<property name="tokenizer" ref="fixedFileDescriptor" />
+		<property name="fieldSetMapper" ref="fieldSetMapper" />
+	</bean>
+
+	<bean id="fileInputTemplate" parent="testInputTemplate"
+		autowire-candidate="false" scope="step">
+		<aop:scoped-proxy />
+	</bean>
+
+	<bean id="fixedFileDescriptor"
+		class="org.springframework.batch.io.file.transform.FixedLengthTokenizer">
+		<property name="names" value="ISIN, Quantity, Price, Customer" />
+		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
+	</bean>
+
+	<bean id="fixedValidator"
+		class="org.springframework.batch.item.validator.SpringValidator">
+		<property name="validator">
+			<bean id="tradeValidator"
+				class="org.springmodules.validation.valang.ValangValidator">
+				<property name="valang">
+					<value>
 						<![CDATA[
 						{ isin : length(?) < 13 : 'ISIN too long' : 'isin_length' : 12}
 					]]>
@@ -66,23 +70,26 @@
 		</property>
 	</bean>
 
-	<bean id="tradeDao" class="org.springframework.batch.sample.dao.JdbcTradeDao">
-		<property name="jdbcTemplate" ref="jdbcTemplate" />
-		<property name="incrementer">
-			<bean parent="incrementerParent">
-				<property name="incrementerName" value="TRADE_SEQ" />
-			</bean>
-
-		</property>
-	</bean>
-
-	<bean id="fileLocator" class="org.springframework.core.io.ClassPathResource">
-		<constructor-arg type="java.lang.String"
-			value="data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
-	</bean>
-
-	<bean id="fieldSetMapper" class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
-
-	<bean parent="customEditorConfigurer"/>
-
+	<bean id="tradeDao"
+		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		<property name="jdbcTemplate" ref="jdbcTemplate" />
+		<property name="incrementer">
+			<bean parent="incrementerParent">
+				<property name="incrementerName" value="TRADE_SEQ" />
+			</bean>
+
+		</property>
+	</bean>
+
+	<bean id="fileLocator"
+		class="org.springframework.core.io.ClassPathResource">
+		<constructor-arg type="java.lang.String"
+			value="data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
+	</bean>
+
+	<bean id="fieldSetMapper"
+		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+
+	<bean parent="customEditorConfigurer" />
+
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index f1516d420..e0278506b 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -20,21 +20,16 @@
 					<property name="commitInterval" value="1"></property>
 					<property name="startLimit" value="100" />
 					<property name="allowStartIfComplete" value="false" />
-					<property name="tasklet">
+					<property name="itemReader"
+						ref="playerFileItemReader" />
+					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader"
-								ref="playerFileItemReader" />
-							<property name="itemWriter">
+							class="org.springframework.batch.sample.item.writer.PlayerItemWriter">
+							<property name="playerDao">
 								<bean
-									class="org.springframework.batch.sample.item.writer.PlayerItemWriter">
-									<property name="playerDao">
-										<bean
-											class="org.springframework.batch.sample.dao.JdbcPlayerDao">
-											<property name="dataSource"
-												ref="dataSource" />
-										</bean>
-									</property>
+									class="org.springframework.batch.sample.dao.JdbcPlayerDao">
+									<property name="dataSource"
+										ref="dataSource" />
 								</bean>
 							</property>
 						</bean>
@@ -43,36 +38,26 @@
 				<bean id="gameLoad" parent="simpleStep">
 					<property name="commitInterval" value="1" />
 					<property name="startLimit" value="100" />
-					<property name="tasklet">
+					<property name="itemReader"
+						ref="gameFileItemReader" />
+					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader"
-								ref="gameFileItemReader" />
-							<property name="itemWriter">
-								<bean
-									class="org.springframework.batch.sample.dao.JdbcGameDao">
-									<property name="dataSource"
-										ref="dataSource" />
-								</bean>
-							</property>
+							class="org.springframework.batch.sample.dao.JdbcGameDao">
+							<property name="dataSource"
+								ref="dataSource" />
 						</bean>
 					</property>
 				</bean>
 				<bean id="playerSummarization" parent="simpleStep">
 					<property name="commitInterval" value="1" />
 					<property name="startLimit" value="100" />
-					<property name="tasklet">
+					<property name="itemReader"
+						ref="playerSummarizationSource" />
+					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader"
-								ref="playerSummarizationSource" />
-							<property name="itemWriter">
-								<bean
-									class="org.springframework.batch.sample.dao.JdbcPlayerSummaryDao">
-									<property name="dataSource"
-										ref="dataSource" />
-								</bean>
-							</property>
+							class="org.springframework.batch.sample.dao.JdbcPlayerSummaryDao">
+							<property name="dataSource"
+								ref="dataSource" />
 						</bean>
 					</property>
 				</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index 602014e6c..9932fab09 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -18,17 +18,11 @@
 		<!-- set restartable=false so that this job can be used by more than one test -->
 		<property name="restartable" value="false" />
 		<property name="steps">
-			<bean id="step1" parent="repeatOperationsStep">
-				<property name="tasklet">
-					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-						<property name="itemReader"
-							ref="hibernateItemReader" />
-						<property name="itemWriter"
-							ref="hibernateOutputSource" />
-					</bean>
-				</property>
-				<property name="chunkOperations">
+			<bean id="step1" parent="repeatOperationsStep">
+				<property name="itemReader" ref="hibernateItemReader" />
+				<property name="itemWriter" ref="hibernateOutputSource" />
+
+				<property name="chunkOperations">
 					<bean
 						class="org.springframework.batch.repeat.support.RepeatTemplate">
 						<property name="interceptors"
@@ -55,6 +49,7 @@
 		</property>
 	</bean>
 
+
 	<!-- This is a framework class that needs a delegate and also needs to be registered as a RepeatInterceptor in the chunk -->
 	<bean id="hibernateOutputSource"
 		class="org.springframework.batch.io.support.HibernateAwareItemWriter">
@@ -64,7 +59,7 @@
 
 	<bean id="hibernateCreditWriter"
 		class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
-		<property name="customerCreditDao" ref="customerCreditDao"/>
+		<property name="customerCreditDao" ref="customerCreditDao" />
 	</bean>
 
 	<bean id="customerCreditDao"
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
index 0ce7096de..05798f3ef 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -1,68 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd" >
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
-<description>
-	Example for iBATIS integration.
-</description>
+	<description>Example for iBATIS integration.</description>
 
-	<bean parent="stepScope"/>
-	<bean parent="jobConfigurationRegistryBeanPostProcessor"/>
+	<bean parent="stepScope" />
+	<bean parent="jobConfigurationRegistryBeanPostProcessor" />
 
 	<bean id="ibatisJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
-					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-						<property name="itemReader" ref="ibatisItemReader" />
-						<property name="itemWriter">
-							<bean class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
-								<property name="customerCreditDao">
-									<bean class="org.springframework.batch.sample.dao.IbatisCustomerCreditWriter"
-										scope="step">
-										<aop:scoped-proxy />
-										<property name="sqlMapClient" ref="sqlMapClient" />
-										<property name="statementId" value="updateCredit" />
-									</bean>
-								</property>
-							</bean>
-						</property>
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="ibatisItemReader" class="org.springframework.batch.io.driving.IbatisDrivingQueryItemReader"
-		scope="step" >
-		<aop:scoped-proxy />
-		<property name="detailsQueryId" value="getCustomerCreditById" />
-		<property name="sqlMapClient" ref="sqlMapClient" />
-		<property name="keyGenerator" ref="ibatisKeyGenerator" />
-	</bean>
+				<property name="itemReader" ref="ibatisItemReader" />
+				<property name="itemWriter">
+					<bean
+						class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
+						<property name="customerCreditDao">
+							<bean
+								class="org.springframework.batch.sample.dao.IbatisCustomerCreditWriter"
+								scope="step">
+								<aop:scoped-proxy />
+								<property name="sqlMapClient"
+									ref="sqlMapClient" />
+								<property name="statementId"
+									value="updateCredit" />
+							</bean>
+						</property>
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
 
-	<bean id="ibatisKeyGenerator" class="org.springframework.batch.io.driving.support.IbatisKeyGenerator">
+	<bean id="ibatisItemReader"
+		class="org.springframework.batch.io.driving.IbatisDrivingQueryItemReader"
+		scope="step">
+		<aop:scoped-proxy />
+		<property name="detailsQueryId" value="getCustomerCreditById" />
+		<property name="sqlMapClient" ref="sqlMapClient" />
+		<property name="keyGenerator" ref="ibatisKeyGenerator" />
+	</bean>
+
+	<bean id="ibatisKeyGenerator"
+		class="org.springframework.batch.io.driving.support.IbatisKeyGenerator">
 		<property name="drivingQueryId" value="getAllCustomerCreditIds" />
 		<property name="sqlMapClient" ref="sqlMapClient" />
 	</bean>
-
-	<bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
-		<property name="configLocation" value="ibatis-config.xml" />
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-
-
-
-	<bean parent="customEditorConfigurer"/>
-
-	<!-- register the step scope with the application context -->
-	<bean class="org.springframework.batch.execution.scope.StepScope" />
-
+
+	<bean id="sqlMapClient"
+		class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
+		<property name="configLocation" value="ibatis-config.xml" />
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+
+
+
+
+	<bean parent="customEditorConfigurer" />
+
+	<!-- register the step scope with the application context -->
+	<bean class="org.springframework.batch.execution.scope.StepScope" />
+
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index 6a0f05810..92afdbb88 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -13,25 +13,20 @@
 	<bean id="multilineJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
+				<property name="itemReader">
 					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-						<property name="itemReader">
-							<bean
-								class="org.springframework.batch.item.reader.AggregateItemReader">
-								<property name="itemReader"
-									ref="fileItemReader" />
-							</bean>
-						</property>
-						<property name="itemWriter">
-							<bean
-								class="org.springframework.batch.io.file.FlatFileItemWriter"
-								scope="step">
-								<aop:scoped-proxy />
-								<property name="resource"
-									value="file:target/test-outputs/20070122.testStream.multilineStep.txt" />
-							</bean>
-						</property>
+						class="org.springframework.batch.item.reader.AggregateItemReader">
+						<property name="itemReader"
+							ref="fileItemReader" />
+					</bean>
+				</property>
+				<property name="itemWriter">
+					<bean
+						class="org.springframework.batch.io.file.FlatFileItemWriter"
+						scope="step">
+						<aop:scoped-proxy />
+						<property name="resource"
+							value="file:target/test-outputs/20070122.testStream.multilineStep.txt" />
 					</bean>
 				</property>
 			</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index 65548cf70..e9b5be3a5 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -16,9 +16,6 @@
 	<bean id="multilineOrderJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
-					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean class="org.springframework.batch.sample.item.reader.OrderItemReader">
 								<property name="itemReader" ref="fileInputTemplate" />
@@ -45,8 +42,6 @@
 								</property>
 							</bean>
 						</property>
-					</bean>
-				</property>
 			</bean>
 		</property>
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index e5818da97..14da5856b 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -20,7 +20,7 @@
 					<bean
 						class="org.springframework.batch.item.reader.ValidatingItemReader">
 						<property name="itemReader"
-							ref="fileItemReader" />
+							ref="itemReader" />
 						<property name="validator" ref="fixedValidator" />
 					</bean>
 				</property>
@@ -36,6 +36,11 @@
 	</bean>
 
 	<!-- INFRASTRUCTURE SETUP -->
+	
+	<bean id="itemReader" 
+		class="org.springframework.batch.sample.tasklet.ExceptionThrowingItemReaderProxy">
+		<constructor-arg ref="fileItemReader" />
+	</bean>
 
 	<bean id="fileItemReader"
 		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
index 077050208..b14ada77d 100644
--- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
@@ -40,38 +40,28 @@
 							</property>
 						</bean>
 					</property>
-					<property name="tasklet">
+					<property name="itemReader">
 						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader">
-								<bean
-									class="org.springframework.batch.item.reader.ValidatingItemReader">
-									<property name="itemReader"
-										ref="fileInputTemplate" />
-									<property name="validator"
-										ref="tradeValidator" />
-								</bean>
-							</property>
-							<property name="itemWriter">
-								<bean
-									class="org.springframework.batch.sample.item.writer.TradeWriter"
-									p:dao-ref="tradeDao" p:failure="3" />
-							</property>
+							class="org.springframework.batch.item.reader.ValidatingItemReader">
+							<property name="itemReader"
+								ref="fileInputTemplate" />
+							<property name="validator"
+								ref="tradeValidator" />
 						</bean>
 					</property>
+					<property name="itemWriter">
+						<bean
+							class="org.springframework.batch.sample.item.writer.TradeWriter"
+							p:dao-ref="tradeDao" p:failure="3" />
+					</property>
 					<property name="jobRepository" ref="jobRepository" />
 				</bean>
 				<bean id="step2" parent="simpleStep">
-					<property name="tasklet">
+					<property name="itemReader"
+						ref="tradeSqlItemReader" />
+					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-							<property name="itemReader"
-								ref="tradeSqlItemReader" />
-							<property name="itemWriter">
-								<bean
-									class="org.springframework.batch.sample.item.writer.DummyItemWriter" />
-							</property>
-						</bean>
+							class="org.springframework.batch.sample.item.writer.DummyItemWriter" />
 					</property>
 				</bean>
 			</list>
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 4497e2fb4..6062a1503 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -17,9 +17,6 @@
 		<property name="steps">
 			<list>
 				<bean id="step1" parent="simpleStep">
-					<property name="tasklet">
-						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
 									class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -33,35 +30,23 @@
 								<bean
 									class="org.springframework.batch.sample.item.writer.TradeWriter"
 									p:dao-ref="tradeDao" />
-							</property>
-						</bean>
-					</property>
+							</property>
 				</bean>
 				<bean id="step2" parent="simpleStep">
-					<property name="tasklet">
-						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader" ref="tradeSqlItemReader" />
 							<property name="itemWriter">
 								<bean
 									class="org.springframework.batch.sample.item.writer.CustomerUpdateWriter"
 									p:dao-ref="customerDao" />
-							</property>
-						</bean>
-					</property>
+							</property>
 				</bean>
 				<bean id="step3" parent="simpleStep">
-					<property name="tasklet">
-						<bean
-							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader" ref="customerSqlItemReader" />
 							<property name="itemWriter">
 								<bean
 									class="org.springframework.batch.sample.item.writer.CustomerCreditUpdateWriter"
 									p:writer-ref="customerReportOutputSource" />
 							</property>
-						</bean>
-					</property>
 				</bean>
 			</list>
 		</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
index 06f1371fd..e6eff1469 100644
--- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
@@ -17,42 +17,36 @@
 	<bean id="xmlStaxJob" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep">
-				<property name="tasklet">
+				<property name="itemReader">
 					<bean
-						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
-						<property name="itemReader">
+						class="org.springframework.batch.io.xml.StaxEventItemReader"
+						scope="step">
+						<aop:scoped-proxy />
+						<property name="fragmentRootElementName"
+							value="trade" />
+						<property name="resource"
+							value="data/staxJob/input/20070918.testStream.xmlFileStep.xml" />
+						<property name="fragmentDeserializer">
 							<bean
-								class="org.springframework.batch.io.xml.StaxEventItemReader"
-								scope="step">
-								<aop:scoped-proxy />
-								<property name="fragmentRootElementName"
-									value="trade" />
-								<property name="resource"
-									value="data/staxJob/input/20070918.testStream.xmlFileStep.xml" />
-								<property name="fragmentDeserializer">
+								class="org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer">
+								<constructor-arg>
 									<bean
-										class="org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer">
-										<constructor-arg>
-											<bean
-												class="org.springframework.oxm.xstream.XStreamMarshaller">
-												<property name="aliases"
-													ref="aliases" />
-											</bean>
-										</constructor-arg>
+										class="org.springframework.oxm.xstream.XStreamMarshaller">
+										<property name="aliases"
+											ref="aliases" />
 									</bean>
-								</property>
+								</constructor-arg>
 							</bean>
 						</property>
-						<property name="itemWriter"
-							ref="tradeStaxWriter" />
 					</bean>
 				</property>
+				<property name="itemWriter" ref="tradeStaxWriter" />
 			</bean>
 		</property>
 	</bean>
 
 	<bean class="org.springframework.batch.io.xml.StaxEventItemWriter"
-		id="tradeStaxWriter" scope="step">
+		id="tradeStaxWriter" scope="step">
 		<aop:scoped-proxy />
 		<property name="resource"
 			value="file:target/test-outputs/20070918.testStream.xmlFileStep.output.xml" />