[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Peter Muir]

  User: pmuir   
  Date: 07/03/09 15:00:45

  Modified:    src/main/org/jboss/seam  pageflow-1.2.xsd
  Log:
  Remove node element, ws
  
  Revision  Changes    Path
  1.3       +19 -32    jboss-seam/src/main/org/jboss/seam/pageflow-1.2.xsd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pageflow-1.2.xsd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pageflow-1.2.xsd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- pageflow-1.2.xsd	6 Mar 2007 22:01:20 -0000	1.2
  +++ pageflow-1.2.xsd	9 Mar 2007 20:00:45 -0000	1.3
  @@ -36,7 +36,7 @@
   	<xs:element name="start-page">
   		<xs:complexType>
   			<xs:choice minOccurs="0" maxOccurs="unbounded">
				<xs:group ref="page-elements" />
  -			</xs:choice>
			<xs:attributeGroup ref="page-attributes"></xs:attributeGroup>
  +			</xs:choice>
			<xs:attributeGroup ref="page-attributes" />
   		</xs:complexType>
   	</xs:element>
   
  @@ -75,27 +75,17 @@
   		</xs:complexType>
   	</xs:element>
   
  -	<xs:element name="node">
  +	<xs:element name="page">
   		<xs:complexType>
  -			<xs:sequence>
  -				<xs:choice minOccurs="0">
  -					<xs:group ref="action-elements" />
  +			<xs:sequence>
				<xs:group ref="page-elements" />
  +				<xs:choice minOccurs="0" maxOccurs="1">
  +					<xs:element ref="end-conversation" />
   				</xs:choice>
  -				<xs:choice minOccurs="0" maxOccurs="unbounded">
  -					<xs:group ref="node-content-elements" />
  +				<xs:choice minOccurs="0" maxOccurs="1">
  +					<xs:element ref="end-task" />
   				</xs:choice>
   			</xs:sequence>
  -			<xs:attribute name="name" type="xs:string" use="required" />
  -		</xs:complexType>
  -	</xs:element>
  -
  -	<xs:element name="page">
  -		<xs:complexType>
  -			<xs:sequence>
				<xs:group ref="page-elements"></xs:group>
  -				<xs:choice minOccurs="0" maxOccurs="1"><xs:element ref="end-conversation"></xs:element></xs:choice>
  -				<xs:choice minOccurs="0" maxOccurs="1"><xs:element ref="end-task"></xs:element></xs:choice>
  -			</xs:sequence>
  -			<xs:attributeGroup ref="page-attributes"></xs:attributeGroup>
  +			<xs:attributeGroup ref="page-attributes" />
   		</xs:complexType>
   	</xs:element>
   
  @@ -103,14 +93,14 @@
   	<xs:element name="description" type="xs:string" />
   
   	<xs:element name="end-conversation">
  -		<xs:complexType>

			<xs:attribute name="before-redirect" type="booleanType"></xs:attribute>
  -			<xs:attribute name="create-process" type="xs:string"></xs:attribute>
  +		<xs:complexType>
			<xs:attribute name="before-redirect" type="booleanType" />
  +			<xs:attribute name="create-process" type="xs:string" />
   		</xs:complexType>
   	</xs:element>
   
   	<xs:element name="end-task">
   		<xs:complexType>
  -			<xs:attribute name="transition" type="xs:string"></xs:attribute>
  +			<xs:attribute name="transition" type="xs:string" />
   		</xs:complexType>
   	</xs:element>
   
  @@ -267,11 +257,8 @@
   
   	<xs:group name="node-elements">
   		<xs:choice>
  -			<xs:element ref="node" />
   			<xs:element ref="page" />
   			<xs:element ref="decision" />
  -			<xs:element ref="page" />
  -			<xs:element ref="node" />
   		</xs:choice>
   	</xs:group>
   
  @@ -306,12 +293,12 @@
   	</xs:group>
   
   	<xs:attributeGroup name="page-attributes">
  -		<xs:attribute name="redirect" type="booleanType"></xs:attribute>
  -		<xs:attribute name="switch" type="enabledType"></xs:attribute>
  -		<xs:attribute name="no-conversation-view-id" type="xs:string"></xs:attribute>
  -		<xs:attribute name="timeout" type="xs:int"></xs:attribute>
  -		<xs:attribute name="back" type="enabledType"></xs:attribute>
  -		<xs:attribute name="view-id" type="xs:string" use="required"></xs:attribute>
  -		<xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
  +		<xs:attribute name="redirect" type="booleanType" />
  +		<xs:attribute name="switch" type="enabledType" />
  +		<xs:attribute name="no-conversation-view-id" type="xs:string" />
  +		<xs:attribute name="timeout" type="xs:int" />
  +		<xs:attribute name="back" type="enabledType" />
  +		<xs:attribute name="view-id" type="xs:string" use="required" />
  +		<xs:attribute name="name" type="xs:string" use="required" />
   	</xs:attributeGroup>
   </xs:schema>