diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java index 5c62dfd94..abc2c417a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.configuration.StepConfiguration; +import org.springframework.batch.core.domain.Step; import org.springframework.batch.core.domain.StepExecution; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; @@ -76,7 +76,7 @@ public class OrderItemReader extends AbstractItemReader { } /** - * @see org.springframework.batch.execution.io.FieldSetCallback#process(StepConfiguration, StepExecution) + * @see org.springframework.batch.execution.io.FieldSetCallback#process(Step, StepExecution) */ private void process(FieldSet fieldSet) { //finish processing if we hit the end of file diff --git a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml index a730c5e5f..2c53878ce 100644 --- a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml @@ -121,7 +121,7 @@ - @@ -139,11 +139,11 @@ class="org.springframework.core.task.SimpleAsyncTaskExecutor" /> - + + class="org.springframework.batch.sample.DefaultJobLoader"> diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml index 3a3609fe7..2d8a2bdb3 100644 --- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml @@ -13,7 +13,7 @@ can be integrated into a batch job. - + diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml index 2a9927d03..0c18ec2f8 100644 --- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml @@ -13,13 +13,13 @@ + class="org.springframework.batch.core.domain.Job"> + class="org.springframework.batch.execution.step.SimpleStep"> @@ -44,7 +44,7 @@ + class="org.springframework.batch.execution.step.SimpleStep"> @@ -68,7 +68,7 @@ + class="org.springframework.batch.execution.step.SimpleStep"> diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml index 5b923a40b..a1b76fdc8 100644 --- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml @@ -17,7 +17,7 @@ + class="org.springframework.batch.execution.step.RepeatOperationsStep"> diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml index ea80a8ea3..6a21a120f 100644 --- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml index 4e10a1414..77b7ed6ff 100644 --- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml @@ -52,7 +52,7 @@ + class="org.springframework.batch.execution.step.RepeatOperationsStep"> diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml index a9236b113..d2c657c4b 100644 --- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml @@ -18,7 +18,7 @@ + class="org.springframework.batch.execution.step.RepeatOperationsStep"> diff --git a/spring-batch-samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-container-definition.xml index 88ad62f62..9d6b418c4 100644 --- a/spring-batch-samples/src/main/resources/simple-container-definition.xml +++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml @@ -16,7 +16,7 @@ class="org.springframework.batch.execution.scope.StepScope" /> + class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor"> @@ -24,13 +24,13 @@ - + class="org.springframework.batch.execution.configuration.MapJobRegistry" /> diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java index fb2a81baf..556c9657b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java @@ -16,7 +16,7 @@ package org.springframework.batch.sample; -import org.springframework.batch.core.configuration.JobConfiguration; +import org.springframework.batch.core.domain.Job; import org.springframework.batch.execution.launch.JobLauncher; import org.springframework.batch.execution.runtime.DefaultJobIdentifier; import org.springframework.context.ApplicationContext; @@ -41,7 +41,7 @@ public abstract class AbstractBatchLauncherTests extends private static final String CONTAINER_DEFINITION_LOCATION = "simple-container-definition.xml"; JobLauncher launcher; - private JobConfiguration jobConfiguration; + private Job job; /* * (non-Javadoc) @@ -60,26 +60,27 @@ public abstract class AbstractBatchLauncherTests extends } /** - * Public setter for the {@link JobConfiguration} property. + * Public setter for the {@link Job} property. * - * @param jobConfiguration - * the jobConfiguration to set + * @param job the job to set */ - public void setJobConfiguration(JobConfiguration jobConfiguration) { - this.jobConfiguration = jobConfiguration; + public void setJob(Job job) { + this.job = job; } protected String getJobName() { - return jobConfiguration.getName(); + return job.getName(); } /** - * @throws Exception + * @throws Exception * */ public void testLaunchJob() throws Exception { - // Make sure the job is unique by the test case that runs it, not just its name: - launcher.run(new DefaultJobIdentifier(getJobName(), this.getClass().getName())); + // Make sure the job is unique by the test case that runs it, not just + // its name: + launcher.run(new DefaultJobIdentifier(getJobName(), this.getClass() + .getName())); launcher.stop(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobConfigurationLoader.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java similarity index 76% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobConfigurationLoader.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java index 59ea122e5..d43997974 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobConfigurationLoader.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java @@ -7,9 +7,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.springframework.batch.core.configuration.JobConfiguration; -import org.springframework.batch.core.configuration.ListableJobConfigurationRegistry; -import org.springframework.batch.core.configuration.NoSuchJobConfigurationException; +import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.domain.ListableJobRegistry; +import org.springframework.batch.core.domain.NoSuchJobException; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeansException; import org.springframework.beans.PropertyAccessorUtils; @@ -18,10 +18,10 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.util.Assert; -public class DefaultJobConfigurationLoader implements JobConfigurationLoader, +public class DefaultJobLoader implements JobLoader, ApplicationContextAware { - private ListableJobConfigurationRegistry registry; + private ListableJobRegistry registry; private ApplicationContext applicationContext; private Map configurations = new HashMap(); @@ -30,7 +30,7 @@ public class DefaultJobConfigurationLoader implements JobConfigurationLoader, this.applicationContext = applicationContext; } - public void setRegistry(ListableJobConfigurationRegistry registry) { + public void setRegistry(ListableJobRegistry registry) { this.registry = registry; } @@ -38,7 +38,7 @@ public class DefaultJobConfigurationLoader implements JobConfigurationLoader, Map result = new HashMap(configurations); for (Iterator iterator = registry.getJobConfigurations().iterator(); iterator .hasNext();) { - JobConfiguration configuration = (JobConfiguration) iterator.next(); + Job configuration = (Job) iterator.next(); String name = configuration.getName(); if (!configurations.containsKey(name)) { result.put(name, ": " + configuration); @@ -50,7 +50,7 @@ public class DefaultJobConfigurationLoader implements JobConfigurationLoader, public void loadResource(String path) { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( new String[] { path }, applicationContext); - String[] names = context.getBeanNamesForType(JobConfiguration.class); + String[] names = context.getBeanNamesForType(Job.class); for (int i = 0; i < names.length; i++) { String name = names[i]; configurations.put(name, path); @@ -59,8 +59,8 @@ public class DefaultJobConfigurationLoader implements JobConfigurationLoader, public Object getJobConfiguration(String name) { try { - return registry.getJobConfiguration(name); - } catch (NoSuchJobConfigurationException e) { + return registry.getJob(name); + } catch (NoSuchJobException e) { return null; } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ExportedJobConfigurationLoader.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ExportedJobLoader.java similarity index 87% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/ExportedJobConfigurationLoader.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/ExportedJobLoader.java index 069610805..5397f51d4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ExportedJobConfigurationLoader.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ExportedJobLoader.java @@ -22,13 +22,13 @@ import java.util.Map; * @author Dave Syer * */ -public interface ExportedJobConfigurationLoader { +public interface ExportedJobLoader { void loadResource(String path); Map getConfigurations(); - String getJobConfiguration(String path); + String getJob(String path); String getProperty(String path); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobConfigurationLoader.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobLoader.java similarity index 92% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/JobConfigurationLoader.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/JobLoader.java index 715285a0f..4e9d0c84f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobConfigurationLoader.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobLoader.java @@ -22,7 +22,7 @@ import java.util.Map; * @author Dave Syer * */ -public interface JobConfigurationLoader { +public interface JobLoader { void loadResource(String path); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java index e40767e49..8a1b96b74 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java @@ -17,7 +17,7 @@ package org.springframework.batch.sample; /** - * This job differs from FixedLengthImportJob only in internal job configuration, therefore + * This job differs from FixedLengthImportJob only in internal job, therefore * the test is reused, only the job config location is overridden */ public class SimpleTaskletJobFunctionalTests extends FixedLengthImportJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java index b24e779aa..56a1162f1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java @@ -8,8 +8,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.springframework.batch.core.configuration.JobConfiguration; import org.springframework.batch.core.domain.BatchStatus; +import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.domain.JobExecution; import org.springframework.batch.core.domain.JobInstance; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; @@ -25,7 +25,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin private JobRepository repository; - private JobConfiguration jobConfiguration; + private Job jobConfiguration; private Set jobExecutionIds = new HashSet(); @@ -44,7 +44,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin protected void onSetUpInTransaction() throws Exception { jobIdentifier = new ScheduledJobIdentifier("Job1", "TestStream", new SimpleDateFormat("yyyyMMdd").parse("20070505")); - jobConfiguration = new JobConfiguration("test-job"); + jobConfiguration = new Job("test-job"); jobConfiguration.setRestartable(true); }