Review process. Consolidated some related support packages in infrastructure.

spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.dao;
 
+import org.springframework.batch.item.support.DelegatingItemWriter;
 import org.springframework.batch.item.transform.ItemTransformer;
-import org.springframework.batch.item.writer.DelegatingItemWriter;
 import org.springframework.batch.sample.item.writer.OrderWriter;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.item.reader.DelegatingItemReader;
+import org.springframework.batch.item.support.DelegatingItemReader;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;
 import org.springframework.batch.sample.domain.Customer;

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/OrderWriter.java

@@ -17,7 +17,7 @@
 package org.springframework.batch.sample.item.writer;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
-import org.springframework.batch.item.writer.DelegatingItemWriter;
+import org.springframework.batch.item.support.DelegatingItemWriter;
 import org.springframework.batch.sample.domain.Order;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.mapping;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.item.reader.AggregateItemReader;
+import org.springframework.batch.item.support.AggregateItemReader;
 import org.springframework.batch.sample.domain.Trade;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxy.java

@@ -19,7 +19,7 @@ package org.springframework.batch.sample.tasklet;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.reader.DelegatingItemReader;
+import org.springframework.batch.item.support.DelegatingItemReader;
 
 /**
  * Hacked {@link ItemReader} that throws exception on a given record number