From bd23c675bb2e3a3237204bb51beea5f1cc3f3187 Mon Sep 17 00:00:00 2001
From: dhgarrette <dhgarrette@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 12 Mar 2009 22:35:16 +0000
Subject: [PATCH] BATCH-1132: BATCH-1138:   extracted "parent" and "abstract"
 attributes into reusable attributeGroups

---
 .../configuration/xml/spring-batch-2.0.xsd    | 59 ++++++++-----------
 1 file changed, 23 insertions(+), 36 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 72ba2d205..3005d8de2 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
@@ -47,29 +47,8 @@
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="parent" type="xsd:string" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								The name of the parent job from which the configuration should inherit.
-							</xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref"/>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="abstract" type="xsd:boolean" default="false" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								Is this bean "abstract", that is, not meant to be instantiated itself
-								but rather just serving as parent for concrete child bean definitions?
-								The default is "false". Specify "true" to tell the bean factory to not
-								try to instantiate that particular bean in any case.
-							
-								Note: This attribute will not be inherited by child bean definitions.
-								Hence, it needs to be specified per abstract bean definition.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
+					<xsd:attributeGroup ref="parentAttribute"/>
+					<xsd:attributeGroup ref="abstractAttribute"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -90,19 +69,7 @@
 					<xsd:attribute name="id" type="xsd:ID" use="required" />
 					<xsd:attributeGroup ref="jobRepositoryAttribute"/>
 					<xsd:attributeGroup ref="stepAttributes"/>
-					<xsd:attribute name="abstract" type="xsd:boolean" default="false" use="optional">
-						<xsd:annotation>
-							<xsd:documentation>
-								Is this bean "abstract", that is, not meant to be instantiated itself
-								but rather just serving as parent for concrete child bean definitions?
-								The default is "false". Specify "true" to tell the bean factory to not
-								try to instantiate that particular bean in any case.
-							
-								Note: This attribute will not be inherited by child bean definitions.
-								Hence, it needs to be specified per abstract bean definition.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
+					<xsd:attributeGroup ref="abstractAttribute"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -805,6 +772,10 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attributeGroup ref="parentAttribute"/>
+	</xsd:attributeGroup>
+
+	<xsd:attributeGroup name="parentAttribute">
 		<xsd:attribute name="parent" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation>
@@ -817,4 +788,20 @@
 		</xsd:attribute>
 	</xsd:attributeGroup>
 
+	<xsd:attributeGroup name="abstractAttribute">
+		<xsd:attribute name="abstract" type="xsd:boolean" default="false" use="optional">
+			<xsd:annotation>
+				<xsd:documentation>
+					Is this bean "abstract", that is, not meant to be instantiated itself
+					but rather just serving as parent for concrete child bean definitions?
+					The default is "false". Specify "true" to tell the bean factory to not
+					try to instantiate that particular bean in any case.
+				
+					Note: This attribute will not be inherited by child bean definitions.
+					Hence, it needs to be specified per abstract bean definition.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
 </xsd:schema>
\ No newline at end of file