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

[Christian Bauer]

  User: cbauer  
  Date: 07/06/12 08:50:38

  Modified:    examples/wiki/src/etc/WEB-INF   urlrewrite.xml pages.xml
  Log:
  JBSEAM-952
  
  Revision  Changes    Path
  1.3       +1 -1      jboss-seam/examples/wiki/src/etc/WEB-INF/urlrewrite.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: urlrewrite.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/urlrewrite.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- urlrewrite.xml	2 Apr 2007 18:25:06 -0000	1.2
  +++ urlrewrite.xml	12 Jun 2007 12:50:38 -0000	1.3
  @@ -16,7 +16,7 @@
        </rule>
   
       <rule>
  -        <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)$</from>
  +        <from casesensitive="true">^/([A-Za-z0-9]+[A-Za-z0-9]*)$</from>
           <to last="true">/display.seam?areaName=$1</to>
       </rule>
   
  
  
  
  1.18      +6 -0      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.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- pages.xml	12 Jun 2007 12:30:01 -0000	1.17
  +++ pages.xml	12 Jun 2007 12:50:38 -0000	1.18
  @@ -13,6 +13,12 @@
           <end-conversation/>
   
           <navigation>
  +            <rule if-outcome="search">
  +                <redirect view-id="/search.xhtml">
  +                    <param name="conversationPropagation" value="#{'none'}"/>
  +                    <param name="lastConversationId" value="#{conversation.id}"/>
  +                </redirect>
  +            </rule>
               <rule if="#{!empty currentDocument}">
                   <render view-id="/docDisplay.xhtml"/>
               </rule>