From fd67b7f3812c8790e43b35aef30c3a41cceca67a Mon Sep 17 00:00:00 2001 From: dhgarrette Date: Wed, 18 Feb 2009 16:23:27 +0000 Subject: [PATCH] BATCH-1084: renamed "status" attribute to "exit-code" --- docs/src/site/docbook/reference/step.xml | 10 +++++----- .../batch/core/configuration/xml/FlowParser.java | 4 ++-- .../batch/core/configuration/xml/spring-batch-2.0.xsd | 8 ++++---- .../xml/EndTransitionJobParserTests-context.xml | 2 +- .../xml/FailTransitionJobParserTests-context.xml | 2 +- .../configuration/xml/StopJobParserTests-context.xml | 2 +- .../src/main/resources/jobs/loopFlowSample.xml | 2 +- .../src/main/resources/jobs/skipSampleJob.xml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/src/site/docbook/reference/step.xml b/docs/src/site/docbook/reference/step.xml index 138b0f7aa..3412303cf 100644 --- a/docs/src/site/docbook/reference/step.xml +++ b/docs/src/site/docbook/reference/step.xml @@ -1295,9 +1295,9 @@ Job that has finished with status COMPLETED cannot be restarted (the framework will throw a JobInstanceAlreadyCompleteException). The 'end' - element also allows for an optional 'status' attribute that can be + element also allows for an optional 'exit-code' attribute that can be used to customize the ExitStatus of the - Job. If no 'status' attribute is given, then + Job. If no 'exit-code' attribute is given, then the ExitStatus will be "COMPLETED" by default, to match the BatchStatus. @@ -1324,9 +1324,9 @@ stop with a BatchStatus of FAILED. Unlike the 'end' element, the 'fail' element will not prevent the Job from being restarted. The 'fail' element - also allows for an optional 'status' attribute that can be used to + also allows for an optional 'exit-code' attribute that can be used to customize the ExitStatus of the - Job. If no 'status' attribute is given, then + Job. If no 'exit-code' attribute is given, then the ExitStatus will be "FAILED" by default, to match the BatchStatus. @@ -1340,7 +1340,7 @@ - + ]]> 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 94246755a..7c1b4cbce 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 @@ -221,9 +221,9 @@ public class FlowParser extends AbstractSingleBeanDefinitionParser { if (stateId != null && StringUtils.hasText(restartAttribute) && !restartAttribute.equals(stateId)) { abandon = true; } - String statusAttribute = transitionElement.getAttribute("status"); + String exitCodeAttribute = transitionElement.getAttribute("exit-code"); - return createTransition(batchStatus, onAttribute, nextAttribute, statusAttribute, stateDef, parserContext, + return createTransition(batchStatus, onAttribute, nextAttribute, exitCodeAttribute, stateDef, parserContext, abandon); } diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd index 27a7f8652..ae0c3f1c8 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd @@ -619,9 +619,9 @@ When a step finishes the most specific match will be chosen to select the next step. - + - The ExitStatus value to end on, defaults to COMPLETED. + The exit code value to end on, defaults to COMPLETED. @@ -639,9 +639,9 @@ When a step finishes the most specific match will be chosen to select the next step. - + - The ExitStatus value to end on, defaults to FAILED. + The exit code value to end on, defaults to FAILED. diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml index 95c1c9f19..ac7e1b16d 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml @@ -11,7 +11,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml index 9a9ca8216..5cf1555d8 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml @@ -11,7 +11,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml index fbf613391..4b762cf5f 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml @@ -14,7 +14,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml index ea5a9443d..27a39a868 100644 --- a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml @@ -27,7 +27,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml index 8f8ace253..048d8852c 100644 --- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml @@ -14,7 +14,7 @@ - +