[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...

[Christian Bauer]

  User: cbauer  
  Date: 07/06/13 07:44:48

  Modified:    examples/wiki/src/etc/WEB-INF  pages.xml
  Log:
  Minor
  
  Revision  Changes    Path
  1.19      +11 -6     jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- pages.xml	12 Jun 2007 12:50:38 -0000	1.18
  +++ pages.xml	13 Jun 2007 11:44:48 -0000	1.19
  @@ -165,8 +165,8 @@
                the entry point after remove(), e.g. editDoc -> uploadFile -> editDoc instead of currently
                editDoc -> uploadFile -> dirDisplay... This needs navigation actions or the
                already required polymorphic exitConversation() feature -->
  -        <navigation from-action="#{fileHome.remove}">
  -            <rule>
  +        <navigation>
  +            <rule if-outcome="removed">
                   <end-conversation/>
                   <redirect view-id="/dirDisplay.xhtml">
                       <param name="nodeId" value="#{fileHome.parentDirectory.id}"/>
  @@ -197,9 +197,7 @@
           <description>Registration</description>
           <navigation from-action="#{userHome.persist}">
               <rule>
  -                <redirect view-id="/userHome.xhtml">
  -                    <param name="userId" value="#{userHome.instance.id}"/>
  -                </redirect>
  +                <redirect view-id="/display.xhtml"/>
               </rule>
           </navigation>
       </page>
  @@ -321,7 +319,14 @@
               <message severity="ERROR">Someone modified the same record while you were editing it. Please restart your workspace.</message>
           </redirect>
       </exception>
  -<!--
  +
  +    <exception class="org.jboss.seam.web.FileUploadException">
  +        <redirect view-id="/message.xhtml">
  +            <message severity="ERROR">File upload failed, possibly due to size limitation (max. #{wiki:displayFilesize(org.jboss.seam.web.multipartFilter.maxRequestSize)}).</message>
  +        </redirect>
  +    </exception>
  +
  +    <!--
       <exception>
           <end-conversation/>
           <redirect view-id="/message.xhtml">