OPEN - issue BATCH-429: Combine the core and execution modules

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

Collapse step/support packages to remove cycle.

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.support.NeverSkipItemSkipPolicy;
+import org.springframework.batch.core.step.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/step/DefaultStepFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,8 +34,8 @@ 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.DefaultStepFactoryBean;
 import org.springframework.batch.core.step.ItemOrientedStep;
-import org.springframework.batch.core.step.support.DefaultStepFactoryBean;
 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/ItemOrientedStepTests.java

@@ -39,9 +39,6 @@ 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.support.JobRepositorySupport;
-import org.springframework.batch.core.step.support.SimpleItemHandler;
-import org.springframework.batch.core.step.support.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/JobRepositorySupport.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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;

spring-batch-core/src/test/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.MarkFailedException;

spring-batch-core/src/test/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,7 @@ 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.support.RepeatOperationsStepFactoryBean;
+import org.springframework.batch.core.step.RepeatOperationsStepFactoryBean;
 import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;

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

@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 
 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.runtime.ExitStatusExceptionClassifier;
-import org.springframework.batch.core.step.support.SimpleExitStatusExceptionClassifier;
 import org.springframework.batch.repeat.ExitStatus;
 
 import junit.framework.TestCase;

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

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

spring-batch-core/src/test/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -21,8 +21,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.core.step.support.LimitCheckingItemSkipPolicy;
-import org.springframework.batch.core.step.support.SkipLimitExceededException;
 import org.springframework.batch.item.file.FlatFileParseException;
 
 /**

spring-batch-core/src/test/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,7 +33,7 @@ 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.support.StatefulRetryStepFactoryBean;
+import org.springframework.batch.core.step.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/StepExecutorInterruptionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step.support;
+package org.springframework.batch.core.step;
 
 import junit.framework.TestCase;
 
@@ -30,8 +30,7 @@ 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.support.SimpleItemHandler;
-import org.springframework.batch.core.step.support.StepExecutionSynchronizer;
+import org.springframework.batch.core.step.SimpleItemHandler;
 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/TaskletStepTests.java

@@ -16,7 +16,6 @@ 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.step.support.JobRepositorySupport;
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 

spring-batch-core/src/test/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicyTests.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.support;
+package org.springframework.batch.core.step;
 
 import junit.framework.TestCase;