diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
index f468ced21..ed1b46ff7 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
@@ -12,7 +12,7 @@
 
 	<bean id="compositeProcessorJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 						<property name="itemReader">
 							<bean
 								class="org.springframework.batch.item.reader.ValidatingItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
index 0d3e1f13b..e41e54d52 100644
--- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
@@ -23,7 +23,7 @@
 
 	<bean id="jobConfiguration" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.reader.ItemReaderAdapter">
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index b8ffeea32..a48cbb777 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -14,7 +14,7 @@
 
 	<bean id="fixedLengthImportJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.reader.ValidatingItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 51f3d260c..d99adfa31 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -16,8 +16,8 @@
 		<property name="startLimit" value="100" />
 		<property name="steps">
 			<list>
-				<bean id="playerload" parent="simpleStep">
-					<property name="commitInterval" value="1"></property>
+				<bean id="playerload" parent="chunkedStep">
+					<property name="chunkSize" value="1"></property>
 					<property name="startLimit" value="100" />
 					<property name="allowStartIfComplete" value="false" />
 					<property name="itemReader"
@@ -35,8 +35,8 @@
 						</bean>
 					</property>
 				</bean>
-				<bean id="gameLoad" parent="simpleStep">
-					<property name="commitInterval" value="1" />
+				<bean id="gameLoad" parent="chunkedStep">
+					<property name="chunkSize" value="1" />
 					<property name="startLimit" value="100" />
 					<property name="itemReader"
 						ref="gameFileItemReader" />
@@ -48,8 +48,8 @@
 						</bean>
 					</property>
 				</bean>
-				<bean id="playerSummarization" parent="simpleStep">
-					<property name="commitInterval" value="1" />
+				<bean id="playerSummarization" parent="chunkedStep">
+					<property name="chunkSize" value="1" />
 					<property name="startLimit" value="100" />
 					<property name="itemReader"
 						ref="playerSummarizationSource" />
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
index 05798f3ef..a5ac282ee 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -16,7 +16,7 @@
 
 	<bean id="ibatisJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 				<property name="itemReader" ref="ibatisItemReader" />
 				<property name="itemWriter">
 					<bean
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index 1c3c1f6ed..c9b0441a0 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -12,7 +12,7 @@
 
 	<bean id="multilineJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.reader.AggregateItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index e9b5be3a5..28ba409ac 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -15,7 +15,7 @@
 
 	<bean id="multilineOrderJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 						<property name="itemReader">
 							<bean class="org.springframework.batch.sample.item.reader.OrderItemReader">
 								<property name="itemReader" ref="fileInputTemplate" />
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index b86f5b166..afbcaf315 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -15,7 +15,7 @@
 
 	<bean id="restartSampleJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -30,7 +30,7 @@
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
-				<property name="commitInterval" value="2" />
+				<property name="chunkSize" value="2" />
 			</bean>
 		</property>
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
index b14ada77d..f80d3eed6 100644
--- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
@@ -17,44 +17,46 @@
 	<bean id="tradeJob" parent="simpleJob">
 		<property name="steps">
 			<list>
-				<bean id="step1" parent="repeatOperationsStep">
-					<property name="chunkOperations">
+				<bean id="step1" parent="chunkedStep">
+					<property name="retryPolicy">
+						<bean class="org.springframework.batch.retry.policy.SimpleRetryPolicy" />
+					</property>
+					<property name="chunker">
 						<bean
-							class="org.springframework.batch.repeat.support.RepeatTemplate">
-							<property name="completionPolicy">
+							class="org.springframework.batch.execution.step.simple.ItemChunker">
+							<constructor-arg>
 								<bean
-									class="org.springframework.batch.repeat.policy.SimpleCompletionPolicy">
-									<property name="chunkSize"
-										value="50" />
+									class="org.springframework.batch.item.reader.ValidatingItemReader">
+									<property name="itemReader"
+										ref="fileInputTemplate" />
+									<property name="validator"
+										ref="tradeValidator" />
+								</bean>
+							</constructor-arg>
+							<property name="itemSkipPolicy">
+								<bean
+									class="org.springframework.batch.execution.step.simple.LimitCheckingItemSkipPolicy">
+									<constructor-arg value="5" />
 								</bean>
 							</property>
 						</bean>
 					</property>
-					<property name="stepOperations">
+					<property name="dechunker">
 						<bean
-							class="org.springframework.batch.repeat.support.RepeatTemplate">
-							<property name="exceptionHandler">
+							class="org.springframework.batch.execution.step.simple.ItemDechunker">
+							<constructor-arg>
 								<bean
-									class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler"
-									p:limit="5" p:type="java.lang.Exception" />
+									class="org.springframework.batch.sample.item.writer.TradeWriter"
+									p:dao-ref="tradeDao" p:failure="3" />
+							</constructor-arg>
+							<property name="itemSkipPolicy">
+								<bean
+									class="org.springframework.batch.execution.step.simple.LimitCheckingItemSkipPolicy">
+									<constructor-arg value="5" />
+								</bean>
 							</property>
 						</bean>
 					</property>
-					<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>
-					<property name="jobRepository" ref="jobRepository" />
 				</bean>
 				<bean id="step2" parent="simpleStep">
 					<property name="itemReader"
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 6062a1503..4c0ca35ef 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -16,7 +16,7 @@
 	<bean id="tradeJob" parent="simpleJob">
 		<property name="steps">
 			<list>
-				<bean id="step1" parent="simpleStep">
+				<bean id="step1" parent="chunkedStep">
 							<property name="itemReader">
 								<bean
 									class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -32,7 +32,7 @@
 									p:dao-ref="tradeDao" />
 							</property>
 				</bean>
-				<bean id="step2" parent="simpleStep">
+				<bean id="step2" parent="chunkedStep">
 							<property name="itemReader" ref="tradeSqlItemReader" />
 							<property name="itemWriter">
 								<bean
@@ -40,7 +40,7 @@
 									p:dao-ref="customerDao" />
 							</property>
 				</bean>
-				<bean id="step3" parent="simpleStep">
+				<bean id="step3" parent="chunkedStep">
 							<property name="itemReader" ref="customerSqlItemReader" />
 							<property name="itemWriter">
 								<bean
@@ -69,7 +69,7 @@
 	<bean id="customerSqlItemReader" class="org.springframework.batch.io.cursor.JdbcCursorItemReader"
 		scope="step">
 		<aop:scoped-proxy />
-		<property name="dataSource" ref="dataSource" />
+		<property name="dataSource" ref="dataSource" />
 		<property name="sql"
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
index e6eff1469..42ad39d04 100644
--- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
@@ -16,7 +16,7 @@
 
 	<bean id="xmlStaxJob" parent="simpleJob">
 		<property name="steps">
-			<bean id="step1" parent="simpleStep">
+			<bean id="step1" parent="chunkedStep">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.io.xml.StaxEventItemReader"
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 e1d987927..38841249c 100644
--- a/spring-batch-samples/src/main/resources/simple-container-definition.xml
+++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml
@@ -128,6 +128,7 @@
 				<constructor-arg ref="transactionManager" />
 			</bean>
 		</property>
+		<property name="chunkSize" value="1" />
 	</bean>
 	
 	<bean id="repeatOperationsStep" parent="abstractStep"
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java
index 1ea77fb72..3f1bc5401 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java
@@ -29,7 +29,7 @@ public class RollbackJobFunctionalTests extends AbstractValidatingBatchLauncherT
 
 	protected void validatePostConditions() throws Exception {
 		int after = jdbcTemplate.queryForInt("SELECT COUNT(*) from TRADE");
-		assertEquals(before+4, after);
+		assertEquals(before+5, after);
 	}