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 3144ee024..daf5ad253 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
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/batch"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:tool="http://www.springframework.org/schema/tool"
-	targetNamespace="http://www.springframework.org/schema/batch"
-	elementFormDefault="qualified" attributeFormDefault="unqualified"
+<xsd:schema xmlns="http://www.springframework.org/schema/batch" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool"
+	targetNamespace="http://www.springframework.org/schema/batch" elementFormDefault="qualified" attributeFormDefault="unqualified"
 	version="2.0">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" />
@@ -20,7 +18,8 @@
 			<xsd:documentation>
 				Defines a job composed of a set of steps and
 				transitions between steps. The job will be exposed
-				in the enclosing
+				in
+				the enclosing
 				bean factory as a component of type Job
 				that can be launched using a
 				JobLauncher.
@@ -31,8 +30,7 @@
 				<xsd:extension base="flowType">
 					<xsd:attribute name="id" type="xsd:ID" use="required" />
 					<xsd:attributeGroup ref="jobRepository" />
-					<xsd:attribute name="incrementer" type="xsd:string"
-						use="optional">
+					<xsd:attribute name="incrementer" type="xsd:string" use="optional">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[ 
 								A reference to a JobParametersIncrementer bean definition.
@@ -40,8 +38,7 @@
 							</xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="restartable" type="xsd:string"
-						default="true" use="optional">
+					<xsd:attribute name="restartable" type="xsd:string" default="true" use="optional">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 							Whether the job should be retartable or not in case of failure.
@@ -62,8 +59,7 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="beans:identifiedType">
-					<xsd:attribute name="data-source" type="xsd:string"
-						default="dataSource">
+					<xsd:attribute name="data-source" type="xsd:string" default="dataSource">
 						<xsd:annotation>
 							<xsd:documentation source="java:javax.sql.DataSource"><![CDATA[
 							The bean name of the DataSource that is to be used. This attribute 
@@ -78,8 +74,7 @@
 						</xsd:annotation>
 					</xsd:attribute>
 					<xsd:attributeGroup ref="transactionManager" />
-					<xsd:attribute name="isolation-level-for-create"
-						type="xsd:string">
+					<xsd:attribute name="isolation-level-for-create" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 							The isolation level to use for creation of job execution entities.
@@ -111,13 +106,15 @@
 							Defines a stage in job processing backed by a
 							Step.
 							The name attribute must be specified and
-							can match the id of
+							can
+							match the id of
 							a bean
 							definition
 							for a Step. If it does not, then you must provide
 							a
 							tasklet definition.
-							The next attribute is a synonym for &lt;next on="*" .../&gt;
+							The next
+							attribute is a synonym for &lt;next on="*" .../&gt;
 						</xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -219,7 +216,18 @@
 										</xsd:appinfo>
 									</xsd:annotation>
 								</xsd:attribute>
-								<xsd:attribute name="class" type="xsd:string" />
+								<xsd:attribute name="class" type="xsd:string">
+									<xsd:annotation>
+										<xsd:documentation>
+										A class name used to create a listener.
+										</xsd:documentation>
+										<xsd:appinfo>
+											<tool:annotation kind="direct">
+												<tool:expected-type type="java.lang.Class" />
+											</tool:annotation>
+										</xsd:appinfo>
+									</xsd:annotation>
+								</xsd:attribute>
 								<xsd:attribute name="before-method" type="xsd:string" />
 								<xsd:attribute name="after-method" type="xsd:string" />
 							</xsd:complexType>