From c39f75bc07d5141d508627059db52ca7a52cee2f Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Mon, 24 Mar 2008 16:00:45 +0000
Subject: [PATCH] RESOLVED - issue SWF-545: Add support for merging a state in
 one flow model with a state in another
 http://jira.springframework.org/browse/SWF-545

Added type enforcement for the parent attribute on states to match pattern .*#.*
---
 .../model/builder/xml/spring-webflow-2.0.xsd     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
index 92263077..6d915f0e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
@@ -280,7 +280,7 @@ The unique identifier of this state; must be unique to this flow.
 									</xsd:documentation>
 								</xsd:annotation>
 							</xsd:attribute>
-							<xsd:attribute name="parent" type="xsd:string">
+							<xsd:attribute name="parent" type="stateParent">
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
@@ -443,7 +443,7 @@ The unique identifier of this state; must be unique to this flow.
 									</xsd:documentation>
 								</xsd:annotation>
 							</xsd:attribute>
-							<xsd:attribute name="parent" type="xsd:string">
+							<xsd:attribute name="parent" type="stateParent">
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
@@ -643,7 +643,7 @@ The unique identifier of this state; must be unique to this flow.
 									</xsd:documentation>
 								</xsd:annotation>
 							</xsd:attribute>
-							<xsd:attribute name="parent" type="xsd:string">
+							<xsd:attribute name="parent" type="stateParent">
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
@@ -760,7 +760,7 @@ The unique identifier of this state; must be unique to this flow.
 									</xsd:documentation>
 								</xsd:annotation>
 							</xsd:attribute>
-							<xsd:attribute name="parent" type="xsd:string">
+							<xsd:attribute name="parent" type="stateParent">
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
@@ -866,7 +866,7 @@ The unique identifier of this state; must be unique to this flow.
 									</xsd:documentation>
 								</xsd:annotation>
 							</xsd:attribute>
-							<xsd:attribute name="parent" type="xsd:string">
+							<xsd:attribute name="parent" type="stateParent">
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
@@ -1066,6 +1066,12 @@ A comma separated list of flow identifier for this flow to inherit from.
 		<xsd:restriction base="xsd:string"/>
 	</xsd:simpleType>
 	
+	<xsd:simpleType name="stateParent">
+		<xsd:restriction base="xsd:string">
+			<xsd:pattern value=".*#.*"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	
 	<xsd:group name="actionTypes">
 		<xsd:choice>
 			<xsd:element name="evaluate">