Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - issue SWF-545: Add support for merging a state in one flow model with a state in another

Browse Source 
http://jira.springframework.org/browse/SWF-545

Added type enforcement for the parent attribute on states to match pattern .*#.*
This commit is contained in:
Scott Andrews
2008-03-24 16:00:45 +00:00
parent 03bb8c4863
commit c39f75bc07
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
View File

@@ -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">