Review process. Consolidated some related support packages in infrastructure.

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.jms;
 
 import java.util.Date;
 
@@ -25,6 +25,7 @@ import javax.jms.Queue;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.batch.item.jms.JmsItemReader;
 import org.springframework.jms.core.JmsOperations;
 
 public class JmsItemReaderTests extends TestCase {

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.support;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -7,6 +7,7 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.support.AggregateItemReader;
 
 public class AggregateItemReaderTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.item.writer;
+package org.springframework.batch.item.support;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -8,6 +8,7 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.support.CompositeItemWriter;
 
 /**
  * Tests for {@link CompositeItemWriter}

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemReaderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.support;
 
 import junit.framework.TestCase;
 
@@ -23,6 +23,7 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.Skippable;
+import org.springframework.batch.item.support.DelegatingItemReader;
 
 /**
  * Unit test for {@link DelegatingItemReader}

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.writer;
+package org.springframework.batch.item.support;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.support.DelegatingItemWriter;
 
 /**
  * @author Lucas Ward

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.support;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.batch.item.support.ListItemReader;
+
 import junit.framework.TestCase;
 
 public class ListItemReaderTests extends TestCase {

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SimpleStreamManagerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.stream;
+package org.springframework.batch.item.support;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +24,7 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.batch.item.ItemStreamSupport;
+import org.springframework.batch.item.support.CompositeItemStream;
 
 /**
  * @author Dave Syer
@@ -37,7 +38,7 @@ public class SimpleStreamManagerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
+	 * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
 	 */
 	public void testRegisterAndOpen() {
 		ItemStreamSupport stream = new ItemStreamSupport() {
@@ -52,7 +53,7 @@ public class SimpleStreamManagerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
+	 * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
 	 */
 	public void testRegisterTwice() {
 		ItemStreamSupport stream = new ItemStreamSupport() {
@@ -68,7 +69,7 @@ public class SimpleStreamManagerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
+	 * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
 	 */
 	public void testMark() {
 		manager.register(new ItemStreamSupport() {
@@ -82,7 +83,7 @@ public class SimpleStreamManagerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
+	 * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
 	 */
 	public void testClose() {
 		manager.register(new ItemStreamSupport() {
@@ -96,7 +97,7 @@ public class SimpleStreamManagerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
+	 * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}.
 	 */
 	public void testCloseDoesNotUnregister() {
 		manager.setStreams(new ItemStream[] { new ItemStreamSupport() {

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.reader;
+package org.springframework.batch.item.support;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,6 +22,7 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.batch.support.transaction.TransactionAwareProxyFactory;
 import org.springframework.transaction.PlatformTransactionManager;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.item.support;
+package org.springframework.batch.item.util;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -7,6 +7,7 @@ import java.io.IOException;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.item.util.FileUtils;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.util.Assert;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java

@@ -23,7 +23,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.springframework.batch.item.AbstractItemWriter;
-import org.springframework.batch.item.reader.ListItemReader;
+import org.springframework.batch.item.support.ListItemReader;
 
 public class ItemReaderRepeatCallbackTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.springframework.batch.item.ItemKeyGenerator;
 import org.springframework.batch.item.ItemRecoverer;
-import org.springframework.batch.item.reader.ListItemReader;
+import org.springframework.batch.item.support.ListItemReader;
 
 public class ListItemReaderRecoverer extends ListItemReader implements ItemRecoverer, ItemKeyGenerator {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java

@@ -27,7 +27,7 @@ import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.FailedItemIdentifier;
 import org.springframework.batch.item.ItemKeyGenerator;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.reader.ListItemReader;
+import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;