diff --git a/dictionary.txt b/dictionary.txt index 1dc5968d8..7a1be2afb 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -77,3 +77,8 @@ autowiring strategizing initialized locale +savepoint +middleware +fallback +idempotent +reconstitute diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java index 363cdcc50..a457f1f07 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java @@ -19,7 +19,7 @@ import java.util.Collection; import org.springframework.batch.core.job.flow.DecisionState; import org.springframework.batch.core.job.flow.JobExecutionDecider; -import org.springframework.batch.flow.StateTransition; +import org.springframework.batch.core.job.flow.StateTransition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java index 40dffdf4a..566b613ca 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java @@ -18,8 +18,8 @@ package org.springframework.batch.core.configuration.xml; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.flow.Flow; -import org.springframework.batch.flow.SimpleFlow; +import org.springframework.batch.core.job.flow.Flow; +import org.springframework.batch.core.job.flow.SimpleFlow; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java index 7bea42bd4..d5e8d8b8c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.List; import org.springframework.batch.core.job.flow.JobExecutionDecider; -import org.springframework.batch.flow.SplitState; -import org.springframework.batch.flow.StateTransition; +import org.springframework.batch.core.job.flow.SplitState; +import org.springframework.batch.core.job.flow.StateTransition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java index cb6600ce2..4ef90ad41 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java @@ -22,8 +22,8 @@ import java.util.List; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Step; import org.springframework.batch.core.job.flow.EndState; +import org.springframework.batch.core.job.flow.StateTransition; import org.springframework.batch.core.job.flow.StepState; -import org.springframework.batch.flow.StateTransition; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/AbstractState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/AbstractState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java index c786e0366..6470ff832 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/AbstractState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java index 00b8647cb..badcfdb50 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java @@ -1,6 +1,5 @@ package org.springframework.batch.core.job.flow; -import org.springframework.batch.flow.AbstractState; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java index 6f731bfa6..1067127ad 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java @@ -2,9 +2,6 @@ package org.springframework.batch.core.job.flow; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; -import org.springframework.batch.flow.AbstractState; -import org.springframework.batch.flow.FlowExecution; -import org.springframework.batch.flow.State; /** * {@link State} implementation for ending a job if it is in progress and diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/Flow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/Flow.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java index 39e51e5e3..8cb10b5da 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/Flow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java index 44cd9e541..0e92b9b09 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionAggregator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java index c3bdde6c1..39e38967f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import java.util.Collection; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionException.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionException.java index a7184daf1..896fcb01e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListener.java similarity index 93% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListener.java index 26da76238..f9ddd0769 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListenerSupport.java similarity index 94% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionListenerSupport.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListenerSupport.java index 289758fee..91037f27b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/FlowExecutionListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListenerSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java index 246091443..d1451527f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java @@ -23,10 +23,6 @@ import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.job.AbstractJob; import org.springframework.batch.core.repository.JobRestartException; -import org.springframework.batch.flow.Flow; -import org.springframework.batch.flow.FlowExecution; -import org.springframework.batch.flow.FlowExecutionException; -import org.springframework.batch.flow.FlowExecutionListenerSupport; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java index 86314cb92..3cfdef1e6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java @@ -21,7 +21,6 @@ import org.springframework.batch.core.StartLimitExceededException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobRestartException; -import org.springframework.batch.flow.Flow; /** * Context and execution strategy for {@link FlowJob} to allow it to delegate diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/MaxValueFlowExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/MaxValueFlowExecutionAggregator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java index 3332f97b7..e4cfb0e71 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/MaxValueFlowExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import java.util.Collection; import java.util.Collections; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/PatternMatcher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/PatternMatcher.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java index c7620b078..0ac7a4c09 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/PatternMatcher.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java index 27a4dd832..fba8b4df2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java @@ -2,8 +2,6 @@ package org.springframework.batch.core.job.flow; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; -import org.springframework.batch.flow.AbstractState; -import org.springframework.batch.flow.FlowExecution; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/SimpleFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java similarity index 99% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/SimpleFlow.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java index 4a6e326ab..0d6a8e682 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/SimpleFlow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import java.util.Collection; import java.util.HashMap; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/SplitState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/SplitState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java index eb79da66d..701953780 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/SplitState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/State.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/State.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java index 16021aabc..0ebce34ef 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/State.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/StateTransition.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java similarity index 99% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/StateTransition.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java index 75479a31d..844ed511b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/flow/StateTransition.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import org.springframework.batch.repeat.ExitStatus; import org.springframework.util.StringUtils; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java index 4afcf7106..c17251ac7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java @@ -1,8 +1,6 @@ package org.springframework.batch.core.job.flow; import org.springframework.batch.core.Step; -import org.springframework.batch.flow.AbstractState; -import org.springframework.batch.flow.State; /** * {@link State} implementation that delegates to a {@link JobFlowExecutor} to diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/BasicFlowTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/BasicFlowTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java index 5e5783169..90307860b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/BasicFlowTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,10 +25,11 @@ import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.batch.flow.FlowExecution; -import org.springframework.batch.flow.FlowExecutionException; -import org.springframework.batch.flow.SimpleFlow; -import org.springframework.batch.flow.StateTransition; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.FlowExecutionException; +import org.springframework.batch.core.job.flow.FlowExecutionListenerSupport; +import org.springframework.batch.core.job.flow.SimpleFlow; +import org.springframework.batch.core.job.flow.StateTransition; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/FlowExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionExceptionTests.java similarity index 92% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/FlowExecutionExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionExceptionTests.java index 9f89ff9f4..12d891459 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/FlowExecutionExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionExceptionTests.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.springframework.batch.core.job.flow.FlowExecutionException; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/FlowExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/FlowExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionTests.java index 22a556f3f..3ad49a9dc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/FlowExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.batch.flow.FlowExecution; +import org.springframework.batch.core.job.flow.FlowExecution; /** * @author Dave Syer diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java index d7a7ba3da..4668ada8b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java @@ -35,8 +35,6 @@ import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; import org.springframework.batch.core.step.StepSupport; -import org.springframework.batch.flow.SimpleFlow; -import org.springframework.batch.flow.StateTransition; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java index 279a3a7ba..5c0b7290c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java @@ -21,7 +21,6 @@ import org.springframework.batch.core.StartLimitExceededException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobRestartException; -import org.springframework.batch.flow.FlowExecution; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/SimpleFlowExecutionAggregatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java similarity index 89% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/SimpleFlowExecutionAggregatorTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java index 8edc3fc6e..d98d85c6c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/SimpleFlowExecutionAggregatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.Collections; import org.junit.Test; -import org.springframework.batch.flow.FlowExecution; -import org.springframework.batch.flow.MaxValueFlowExecutionAggregator; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.MaxValueFlowExecutionAggregator; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/SplitStateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java similarity index 91% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/SplitStateTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java index 14ac8a0f9..bde1d4576 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/SplitStateTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import static org.junit.Assert.assertEquals; @@ -22,9 +22,9 @@ import java.util.Collection; import org.easymock.EasyMock; import org.junit.Test; -import org.springframework.batch.flow.Flow; -import org.springframework.batch.flow.FlowExecution; -import org.springframework.batch.flow.SplitState; +import org.springframework.batch.core.job.flow.Flow; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.SplitState; import org.springframework.core.task.SimpleAsyncTaskExecutor; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/StateSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java similarity index 80% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/StateSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java index f1289c27a..f72c82014 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/StateSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; -import org.springframework.batch.flow.AbstractState; -import org.springframework.batch.flow.FlowExecution; +import org.springframework.batch.core.job.flow.AbstractState; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.State; /** * Base class for {@link State} implementations. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/StateTransitionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java similarity index 97% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/StateTransitionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java index e3e18b5fa..0ac7301d7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/flow/StateTransitionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.flow; +package org.springframework.batch.core.job.flow; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.batch.flow.StateTransition; +import org.springframework.batch.core.job.flow.StateTransition; /** * @author Dave Syer diff --git a/src/site/apt/cases/pause.apt b/src/site/apt/cases/pause.apt index 2a939b691..15b568a3b 100644 --- a/src/site/apt/cases/pause.apt +++ b/src/site/apt/cases/pause.apt @@ -16,8 +16,8 @@ Use Case: Pause and Resume Job Execution manual verification of business condition before continuing - a sanity check on critical data. Assume that a job execution could receive hundreds of resume signals, and this is a "normal" - situation. It does not look like a horrible mess if we look at the - history of the execution - e.g. like hundreds of restarts. + situation, so it does not create a horrible mess in the history of + the execution - e.g. looking like hundreds of restarts. * Scope