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>

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;
 

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.support.DefaultStepFactoryBean">
+			<bean id="step1" class="org.springframework.batch.core.step.DefaultStepFactoryBean">
 				<property name="itemReader" ref="itemReader" />
 				<property name="itemWriter" ref="itemWriter" />
 				<property name="jobRepository" ref="jobRepository" />
@@ -38,7 +38,7 @@
 		class="org.springframework.batch.core.launch.EmptyItemWriter" />
 
 	<bean id="jobRepository"
-		class="org.springframework.batch.core.step.support.JobRepositorySupport" />
+		class="org.springframework.batch.core.step.JobRepositorySupport" />
 
 	<bean id="transactionManager"
 		class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />

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

@@ -15,7 +15,7 @@
 		class="org.springframework.batch.core.job.JobSupport">
 		<property name="steps">
 			<bean id="step1"
-				class="org.springframework.batch.core.step.support.DefaultStepFactoryBean">
+				class="org.springframework.batch.core.step.DefaultStepFactoryBean">
 				<property name="itemReader">
 					<bean
 						class="org.springframework.batch.item.reader.ListItemReader">
@@ -28,7 +28,7 @@
 				</property>
 				<property name="jobRepository">
 					<bean
-						class="org.springframework.batch.core.step.support.JobRepositorySupport" />
+						class="org.springframework.batch.core.step.JobRepositorySupport" />
 				</property>
 				<property name="transactionManager">
 					<bean

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.support.StepInterruptionPolicy;
+import org.springframework.batch.core.step.StepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 
 public class NoopStepInterruptionPolicy implements StepInterruptionPolicy {

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.support.StatefulRetryStepFactoryBean">
+				class="org.springframework.batch.core.step.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.support.DefaultStepFactoryBean"
+	<bean id="simpleStep" class="org.springframework.batch.core.step.DefaultStepFactoryBean"
 		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />