IN PROGRESS - issue BATCH-267: Re-organise I/O (io) packages

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

Initial draft - separating flat file and xml processing

spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java

@@ -21,7 +21,7 @@ import java.io.FileReader;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.io.file.support.DefaultFlatFileItemReader;
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.sample.domain.Trade;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcOperations;

spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample;
 
-import org.springframework.batch.io.file.support.transform.LineAggregator;
+import org.springframework.batch.io.file.transform.LineAggregator;
 
 
 /**

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java

@@ -2,7 +2,7 @@ package org.springframework.batch.sample.dao;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.ResourceLifecycle;
 import org.springframework.batch.sample.domain.CustomerCredit;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java

@@ -9,8 +9,8 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.ItemWriter;
-import org.springframework.batch.io.file.support.transform.LineAggregator;
+import org.springframework.batch.io.file.transform.LineAggregator;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.LineAggregatorStub;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.transform.DelimitedLineAggregator;
+import org.springframework.batch.io.file.transform.DelimitedLineAggregator;
 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/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java

@@ -5,7 +5,7 @@ import java.math.BigDecimal;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.ItemWriter;
+import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.sample.domain.CustomerCredit;
 
 /**

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java

@@ -2,7 +2,7 @@ package org.springframework.batch.sample.item.processor;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.FlatFileItemWriter;
+import org.springframework.batch.io.file.FlatFileItemWriter;
 import org.springframework.batch.sample.item.processor.DefaultFlatFileProcessor;
 
 public class DefaultFlatFileProcessorTests extends TestCase {

spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.io.file.support.DefaultFlatFileItemReader;
+import org.springframework.batch.io.file.DefaultFlatFileItemReader;
 import org.springframework.batch.sample.dao.TradeWriter;
 import org.springframework.batch.sample.domain.Trade;