RESOLVED - issue BATCH-268: retry configuration for ItemOrientedTasklet

http://jira.springframework.org/browse/BATCH-268

The retry only works if you have an ItemStream as an ItemReader (so that you get a proper rollback).  Applied the patch and fixed it up to fit the new m5 way of looking at things.

spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/ReadFailureException.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.io.exception;
 
+import org.springframework.batch.item.ItemReader;
+
 /**
  * This exception indicates an error encountered while reading.  It should generally
  * be thrown by classes that implement the {@link ItemReader} interface.

spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/WriteFailureException.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.io.exception;
 
+import org.springframework.batch.item.ItemWriter;
+
 /**
  * Exception thrown after encountering an error during a write.  It should
  * generally be thrown by classes that implement the {@link ItemWriter} 

spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java

@@ -23,8 +23,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.io.Skippable;
 import org.springframework.batch.io.file.separator.LineReader;
-import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ExecutionAttributes;
+import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.exception.StreamException;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReaderRecoverer.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.item.reader;
+
+import org.springframework.batch.item.ItemRecoverer;
+import org.springframework.batch.item.KeyedItemReader;
+
+
+/**
+ * @author Dave Syer
+ *
+ */
+public abstract class AbstractItemReaderRecoverer extends AbstractItemReader implements KeyedItemReader, ItemRecoverer {
+	public Object getKey(Object item) {
+		return item;
+	}
+}

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java

@@ -17,9 +17,9 @@
 package org.springframework.batch.item.reader;
 
 import org.springframework.batch.io.Skippable;
+import org.springframework.batch.item.ExecutionAttributes;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.ExecutionAttributes;
 import org.springframework.batch.item.exception.StreamException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/ItemStreamAdapter.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.item.stream;
 
-import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ExecutionAttributes;
+import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.exception.StreamException;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java

@@ -16,10 +16,10 @@
 
 package org.springframework.batch.repeat.callback;
 
+import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatOperations;
-import org.springframework.batch.repeat.ExitStatus;
 
 /**
  * Callback that delegates to another callback, via a {@link RepeatOperations} instance.

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java

@@ -16,9 +16,9 @@
 
 package org.springframework.batch.repeat.policy;
 
+import org.springframework.batch.repeat.CompletionPolicy;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.CompletionPolicy;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java

@@ -19,9 +19,9 @@ package org.springframework.batch.repeat.policy;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.batch.repeat.CompletionPolicy;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.CompletionPolicy;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java

@@ -16,9 +16,9 @@
 
 package org.springframework.batch.repeat.policy;
 
-import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.CompletionPolicy;
 import org.springframework.batch.repeat.ExitStatus;
+import org.springframework.batch.repeat.RepeatContext;
 
 /**
  * Very simple {@link CompletionPolicy} that bases its decision on the result of