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

[Gavin King]

  User: gavin   
  Date: 06/12/16 19:25:14

  Modified:    src/main/org/jboss/seam  pages-1.1.dtd
  Log:
  JBSEAM-605, navigation in pages.xml
  make s:link action trigger navigation even if outcome is null (but not page actions)
  
  Revision  Changes    Path
  1.7       +19 -2     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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- pages-1.1.dtd	16 Dec 2006 14:37:37 -0000	1.6
  +++ pages-1.1.dtd	17 Dec 2006 00:25:14 -0000	1.7
  @@ -9,7 +9,7 @@
   <!ELEMENT pages (page*)>
   <!ATTLIST pages no-conversation-view-id CDATA #IMPLIED>
   
  -<!ELEMENT page (#PCDATA|param|end-conversation|begin-conversation)*>
  +<!ELEMENT page (#PCDATA|description|param|end-conversation|begin-conversation|navigation)*>
   <!ATTLIST page action CDATA #IMPLIED>
   <!ATTLIST page view-id CDATA #IMPLIED>
   <!ATTLIST page switch (enabled|disabled) "enabled">
  @@ -24,10 +24,27 @@
   <!ATTLIST param converter CDATA #IMPLIED>
   <!ATTLIST param converterId CDATA #IMPLIED>
   
  -<!ELEMENT end-conversation EMPTY>
  +<!ELEMENT navigation (case*,default?)>
  +<!ATTLIST navigation action CDATA #IMPLIED>
  +<!ATTLIST navigation outcome CDATA #IMPLIED>
  +
  +<!ELEMENT case ((begin-conversation|end-conversation)?,(render|redirect))>
  +<!ATTLIST case outcome CDATA #REQUIRED>
  +
  +<!ELEMENT default ((begin-conversation|end-conversation)?,(render|redirect))>
   
   <!ELEMENT begin-conversation EMPTY>
   <!ATTLIST begin-conversation join (true|false) "false">
   <!ATTLIST begin-conversation nested (true|false) "false">
   <!ATTLIST begin-conversation pageflow CDATA #IMPLIED>
   <!ATTLIST begin-conversation flush-mode (manual|auto|commit|MANUAL|AUTO|COMMIT) #IMPLIED>
  +
  +<!ELEMENT end-conversation EMPTY>
  +
  +<!ELEMENT render EMPTY>
  +<!ATTLIST render view-id CDATA #IMPLIED>
  +
  +<!ELEMENT redirect EMPTY>
  +<!ATTLIST redirect view-id CDATA #IMPLIED>
  +
  +<!ELEMENT description (#PCDATA)>