From 43e2712e3ff63d999ed6b3fc47aa4bfe93e0b12f Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@vmware.com>
Date: Mon, 14 Apr 2008 19:35:59 +0000
Subject: [PATCH] IN PROGRESS - issue SWF-597: Allow bind attribute on global
 transitions http://jira.springframework.org/browse/SWF-597

---
 .../model/builder/xml/spring-webflow-2.0.xsd  | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 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 49b5bbb4..935e6d4d 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
@@ -351,7 +351,7 @@ Actions to execute immediately before view rendering.
 										<xsd:group ref="actionTypes" maxOccurs="unbounded" />
 									</xsd:complexType>
 								</xsd:element>
-								<xsd:element name="transition" minOccurs="0" maxOccurs="unbounded">
+								<xsd:element name="transition" type="bindableTransition" minOccurs="0" maxOccurs="unbounded">
 									<xsd:annotation>
 										<xsd:documentation>
 											<![CDATA[
@@ -361,21 +361,6 @@ If no transition target is specified, the transition acts as a simple event hand
 ]]>
 										</xsd:documentation>
 									</xsd:annotation>
-									<xsd:complexType>
-										<xsd:complexContent>
-											<xsd:extension base="transition">
-												<xsd:attribute name="bind" type="xsd:boolean">
-													<xsd:annotation>
-														<xsd:documentation>
-															<![CDATA[
-Indicates whether model binding should occur before this transition executes. Defaults to true.
-								]]>
-														</xsd:documentation>
-													</xsd:annotation>
-												</xsd:attribute>
-											</xsd:extension>
-										</xsd:complexContent>
-									</xsd:complexType>
 								</xsd:element>
 								<xsd:element name="on-exit" minOccurs="0">
 									<xsd:annotation>
@@ -940,7 +925,7 @@ Transitions shared by all states and eligible for execution if no transition ass
 					</xsd:annotation>
 					<xsd:complexType>
 						<xsd:sequence>
-							<xsd:element name="transition" type="transition" maxOccurs="unbounded">
+							<xsd:element name="transition" type="bindableTransition" maxOccurs="unbounded">
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
@@ -1420,6 +1405,22 @@ If no value is specified, this transition acts as a simple event handler and wil
 		</xsd:attribute>
 	</xsd:complexType>
 	
+	<xsd:complexType name="bindableTransition">
+		<xsd:complexContent>
+			<xsd:extension base="transition">
+				<xsd:attribute name="bind" type="xsd:boolean">
+					<xsd:annotation>
+						<xsd:documentation>
+							<![CDATA[
+Indicates whether model binding should occur before this transition executes. Defaults to true.
+							]]>
+						</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
 	<xsd:complexType name="exception-handler">
 		<xsd:attribute name="bean" type="beanName" use="required">
 			<xsd:annotation>