Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1084: renamed "status" attribute to "exit-code"

Browse Source
This commit is contained in:
dhgarrette
2009-02-18 16:23:27 +00:00
parent 7a8598e244
commit fd67b7f381
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/src/site/docbook/reference/step.xml
View File

@@ -1295,9 +1295,9 @@
<classname>Job</classname> that has finished with status COMPLETED
cannot be restarted (the framework will throw a
<classname>JobInstanceAlreadyCompleteException</classname>). 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 <classname>ExitStatus</classname> of the
<classname>Job</classname>. If no 'status' attribute is given, then
<classname>Job</classname>. If no 'exit-code' attribute is given, then
the <classname>ExitStatus</classname> will be "COMPLETED" by default,
to match the <classname>BatchStatus</classname>.</para>
@@ -1324,9 +1324,9 @@
stop with a <classname>BatchStatus</classname> of FAILED. Unlike the
'end' element, the 'fail' element will not prevent the
<classname>Job</classname> 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 <classname>ExitStatus</classname> of the
<classname>Job</classname>. If no 'status' attribute is given, then
<classname>Job</classname>. If no 'exit-code' attribute is given, then
the <classname>ExitStatus</classname> will be "FAILED" by default, to
match the <classname>BatchStatus</classname>.</para>
@@ -1340,7 +1340,7 @@
<programlisting><![CDATA[ <step id="step1" next="step2">
<step id="step2">
<fail on="FAILED" status="EARLY TERMINATION"/>
<fail on="FAILED" exit-code="EARLY TERMINATION"/>
<next on="*" to="step3"/>
</step>
<step id="step3">]]></programlisting>

4
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java
View File

@@ -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);
}

8
spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
View File

@@ -619,9 +619,9 @@
When a step finishes the most specific match will be chosen to select the next step.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="status" use="optional" type="xsd:string" default="COMPLETED">
<xsd:attribute name="exit-code" use="optional" type="xsd:string" default="COMPLETED">
<xsd:annotation>
<xsd:documentation>The ExitStatus value to end on, defaults to COMPLETED.</xsd:documentation>
<xsd:documentation>The exit code value to end on, defaults to COMPLETED.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
@@ -639,9 +639,9 @@
When a step finishes the most specific match will be chosen to select the next step.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="status" use="optional" type="xsd:string" default="FAILED">
<xsd:attribute name="exit-code" use="optional" type="xsd:string" default="FAILED">
<xsd:annotation>
<xsd:documentation>The ExitStatus value to end on, defaults to FAILED.</xsd:documentation>
<xsd:documentation>The exit code value to end on, defaults to FAILED.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml
View File

@@ -11,7 +11,7 @@
<job id="job">
<step id="s1" ref="step1" next="fail"/>
<step id="fail" ref="failingStep">
<end on="*" status="COMPLETED EARLY TERMINATION"/>
<end on="*" exit-code="COMPLETED EARLY TERMINATION"/>
</step>
</job>

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml
View File

@@ -11,7 +11,7 @@
<job id="job">
<step id="s1" ref="step1" next="fail"/>
<step id="fail" ref="failingStep">
<fail on="FAILED" status="FAILED EARLY TERMINATION"/>
<fail on="FAILED" exit-code="FAILED EARLY TERMINATION"/>
</step>
</job>

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml
View File

@@ -14,7 +14,7 @@
</step>
<decision id="decision" decider="decider">
<next on="FOO" to="s2"/>
<end on="*" status="FAILED"/>
<end on="*" exit-code="FAILED"/>
</decision>
<step id="s2" ref="step2"/>
</job>

2
spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
View File

@@ -27,7 +27,7 @@
</step>
<decision id="limitDecision" decider="limitDecider">
<next on="CONTINUE" to="step2" />
<end on="COMPLETE" status="COMPLETED" />
<end on="COMPLETED" />
</decision>
</job>

2
spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
View File

@@ -14,7 +14,7 @@
<job id="skipJob" incrementer="incrementer">
<step id="step1" ref="firstPass">
<end on="FAILED" status="FAILED"/>
<end on="FAILED" exit-code="FAILED"/>
<next on="COMPLETED WITH SKIPS" to="errorPrint1" />
<next on="*" to="step2" />
</step>