Renamed Step.simple package to step.support.

spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunner.java

@@ -27,7 +27,7 @@ import org.springframework.batch.core.repository.JobLocator;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
 import org.springframework.batch.core.runtime.JobParametersFactory;
 import org.springframework.batch.execution.launch.JobLauncher;
-import org.springframework.batch.execution.step.simple.SimpleExitStatusExceptionClassifier;
+import org.springframework.batch.execution.step.support.SimpleExitStatusExceptionClassifier;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;

spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/SimpleJob.java

@@ -30,7 +30,7 @@ import org.springframework.batch.core.domain.Step;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
-import org.springframework.batch.execution.step.simple.SimpleExitStatusExceptionClassifier;
+import org.springframework.batch.execution.step.support.SimpleExitStatusExceptionClassifier;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.repeat.ExitStatus;
 

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java

@@ -22,8 +22,8 @@ import org.springframework.batch.core.domain.Step;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.domain.StepSupport;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.execution.step.simple.DefaultItemFailureHandler;
-import org.springframework.batch.execution.step.simple.NeverSkipItemSkipPolicy;
+import org.springframework.batch.execution.step.support.DefaultItemFailureHandler;
+import org.springframework.batch.execution.step.support.NeverSkipItemSkipPolicy;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ChunkedStep.java

@@ -40,12 +40,12 @@ import org.springframework.batch.execution.scope.SimpleStepContext;
 import org.springframework.batch.execution.scope.StepContext;
 import org.springframework.batch.execution.scope.StepScope;
 import org.springframework.batch.execution.scope.StepSynchronizationManager;
-import org.springframework.batch.execution.step.simple.DefaultItemFailureHandler;
-import org.springframework.batch.execution.step.simple.ItemChunker;
-import org.springframework.batch.execution.step.simple.ItemDechunker;
-import org.springframework.batch.execution.step.simple.SimpleExitStatusExceptionClassifier;
-import org.springframework.batch.execution.step.simple.StepInterruptionPolicy;
-import org.springframework.batch.execution.step.simple.ThreadStepInterruptionPolicy;
+import org.springframework.batch.execution.step.support.DefaultItemFailureHandler;
+import org.springframework.batch.execution.step.support.ItemChunker;
+import org.springframework.batch.execution.step.support.ItemDechunker;
+import org.springframework.batch.execution.step.support.SimpleExitStatusExceptionClassifier;
+import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
+import org.springframework.batch.execution.step.support.ThreadStepInterruptionPolicy;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.io.exception.WriteFailureException;
 import org.springframework.batch.item.ExecutionContext;

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

@@ -31,9 +31,9 @@ import org.springframework.batch.execution.scope.SimpleStepContext;
 import org.springframework.batch.execution.scope.StepContext;
 import org.springframework.batch.execution.scope.StepScope;
 import org.springframework.batch.execution.scope.StepSynchronizationManager;
-import org.springframework.batch.execution.step.simple.SimpleExitStatusExceptionClassifier;
-import org.springframework.batch.execution.step.simple.StepInterruptionPolicy;
-import org.springframework.batch.execution.step.simple.ThreadStepInterruptionPolicy;
+import org.springframework.batch.execution.step.support.SimpleExitStatusExceptionClassifier;
+import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
+import org.springframework.batch.execution.step.support.ThreadStepInterruptionPolicy;
 import org.springframework.batch.io.Skippable;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ExecutionContext;

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemChunker.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemDechunker.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsHolder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import org.springframework.batch.core.domain.Step;
 import org.springframework.batch.repeat.RepeatOperations;

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStep.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import org.springframework.batch.io.exception.BatchCriticalException;
 

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java

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

spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java

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

spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java

@@ -33,7 +33,7 @@ import org.springframework.batch.execution.repository.SimpleJobRepository;
 import org.springframework.batch.execution.repository.dao.MapJobDao;
 import org.springframework.batch.execution.repository.dao.MapStepDao;
 import org.springframework.batch.execution.step.AbstractStep;
-import org.springframework.batch.execution.step.simple.RepeatOperationsStep;
+import org.springframework.batch.execution.step.support.RepeatOperationsStep;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
 import org.springframework.batch.item.ItemWriter;

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ChunkedStepTests.java

@@ -31,9 +31,9 @@ import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.execution.scope.StepScope;
 import org.springframework.batch.execution.scope.StepSynchronizationManager;
-import org.springframework.batch.execution.step.simple.ItemChunker;
-import org.springframework.batch.execution.step.simple.ItemDechunker;
-import org.springframework.batch.execution.step.simple.JobRepositorySupport;
+import org.springframework.batch.execution.step.support.ItemChunker;
+import org.springframework.batch.execution.step.support.ItemDechunker;
+import org.springframework.batch.execution.step.support.JobRepositorySupport;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;

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

@@ -38,8 +38,8 @@ import org.springframework.batch.execution.repository.dao.MapStepDao;
 import org.springframework.batch.execution.scope.StepScope;
 import org.springframework.batch.execution.scope.StepSynchronizationManager;
 import org.springframework.batch.execution.step.ItemOrientedStep;
-import org.springframework.batch.execution.step.simple.JobRepositorySupport;
-import org.springframework.batch.execution.step.simple.StepInterruptionPolicy;
+import org.springframework.batch.execution.step.support.JobRepositorySupport;
+import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;

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

@@ -12,7 +12,7 @@ import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.execution.step.TaskletStep;
-import org.springframework.batch.execution.step.simple.JobRepositorySupport;
+import org.springframework.batch.execution.step.support.JobRepositorySupport;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ItemChunkerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import junit.framework.TestCase;
 
@@ -21,6 +21,7 @@ import org.springframework.batch.core.domain.ChunkingResult;
 import org.springframework.batch.core.domain.ItemSkipPolicy;
 import org.springframework.batch.core.domain.StepContribution;
 import org.springframework.batch.core.domain.StepExecution;
+import org.springframework.batch.execution.step.support.ItemChunker;
 
 public class ItemChunkerTests extends TestCase {
 	

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ItemDechunkerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +23,8 @@ import org.springframework.batch.core.domain.Chunk;
 import org.springframework.batch.core.domain.DechunkingResult;
 import org.springframework.batch.core.domain.StepContribution;
 import org.springframework.batch.core.domain.StepExecution;
+import org.springframework.batch.execution.step.support.AlwaysSkipItemSkipPolicy;
+import org.springframework.batch.execution.step.support.ItemDechunker;
 import org.springframework.batch.io.exception.WriteFailureException;
 import org.springframework.batch.item.ItemWriter;
 

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.domain.JobExecution;

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java

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

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +25,7 @@ import org.springframework.batch.core.domain.JobInstance;
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.domain.StepExecution;
 import org.springframework.batch.execution.step.ItemOrientedStep;
+import org.springframework.batch.execution.step.support.RepeatOperationsStep;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.reader.ItemReaderAdapter;
@@ -51,7 +52,7 @@ public class RepeatOperationsStepTests extends TestCase {
 	}
 	
 	/**
-	 * Test method for {@link org.springframework.batch.execution.step.simple.RepeatOperationsStep#getChunkOperations()}.
+	 * Test method for {@link org.springframework.batch.execution.step.support.RepeatOperationsStep#getChunkOperations()}.
 	 */
 	public void testSetChunkOperations() {
 		assertNull(repeatStep.getChunkOperations());
@@ -62,7 +63,7 @@ public class RepeatOperationsStepTests extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.springframework.batch.execution.step.simple.RepeatOperationsStep#getChunkOperations()}.
+	 * Test method for {@link org.springframework.batch.execution.step.support.RepeatOperationsStep#getChunkOperations()}.
 	 */
 	public void testSetStepOperations() {
 		assertNull(repeatStep.getChunkOperations());

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 
 import org.springframework.batch.core.domain.JobInterruptedException;
 import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier;
+import org.springframework.batch.execution.step.support.SimpleExitStatusExceptionClassifier;
 import org.springframework.batch.repeat.ExitStatus;
 
 import junit.framework.TestCase;

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -21,6 +21,8 @@ import java.util.List;
 
 import org.springframework.batch.core.domain.StepContribution;
 import org.springframework.batch.core.domain.StepExecution;
+import org.springframework.batch.execution.step.support.LimitCheckingItemSkipPolicy;
+import org.springframework.batch.execution.step.support.SkipLimitExceededException;
 import org.springframework.batch.io.exception.FlatFileParsingException;
 
 import junit.framework.TestCase;

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.execution.step.simple;
+package org.springframework.batch.execution.step.support;
 
 import java.util.List;
 
@@ -34,6 +34,7 @@ import org.springframework.batch.execution.repository.dao.JobInstanceDao;
 import org.springframework.batch.execution.repository.dao.MapJobDao;
 import org.springframework.batch.execution.repository.dao.MapStepDao;
 import org.springframework.batch.execution.repository.dao.StepExecutionDao;
+import org.springframework.batch.execution.step.support.RepeatOperationsStep;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.reader.ItemReaderAdapter;

spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java

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

spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml

@@ -25,7 +25,7 @@
 						class="org.springframework.batch.execution.launch.EmptyItemWriter" />
 				</property>
 				<property name="jobRepository" >
-					<bean class="org.springframework.batch.execution.step.simple.JobRepositorySupport" />
+					<bean class="org.springframework.batch.execution.step.support.JobRepositorySupport" />
 				</property>
 				<property name="streamManager">
 					<bean class="org.springframework.batch.item.stream.SimpleStreamManager" />

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

@@ -40,7 +40,7 @@
 		class="org.springframework.batch.execution.launch.EmptyItemWriter" />
 
 	<bean id="jobRepository"
-		class="org.springframework.batch.execution.step.simple.JobRepositorySupport" />
+		class="org.springframework.batch.execution.step.support.JobRepositorySupport" />
 
 
 	<bean id="test-job-with-name"