From cf062493e2efef78ab8f31d663cd0d34fe93b94c Mon Sep 17 00:00:00 2001
From: dhgarrette <dhgarrette@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 13 Mar 2009 23:29:26 +0000
Subject: [PATCH] BATCH-1153: Removed "id" from all <listener/> elements. 
 <job-listener/> and <step-listener/> have an optional "id" since no id needed
 when defined within a bean.

---
 .../batch/core/configuration/xml/spring-batch-2.0.xsd    | 9 ++++++---
 .../src/main/resources/jobs/skipSampleJob.xml            | 2 +-
 2 files changed, 7 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 71b8023c7..eab4b3526 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
@@ -88,7 +88,9 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="jobExecutionListenerType" />
+				<xsd:extension base="jobExecutionListenerType">
+					<xsd:attribute name="id" type="xsd:ID" use="optional" />
+				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
@@ -102,7 +104,9 @@
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="stepListenerType" />
+				<xsd:extension base="stepListenerType">
+					<xsd:attribute name="id" type="xsd:ID" use="optional" />
+				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
@@ -539,7 +543,6 @@
 	</xsd:complexType>
 
 	<xsd:complexType name="listenerType">
-		<xsd:attribute name="id" type="xsd:ID" />
 		<xsd:attribute name="ref" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation>
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index cc3d0c4da..b31173d45 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -48,7 +48,7 @@
 	
 	<step id="baseStep" abstract="true">
 		<listeners>
-			<listener id="skipCheckingListener" class="org.springframework.batch.sample.common.SkipCheckingListener"/>
+			<listener class="org.springframework.batch.sample.common.SkipCheckingListener"/>
 			<listener ref="promotionListener"/>
 		</listeners>
 	</step>