From ee9d8e379c689ebce3287a881eb7964a6561fb95 Mon Sep 17 00:00:00 2001
From: dhgarrette <dhgarrette@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 12 Mar 2009 22:14:27 +0000
Subject: [PATCH] RESOLVED - BATCH-1142: In the xsd, <listeners/> should be
 moved from "flowType" to "job"

---
 .../core/configuration/xml/spring-batch-2.0.xsd     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 632c01123..72ba2d205 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
@@ -25,6 +25,7 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="flowType">
+					<xsd:group ref="jobListeners"/>
 					<xsd:attribute name="id" type="xsd:ID" use="required" />
 					<xsd:attributeGroup ref="jobRepositoryAttribute" />
 					<xsd:attribute name="incrementer" type="xsd:string" use="optional">
@@ -262,6 +263,11 @@
 					</xsd:complexType>
 				</xsd:element>			
 			</xsd:choice>
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:group name="jobListeners">
+		<xsd:sequence>
 			<xsd:element name="listeners" minOccurs="0" maxOccurs="1">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -271,8 +277,7 @@
 				</xsd:annotation>
 				<xsd:complexType>
 					<xsd:sequence>
-						<xsd:element name="listener" minOccurs="1"
-							maxOccurs="unbounded">
+						<xsd:element name="listener" minOccurs="1" maxOccurs="unbounded">
 							<xsd:complexType>
 								<xsd:attribute name="id" type="xsd:ID" />
 								<xsd:attribute name="ref" type="xsd:string">
@@ -314,8 +319,8 @@
 				</xsd:complexType>
 			</xsd:element>
 		</xsd:sequence>
-	</xsd:complexType>
-	
+	</xsd:group>
+
 	<xsd:complexType name="stepType">
 		<xsd:sequence>
 			<xsd:element name="tasklet" type="taskletType" minOccurs="0" maxOccurs="1"/>