From 5e09d034e0ad2742cdab1398d3e60c59050b37ba Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 26 Feb 2008 12:26:39 +0000
Subject: [PATCH] Incomplete - task 84: Fix samples

Switch default skip policy to Never
---
 .../springframework/batch/execution/step/AbstractStep.java  | 4 ++--
 .../batch/execution/launch/SimpleJobTests.java              | 1 -
 .../batch/execution/step/ItemOrientedStepTests.java         | 2 --
 .../src/main/resources/jobs/hibernateJob.xml                | 6 +++++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
index a2e0b561c..08c349a81 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
@@ -22,8 +22,8 @@ import org.springframework.batch.core.domain.Step;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.domain.StepSupport;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.execution.step.support.AlwaysSkipItemSkipPolicy;
 import org.springframework.batch.execution.step.support.DefaultItemFailureHandler;
+import org.springframework.batch.execution.step.support.NeverSkipItemSkipPolicy;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
@@ -58,7 +58,7 @@ public abstract class AbstractStep extends StepSupport implements InitializingBe
 
 	protected ItemWriter itemWriter;
 	
-	protected ItemSkipPolicy itemSkipPolicy = new AlwaysSkipItemSkipPolicy();
+	protected ItemSkipPolicy itemSkipPolicy = new NeverSkipItemSkipPolicy();
 	
 	protected ItemFailureHandler itemFailureHandler = new DefaultItemFailureHandler();
 
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
index 5fa09cd12..af5dcdadc 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
@@ -176,7 +176,6 @@ public class SimpleJobTests extends TestCase {
 				throw new RuntimeException("Foo");
 			}
 		});
-		step.setItemSkipPolicy(new NeverSkipItemSkipPolicy());
 		step.afterPropertiesSet();
 		job.setSteps(Collections.singletonList(step));
 
diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
index 7724fc12c..b3aff87ee 100644
--- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
+++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
@@ -38,7 +38,6 @@ import org.springframework.batch.execution.repository.dao.MapStepDao;
 import org.springframework.batch.execution.scope.StepScope;
 import org.springframework.batch.execution.scope.StepSynchronizationManager;
 import org.springframework.batch.execution.step.support.JobRepositorySupport;
-import org.springframework.batch.execution.step.support.NeverSkipItemSkipPolicy;
 import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ExecutionContext;
@@ -540,7 +539,6 @@ public class ItemOrientedStepTests extends TestCase {
 				throw new ResetFailedException("Bar");
 			}
 		});
-		itemOrientedStep.setItemSkipPolicy(new NeverSkipItemSkipPolicy());
 
 		Step step = new StepSupport("stepName");
 		JobExecution jobExecutionContext = jobInstance.createJobExecution();
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index af5e6a012..a57e1c60f 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -21,7 +21,11 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="itemReader" ref="hibernateItemReader" />
 				<property name="itemWriter" ref="hibernateOutputSource" />
-				<property name="commitInterval" value="3" />
+				<property name="commitInterval" value="3" />
+				
+				<property name="itemSkipPolicy">
+					<bean class="org.springframework.batch.execution.step.support.AlwaysSkipItemSkipPolicy"/>
+				</property>
 
 				<property name="chunkOperations">
 					<bean