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

[Gavin King]

  User: gavin   
  Date: 06/12/19 16:06:29

  Modified:    src/main/org/jboss/seam  pages-1.1.dtd
  Log:
  renames
  
  Revision  Changes    Path
  1.14      +8 -8      jboss-seam/src/main/org/jboss/seam/pages-1.1.dtd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages-1.1.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages-1.1.dtd,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- pages-1.1.dtd	19 Dec 2006 00:51:12 -0000	1.13
  +++ pages-1.1.dtd	19 Dec 2006 21:06:29 -0000	1.14
  @@ -9,7 +9,7 @@
   <!ELEMENT pages (page*)>
   <!ATTLIST pages no-conversation-view-id CDATA #IMPLIED>
   
  -<!ELEMENT page (#PCDATA|description|param|in|begin-conversation|end-conversation|action|action-navigation)*>
  +<!ELEMENT page (#PCDATA|description|param|in|begin-conversation|end-conversation|action|navigation)*>
   <!ATTLIST page action CDATA #IMPLIED>
   <!ATTLIST page view-id CDATA #IMPLIED>
   <!ATTLIST page switch (enabled|disabled) "enabled">
  @@ -28,13 +28,13 @@
   <!ATTLIST action if CDATA #IMPLIED>
   <!ATTLIST action execute CDATA #REQUIRED>
   
  -<!ELEMENT action-navigation (((begin-conversation|end-conversation)?,(out*),(render|redirect))|(outcome*))>
  -<!ATTLIST action-navigation from-action CDATA #IMPLIED>
  -<!ATTLIST action-navigation evaluate CDATA #IMPLIED>
  -
  -<!ELEMENT outcome ((begin-conversation|end-conversation)?,(out*),(render|redirect))>
  -<!ATTLIST outcome if-value CDATA #IMPLIED>
  -<!ATTLIST outcome if CDATA #IMPLIED>
  +<!ELEMENT navigation (((begin-conversation|end-conversation)?,(out*),(render|redirect))|(rule*))>
  +<!ATTLIST navigation from-action CDATA #IMPLIED>
  +<!ATTLIST navigation evaluate CDATA #IMPLIED>
  +
  +<!ELEMENT rule ((begin-conversation|end-conversation)?,(out*),(render|redirect))>
  +<!ATTLIST rule if-outcome CDATA #IMPLIED>
  +<!ATTLIST rule if CDATA #IMPLIED>
   
   <!ELEMENT begin-conversation EMPTY>
   <!ATTLIST begin-conversation join (true|false) "false">