jobLauncherPath: the xml application context containing a
* {@link JobLauncher}
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
index 09889d4ac..4d562881b 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java
@@ -20,7 +20,6 @@ import java.util.HashSet;
import java.util.Iterator;
import org.springframework.batch.core.domain.Job;
-import org.springframework.batch.core.domain.JobSupport;
import org.springframework.batch.core.repository.DuplicateJobException;
import org.springframework.batch.core.repository.JobLocator;
import org.springframework.batch.core.repository.JobRegistry;
@@ -32,7 +31,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.util.Assert;
/**
- * A {@link BeanPostProcessor} that registers {@link JobSupport} beans
+ * A {@link BeanPostProcessor} that registers {@link Job} beans
* with a {@link JobRegistry}. Include a bean of this type along
* with your job configuration, and use the same
* {@link JobRegistry} as a {@link JobLocator} when
@@ -67,7 +66,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, Initiali
}
/**
- * De-register all the {@link JobSupport} instances that were
+ * De-register all the {@link Job} instances that were
* regsistered by this post processor.
* @see org.springframework.beans.factory.DisposableBean#destroy()
*/
@@ -80,7 +79,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, Initiali
}
/**
- * If the bean is an instance of {@link JobSupport} then register it.
+ * If the bean is an instance of {@link Job} then register it.
* @throws FatalBeanException if there is a
* {@link DuplicateJobException}.
*
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java
new file mode 100644
index 000000000..21ef40067
--- /dev/null
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.batch.execution.job;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.batch.core.domain.Job;
+import org.springframework.batch.core.domain.JobExecution;
+import org.springframework.batch.core.domain.Step;
+import org.springframework.batch.io.exception.BatchCriticalException;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.util.ClassUtils;
+
+/**
+ * Batch domain object representing a job. Job is an explicit abstraction
+ * representing the configuration of a job specified by a developer. It should
+ * be noted that restart policy is applied to the job as a whole and not to a
+ * step.
+ *
+ * @author Lucas Ward
+ * @author Dave Syer
+ */
+public abstract class AbstractJob implements BeanNameAware, Job {
+
+ private List steps = new ArrayList();
+
+ private String name;
+
+ private boolean restartable = false;
+
+ private int startLimit = Integer.MAX_VALUE;
+
+ /**
+ * Default constructor.
+ */
+ public AbstractJob() {
+ super();
+ }
+
+ /**
+ * Convenience constructor to immediately add name (which is mandatory but
+ * not final).
+ *
+ * @param name
+ */
+ public AbstractJob(String name) {
+ super();
+ this.name = name;
+ }
+
+ /**
+ * Set the name property if it is not already set. Because of the order of
+ * the callbacks in a Spring container the name property will be set first
+ * if it is present. Care is needed with bean definition inheritance - if a
+ * parent bean has a name, then its children need an explicit name as well,
+ * otherwise they will not be unique.
+ *
+ * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
+ */
+ public void setBeanName(String name) {
+ if (this.name == null) {
+ this.name = name;
+ }
+ }
+
+ /**
+ * Set the name property. Always overrides the default value if this object
+ * is a Spring bean.
+ *
+ * @see #setBeanName(java.lang.String)
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /* (non-Javadoc)
+ * @see org.springframework.batch.core.domain.IJob#getName()
+ */
+ public String getName() {
+ return name;
+ }
+
+ /* (non-Javadoc)
+ * @see org.springframework.batch.core.domain.IJob#getSteps()
+ */
+ public List getSteps() {
+ return steps;
+ }
+
+ public void setSteps(List steps) {
+ this.steps.clear();
+ this.steps.addAll(steps);
+ }
+
+ public void addStep(Step step) {
+ this.steps.add(step);
+ }
+
+ /* (non-Javadoc)
+ * @see org.springframework.batch.core.domain.IJob#getStartLimit()
+ */
+ public int getStartLimit() {
+ return startLimit;
+ }
+
+ public void setStartLimit(int startLimit) {
+ this.startLimit = startLimit;
+ }
+
+ public void setRestartable(boolean restartable) {
+ this.restartable = restartable;
+ }
+
+ /* (non-Javadoc)
+ * @see org.springframework.batch.core.domain.IJob#isRestartable()
+ */
+ public boolean isRestartable() {
+ return restartable;
+ }
+
+ public String toString() {
+ return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]";
+ }
+}
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/SimpleJob.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
similarity index 97%
rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/SimpleJob.java
rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
index 70aa8fc73..9fbf6d9a3 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/SimpleJob.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.batch.execution.job.simple;
+package org.springframework.batch.execution.job;
import java.util.Date;
import java.util.Iterator;
@@ -25,7 +25,6 @@ import org.springframework.batch.core.domain.BatchStatus;
import org.springframework.batch.core.domain.JobExecution;
import org.springframework.batch.core.domain.JobInstance;
import org.springframework.batch.core.domain.JobInterruptedException;
-import org.springframework.batch.core.domain.JobSupport;
import org.springframework.batch.core.domain.Step;
import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
@@ -42,7 +41,7 @@ import org.springframework.batch.repeat.ExitStatus;
* @author Lucas Ward
* @author Dave Syer
*/
-public class SimpleJob extends JobSupport {
+public class SimpleJob extends AbstractJob {
private JobRepository jobRepository;
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/package.html
deleted file mode 100644
index 055e8d524..000000000
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/simple/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-Specific implementations of simple job concerns.
-
-
-
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java
index 7ccf563d1..a0c654758 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java
@@ -16,7 +16,6 @@
package org.springframework.batch.execution.launch;
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.JobParameters;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
@@ -36,7 +35,7 @@ import org.springframework.batch.core.repository.JobExecutionAlreadyRunningExcep
public interface JobLauncher {
/**
- * Start a job execution for the given {@link JobSupport} and {@link JobParameters}.
+ * Start a job execution for the given {@link Job} and {@link JobParameters}.
*
* @return the exit code from the job if it returns synchronously. If the
* implementation is asynchronous, the status might well be unknown.
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
index 89e4f6d5a..1e5669a80 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
@@ -21,7 +21,6 @@ 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.domain.JobParameters;
-import org.springframework.batch.core.domain.JobSupport;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.InitializingBean;
@@ -31,7 +30,7 @@ import org.springframework.util.Assert;
/**
* Simple implementation of the {@link JobLauncher} interface. The Spring Core
- * {@link TaskExecutor} interface is used to launch a {@link JobSupport}. This
+ * {@link TaskExecutor} interface is used to launch a {@link Job}. This
* means that the type of executor set is very important. If a
* {@link SyncTaskExecutor} is used, then the job will be processed
* within the same thread that called the launcher. Care
@@ -42,7 +41,7 @@ import org.springframework.util.Assert;
* There is only one required dependency of this Launcher, a
* {@link JobRepository}. The JobRepository is used to obtain a valid
* JobExecution. The Repository must be used because the provided
- * {@link JobSupport} could be a restart of an existing {@link JobInstance},
+ * {@link Job} could be a restart of an existing {@link JobInstance},
* and only the Repository can reliably recreate it.
*
* @author Lucas Ward
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
index f27b68ac5..86b27c026 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
@@ -24,7 +24,6 @@ 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.domain.JobParameters;
-import org.springframework.batch.core.domain.JobSupport;
import org.springframework.batch.core.domain.Step;
import org.springframework.batch.core.domain.StepExecution;
import org.springframework.batch.core.repository.BatchRestartException;
@@ -88,7 +87,7 @@ public class SimpleJobRepository implements JobRepository {
*
* There are two ways in which the method determines if a job should be
* created or an existing one should be returned. The first is
- * restartability. The {@link JobSupport} restartable property will be
+ * restartability. The {@link Job} restartable property will be
* checked first. If it is false, a new job will be created, regardless of
* whether or not one exists. If it is true, the {@link JobInstanceDao} will
* be checked to determine if the job already exists, if it does, it's steps
@@ -107,7 +106,7 @@ public class SimpleJobRepository implements JobRepository {
*