Review process. Split step package into item and tasklet.

spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java

@@ -17,6 +17,8 @@ package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.beans.factory.BeanNameAware;

spring-batch-core/src/main/java/org/springframework/batch/core/step/TaskletStep.java

@@ -27,7 +27,7 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AlwaysSkipItemSkipPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BackportConcurrentStepExecutionSynchronizer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepExecution;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.List;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ExitStatusExceptionClassifier.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.support.ExceptionClassifier;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.item.ClearFailedException;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.Date;
 
@@ -27,7 +27,8 @@ import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.AbstractStep;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 import org.springframework.batch.core.StepContribution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/JdkConcurrentStepExecutionSynchronizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.concurrent.Semaphore;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/LimitCheckingItemSkipPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.io.FileNotFoundException;
 import java.util.Collections;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NeverSkipItemSkipPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.AbstractStepFactoryBean;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifier.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleItemHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.item.ClearFailedException;
@@ -72,7 +72,7 @@ public class SimpleItemHandler implements ItemHandler {
 	 * Get the next item from {@link #read(StepContribution)} and if not null
 	 * pass the item to {@link #write(Object, StepContribution)}.
 	 * 
-	 * @see org.springframework.batch.core.step.ItemHandler#handle(org.springframework.batch.core.StepContribution)
+	 * @see org.springframework.batch.core.step.item.ItemHandler#handle(org.springframework.batch.core.StepContribution)
 	 */
 	public ExitStatus handle(StepContribution contribution) throws Exception {
 		Object item = read(contribution);

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.ExceptionHandler;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.listener.MulticasterBatchListener;
+import org.springframework.batch.core.step.AbstractStepFactoryBean;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitExceededException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.Arrays;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepContribution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSynchronizer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepExecution;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSyncronizerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.core.JdkVersion;
 import org.springframework.util.ClassUtils;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepInterruptionPolicy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.Step;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/package.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Specific implementations of step concerns for item-oriented approach.
+</p>
+</body>
+</html>

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
 import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator;
 import org.springframework.batch.repeat.ExitStatus;
@@ -38,7 +38,7 @@ public class TaskletAdapter extends AbstractMethodInvokingDelegator implements T
 	 * delegate method should not be void, otherwise there is no way to
 	 * determine when the result indicates a finished job.
 	 * 
-	 * @see org.springframework.batch.core.tasklet.Tasklet#execute()
+	 * @see org.springframework.batch.core.step.tasklet.Tasklet#execute()
 	 */
 	public ExitStatus execute() throws Exception {
 		return mapResult(invokeDelegateMethod());

spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java

@@ -42,7 +42,7 @@ import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
-import org.springframework.batch.core.step.NeverSkipItemSkipPolicy;
+import org.springframework.batch.core.step.item.NeverSkipItemSkipPolicy;
 import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/dao/AbstractStepDaoTests.java

@@ -29,8 +29,8 @@ import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.repository.support.dao.JobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.JobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.StepExecutionDao;
-import org.springframework.batch.core.step.ExitStatusExceptionClassifier;
 import org.springframework.batch.core.step.StepSupport;
+import org.springframework.batch.core.step.item.ExitStatusExceptionClassifier;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.dao.OptimisticLockingFailureException;

spring-batch-core/src/test/java/org/springframework/batch/core/step/TaskletStepTests.java

@@ -16,7 +16,7 @@ import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.listener.StepListenerSupport;
 import org.springframework.batch.core.step.TaskletStep;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 
 public class TaskletStepTests extends TestCase {

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +38,10 @@ import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
 import org.springframework.batch.core.step.AbstractStep;
-import org.springframework.batch.core.step.ItemOrientedStep;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
+import org.springframework.batch.core.step.item.StepInterruptionPolicy;
 import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.MarkFailedException;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,8 @@ import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
 import org.springframework.batch.core.launch.EmptyItemWriter;
-import org.springframework.batch.core.step.RepeatOperationsStepFactoryBean;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.item.RepeatOperationsStepFactoryBean;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifierTests.java

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.launch.support.ExitCodeMapper;
 import org.springframework.batch.core.repository.NoSuchJobException;
+import org.springframework.batch.core.step.item.ExitStatusExceptionClassifier;
+import org.springframework.batch.core.step.item.SimpleExitStatusExceptionClassifier;
 import org.springframework.batch.repeat.ExitStatus;
 
 import junit.framework.TestCase;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.step.item.SimpleRetryExceptionHandler;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler;
@@ -51,7 +52,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.core.step.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
+	 * {@link org.springframework.batch.core.step.item.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
 	 */
 	public void testRethrowWhenRetryExhausted() {
 
@@ -76,7 +77,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.core.step.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
+	 * {@link org.springframework.batch.core.step.item.SimpleRetryExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable)}.
 	 */
 	public void testNoRethrowWhenRetryNotExhausted() {
 

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,6 +34,7 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
+import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitReadFailurePolicyTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -21,6 +21,8 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.step.item.LimitCheckingItemSkipPolicy;
+import org.springframework.batch.core.step.item.SkipLimitExceededException;
 import org.springframework.batch.item.file.FlatFileParseException;
 
 /**

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,6 +11,9 @@ import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.JobSupport;
+import org.springframework.batch.core.step.JobRepositorySupport;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SkipLimitStepFactoryBean;
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemReader;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,8 +32,8 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
-import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.StatefulRetryStepFactoryBean;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.StatefulRetryStepFactoryBean;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import junit.framework.TestCase;
 
@@ -29,8 +29,9 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.repository.support.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.support.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.support.dao.MapStepExecutionDao;
-import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.SimpleItemHandler;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
+import org.springframework.batch.core.step.item.StepExecutionSynchronizer;
 import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicyTests.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.core.JobInterruptedException;
+import org.springframework.batch.core.step.item.ThreadStepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 

spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletAdapterTests.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
-import org.springframework.batch.core.tasklet.TaskletAdapter;
+import org.springframework.batch.core.step.tasklet.TaskletAdapter;
 import org.springframework.batch.repeat.ExitStatus;
 
 import junit.framework.TestCase;
@@ -46,7 +46,7 @@ public class TaskletAdapterTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#execute()}.
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#execute()}.
 	 * @throws Exception 
 	 */
 	public void testExecuteWithExitStatus() throws Exception {
@@ -54,7 +54,7 @@ public class TaskletAdapterTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
 	 */
 	public void testMapResultWithNull() throws Exception {
 		tasklet.setTargetMethod("process");
@@ -62,7 +62,7 @@ public class TaskletAdapterTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
+	 * Test method for {@link org.springframework.batch.core.step.tasklet.TaskletAdapter#mapResult(java.lang.Object)}.
 	 */
 	public void testMapResultWithNonNull() throws Exception {
 		tasklet.setTargetMethod("process");

spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml

@@ -20,7 +20,7 @@
 	<bean id="test-job"
 		class="org.springframework.batch.core.job.JobSupport">
 		<property name="steps">
-			<bean id="step1" class="org.springframework.batch.core.step.SimpleStepFactoryBean">
+			<bean id="step1" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean">
 				<property name="itemReader" ref="itemReader" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="jobRepository" ref="jobRepository" />

spring-batch-core/src/test/resources/org/springframework/batch/core/launch/support/job.xml

@@ -15,7 +15,7 @@
 		class="org.springframework.batch.core.job.SimpleJob">
 		<property name="steps">
 			<bean id="step1"
-				class="org.springframework.batch.core.step.SimpleStepFactoryBean">
+				class="org.springframework.batch.core.step.item.SimpleStepFactoryBean">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.support.ListItemReader">

spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.step.support;
 
 import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.step.StepInterruptionPolicy;
+import org.springframework.batch.core.step.item.StepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 
 public class NoopStepInterruptionPolicy implements StepInterruptionPolicy {

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

@@ -20,7 +20,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.listener.StepListenerSupport;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 
 /**

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.tasklet;
 
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;

spring-batch-samples/src/main/resources/jobs/retrySample.xml

@@ -10,7 +10,7 @@
 	<bean id="retrySample" parent="simpleJob">
 		<property name="steps">
 			<bean id="step1" parent="simpleStep"
-				class="org.springframework.batch.core.step.StatefulRetryStepFactoryBean">
+				class="org.springframework.batch.core.step.item.StatefulRetryStepFactoryBean">
 				<property name="itemReader" ref="itemGenerator" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="retryLimit" value="3" />

spring-batch-samples/src/main/resources/simple-job-launcher-context.xml

@@ -58,7 +58,7 @@
 		<property name="allowStartIfComplete" value="true" />
 	</bean>
 
-	<bean id="simpleStep" class="org.springframework.batch.core.step.SimpleStepFactoryBean"
+	<bean id="simpleStep" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean"
 		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />
@@ -66,7 +66,7 @@
 		<property name="commitInterval" value="1" />
 	</bean>
 	
-	<bean id="skipLimitStep" class="org.springframework.batch.core.step.SkipLimitStepFactoryBean"
+	<bean id="skipLimitStep" class="org.springframework.batch.core.step.item.SkipLimitStepFactoryBean"
 		parent="simpleStep" abstract="true">
 		<property name="skipLimit" value="0" />
 	</bean>