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

[Christian Bauer]

  User: cbauer  
  Date: 07/06/12 08:30:01

  Modified:    examples/wiki/src/etc/WEB-INF   web.xml pages.xml
  Log:
  Completed first iteration of search engine
  
  Revision  Changes    Path
  1.11      +7 -2      jboss-seam/examples/wiki/src/etc/WEB-INF/web.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: web.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/web.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- web.xml	30 May 2007 00:37:16 -0000	1.10
  +++ web.xml	12 Jun 2007 12:30:01 -0000	1.11
  @@ -62,6 +62,11 @@
         <param-value>false</param-value>
      </context-param>
   
  +    <context-param>
  +        <param-name>facelets.SKIP_COMMENTS</param-name>
  +        <param-value>true</param-value>
  +    </context-param>
  +
       <!-- JSF -->
   
       <context-param>
  
  
  
  1.17      +5 -7      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.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- pages.xml	9 Jun 2007 02:19:30 -0000	1.16
  +++ pages.xml	12 Jun 2007 12:30:01 -0000	1.17
  @@ -171,9 +171,9 @@
       </page>
   
       <page view-id="/search.xhtml" action="#{browser.captureConversationEntryPoint}">
  -        <param name="query" value="#{nodeSearch.query}"/>
  -        <begin-conversation join="true"/>
  -        <description>Search</description>
  +        <param name="query" value="#{wikiSearch.simpleQuery}"/>
  +        <!-- Conversation is started in wikiSearch.search() action/factory -->
  +        <description>Search (Results: #{searchResult.size})</description>
       </page>
   
       <page view-id="/userHome.xhtml" action="#{browser.captureConversationEntryPoint}">
  @@ -199,7 +199,7 @@
       </page>
   
       <page view-id="/userList.xhtml" action="#{browser.captureConversationEntryPoint}">
  -        <description>Searching Members (Results: #{userSearch.rowCount})</description>
  +        <description>Member Search (Results: #{userSearch.rowCount})</description>
           <navigation>
               <rule if-outcome="createUser">
                   <begin-conversation flush-mode="MANUAL"/>
  @@ -262,8 +262,7 @@
                   </redirect>
               </rule>
   
  -
  -            <!-- Click on 'Find' starts a new root conversation -->
  +            <!-- 'Find' postback starts a new root conversation, see /search.xhtml -->
               <rule if-outcome="search">
                   <redirect view-id="/search.xhtml">
                       <param name="conversationPropagation" value="#{'none'}"/>
  @@ -271,7 +270,6 @@
                   </redirect>
               </rule>
   
  -
               <rule if-outcome="error">
                   <redirect view-id="/message.xhtml">
                       <message severity="ERROR">An unrecoverable error occured!</message>