OPEN - issue BATCH-324: Step as factory for StepExecutor

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

Same treatment for JobExecutor - roll it up into the Job interface

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

@@ -115,7 +115,6 @@
 	<bean id="jobLauncher"
 		class="org.springframework.batch.execution.launch.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
-		<property name="jobExecutor" ref="jobExecutor" />
 		<property name="taskExecutor">
 			<bean
 				class="org.springframework.core.task.SimpleAsyncTaskExecutor" />

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

@@ -12,9 +12,7 @@
 	<bean parent="stepScope" />
 	<bean parent="jobConfigurationRegistryBeanPostProcessor" />
 
-	<bean id="footballJob"
-		class="org.springframework.batch.core.domain.Job">
-		<property name="restartable" value="true" />
+	<bean id="footballJob" parent="simpleJob">
 		<property name="startLimit" value="100" />
 		<property name="steps">
 			<list>

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

@@ -13,7 +13,6 @@
 	<bean parent="jobConfigurationRegistryBeanPostProcessor"/>
 	
 	<bean id="jobLauncher" class="org.springframework.batch.execution.launch.SimpleJobLauncher">
-		<property name="jobExecutor" ref="jobExecutor" />
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="taskExecutor">
 			<bean class="org.springframework.core.task.SimpleAsyncTaskExecutor"/>

spring-batch-samples/src/main/resources/simple-container-definition.xml

@@ -24,7 +24,6 @@
 	<bean id="jobLauncher"
 		class="org.springframework.batch.execution.launch.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
-		<property name="jobExecutor" ref="jobExecutor" />
 	</bean>
 
 	<bean id="jobConfigurationRegistry"
@@ -44,11 +43,6 @@
 		</tx:attributes>
 	</tx:advice>
 
-	<bean id="jobExecutor"
-		class="org.springframework.batch.execution.job.DefaultJobExecutor">
-		<property name="jobRepository" ref="jobRepository" />
-	</bean>
-
 	<bean id="jobRepository"
 		class="org.springframework.batch.execution.repository.SimpleJobRepository">
 		<constructor-arg ref="jobDao" />
@@ -84,7 +78,8 @@
 	</bean>
 
 	<bean id="simpleJob"
-		class="org.springframework.batch.core.domain.Job" abstract="true">
+		class="org.springframework.batch.execution.job.simple.SimpleJob" abstract="true">
+		<property name="jobRepository" ref="jobRepository" />
 		<property name="restartable" value="true" />
 	</bean>
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java

@@ -17,6 +17,7 @@
 package org.springframework.batch.sample;
 
 import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.domain.JobSupport;
 import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.execution.launch.JobLauncher;
 import org.springframework.context.ApplicationContext;
@@ -60,7 +61,7 @@ public abstract class AbstractBatchLauncherTests extends
 	}
 
 	/**
-	 * Public setter for the {@link Job} property.
+	 * Public setter for the {@link JobSupport} property.
 	 * 
 	 * @param job the job to set
 	 */

spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java

@@ -8,6 +8,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.domain.JobSupport;
 import org.springframework.batch.core.repository.ListableJobRegistry;
 import org.springframework.batch.core.repository.NoSuchJobException;
 import org.springframework.beans.BeanWrapperImpl;
@@ -50,7 +51,7 @@ public class DefaultJobLoader implements JobLoader,
 	public void loadResource(String path) {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				new String[] { path }, applicationContext);
-		String[] names = context.getBeanNamesForType(Job.class);
+		String[] names = context.getBeanNamesForType(JobSupport.class);
 		for (int i = 0; i < names.length; i++) {
 			String name = names[i];
 			configurations.put(name, path);

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.springframework.batch.core.domain.BatchStatus;
-import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.domain.JobSupport;
 import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobInstance;
 import org.springframework.batch.core.domain.JobParameters;
@@ -22,7 +22,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin
 
 	private JobRepository repository;
 
-	private Job jobConfiguration;
+	private JobSupport jobConfiguration;
 
 	private Set jobExecutionIds = new HashSet();
 
@@ -39,7 +39,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin
 	}
 
 	protected void onSetUpInTransaction() throws Exception {
-		jobConfiguration = new Job("test-job");
+		jobConfiguration = new JobSupport("test-job");
 		jobConfiguration.setRestartable(true);
 	}
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemProcessorTests.java

@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.item.writer;
 
-import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.domain.JobSupport;
 import org.springframework.batch.core.domain.JobExecution;
 import org.springframework.batch.core.domain.JobInstance;
 import org.springframework.batch.core.domain.JobParameters;
@@ -27,7 +27,7 @@ public class StagingItemProcessorTests extends AbstractTransactionalDataSourceSp
 
 	protected void prepareTestInstance() throws Exception {
 		SimpleStepContext stepScopeContext = new SimpleStepContext(new StepExecution(new StepInstance(new Long(11)),
-				new JobExecution(new JobInstance(new Long(12), new JobParameters(), new Job("job")))));
+				new JobExecution(new JobInstance(new Long(12), new JobParameters(), new JobSupport("job")))));
 		StepSynchronizationManager.register(stepScopeContext);
 		super.prepareTestInstance();
 	}