From 143d003435e8c4c6f62ca2653aa1fdeeb5bd5094 Mon Sep 17 00:00:00 2001
From: dhgarrette <dhgarrette@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 13 Mar 2009 22:07:39 +0000
Subject: [PATCH] BATCH-1008: Changed order of elements in <split/> so that
 transitions are at the bottom.

---
 .../batch/core/configuration/xml/spring-batch-2.0.xsd | 11 ++---------
 ...fferentResultsFailSecondJobParserTests-context.xml |  6 +++---
 2 files changed, 5 insertions(+), 12 deletions(-)

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 3ea7b1a78..71b8023c7 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
@@ -213,7 +213,7 @@
 					</xsd:annotation>
 					<xsd:complexType>
 						<xsd:complexContent>
-							<xsd:extension base="transitionWithNextType">
+							<xsd:extension base="nextType">
 								<xsd:sequence minOccurs="2" maxOccurs="unbounded">
 									<xsd:element name="flow" type="flowType">
 										<xsd:annotation>
@@ -222,6 +222,7 @@
 											</xsd:documentation>
 										</xsd:annotation>
 									</xsd:element>
+									<xsd:group ref="transitions" />
 								</xsd:sequence>
 								<xsd:attribute name="id" type="xsd:ID" use="required" />
 								<xsd:attribute name="task-executor" type="xsd:string" use="optional">
@@ -537,14 +538,6 @@
 		<xsd:group ref="transitions" />
 	</xsd:complexType>
 
-	<xsd:complexType name="transitionWithNextType">
-		<xsd:complexContent>
-			<xsd:extension base="nextType">
-				<xsd:group ref="transitions" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
 	<xsd:complexType name="listenerType">
 		<xsd:attribute name="id" type="xsd:ID" />
 		<xsd:attribute name="ref" type="xsd:string">
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
index 19f4c846e..9f0f98fe5 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
@@ -12,9 +12,6 @@
 
 		<split id="split1">
 
-			<next on="FAILED" to="s3"/>
-			<fail on="COMPLETED" />
-
 			<flow>
 				<step id="s1" ref="step1"/>
 			</flow>
@@ -23,6 +20,9 @@
 				<step id="fail" ref="failingStep"/>
 			</flow>
 
+			<next on="FAILED" to="s3"/>
+			<fail on="COMPLETED" />
+
 		</split>
 
 		<step id="s3" ref="step3"/>