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/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.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.listener;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.ChunkListener;
@@ -21,10 +21,6 @@ import org.springframework.batch.core.ItemReadListener;
 import org.springframework.batch.core.ItemWriteListener;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepListener;
-import org.springframework.batch.core.listener.CompositeChunkListener;
-import org.springframework.batch.core.listener.CompositeItemReadListener;
-import org.springframework.batch.core.listener.CompositeItemWriteListener;
-import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.repeat.ExitStatus;
 
@@ -32,7 +28,7 @@ import org.springframework.batch.repeat.ExitStatus;
  * @author Dave Syer
  * 
  */
-public class ListenerMulticaster implements StepListener, ChunkListener, ItemReadListener,
+public class MulticasterBatchListener implements StepListener, ChunkListener, ItemReadListener,
 		ItemWriteListener {
 
 	private CompositeStepListener stepListener = new CompositeStepListener();
@@ -46,13 +42,13 @@ public class ListenerMulticaster implements StepListener, ChunkListener, ItemRea
 	/**
 	 * Initialise the listener instance.
 	 */
-	public ListenerMulticaster() {
+	public MulticasterBatchListener() {
 		super();
 	}
 
 	/**
 	 * Register each of the objects as listeners. Once registered, calls to the
-	 * {@link ListenerMulticaster} broadcast to the individual listeners.
+	 * {@link MulticasterBatchListener} broadcast to the individual listeners.
 	 * 
 	 * @param listeners an array of listener objects of types known to the
 	 * multicaster.

spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.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 org.springframework.batch.core.Step;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.step.ItemOrientedStep;
 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/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import java.util.ArrayList;
 import java.util.List;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-core/src/main/java/org/springframework/batch/core/step/DefaultStepExecutionSynchronizer.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.StepExecution;
 

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

@@ -13,13 +13,12 @@
  * 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.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
-import org.springframework.batch.core.step.ItemHandler;
-import org.springframework.batch.core.step.ItemOrientedStep;
+import org.springframework.batch.core.listener.MulticasterBatchListener;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
@@ -47,7 +46,7 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
 
 	private BatchListener[] listeners = new BatchListener[0];
 
-	private ListenerMulticaster listener = new ListenerMulticaster();
+	private MulticasterBatchListener listener = new MulticasterBatchListener();
 
 	private TaskExecutor taskExecutor;
 

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

@@ -28,11 +28,6 @@ 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.runtime.ExitStatusExceptionClassifier;
-import org.springframework.batch.core.step.support.DefaultStepExecutionSynchronizer;
-import org.springframework.batch.core.step.support.SimpleExitStatusExceptionClassifier;
-import org.springframework.batch.core.step.support.StepExecutionSynchronizer;
-import org.springframework.batch.core.step.support.StepInterruptionPolicy;
-import org.springframework.batch.core.step.support.ThreadStepInterruptionPolicy;
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 import org.springframework.batch.core.StepContribution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 

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

@@ -13,12 +13,11 @@
  * 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.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
-import org.springframework.batch.core.step.ItemOrientedStep;
 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/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.support;
+package org.springframework.batch.core.step;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

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

@@ -13,10 +13,9 @@
  * 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.StepContribution;
-import org.springframework.batch.core.step.ItemHandler;
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemReader;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.ExceptionHandler;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/StatefulRetryStepFactoryBean.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 org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.step.ItemOrientedStep;
 import org.springframework.batch.item.ItemKeyGenerator;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;

spring-batch-core/src/main/java/org/springframework/batch/core/step/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.support;
+package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.StepExecution;
 

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

@@ -14,7 +14,7 @@
  * 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.Step;

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

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

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

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-Specific implementations of simple concerns.
-</p>
-</body>
-</html>