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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/15 20:40:42

  Modified:    examples/wiki/src/etc/WEB-INF   urlrewrite.xml
                        components.xml
  Log:
  JBSEAM-2486 - Implemented FAQ browser plugin
  
  Revision  Changes    Path
  1.15      +3 -3      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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- urlrewrite.xml	14 Jan 2008 05:10:45 -0000	1.14
  +++ urlrewrite.xml	16 Jan 2008 01:40:42 -0000	1.15
  @@ -44,10 +44,10 @@
           <to last="true">/servlets/files/download.seam?fileId=$1</to>
       </rule>
   
  -    <!-- /Foo (/Bar) (/Year/2007 (/Month/08) (/Day/23) (/Page/3) (/Tag/foobar) -->
  +    <!-- /Foo (/Bar) (/Year/2007 (/Month/08) (/Day/23) (/Page/3) (/Tag/foobar) (/Category/foobar) -->
       <rule>
  -        <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)(?:/([A-Z0-9]+[A-Za-z0-9]*))?(?:/Year/([0-9]{4}))?(?:/Month/([0-9]{2}))?(?:/Day/([0-9]{2}))?(?:/Page/([0-9]+))?(?:/Tag/(.+))?$</from>
  -        <to>/wiki.seam?areaName=$1&amp;nodeName=$2&amp;year=$3&amp;month=$4&amp;day=$5&amp;page=$6&amp;tag=$7</to>
  +        <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)(?:/([A-Z0-9]+[A-Za-z0-9]*))?(?:/Year/([0-9]{4}))?(?:/Month/([0-9]{2}))?(?:/Day/([0-9]{2}))?(?:/Page/([0-9]+))?(?:/Tag/(.+))?(?:/Category/(.+))?$</from>
  +        <to>/wiki.seam?areaName=$1&amp;nodeName=$2&amp;year=$3&amp;month=$4&amp;day=$5&amp;page=$6&amp;tag=$7&amp;category=$8</to>
       </rule>
   
       <!-- /Foo (/Bar) (/Year/2007) (/Month/08) (/Day/23) /Summary -->
  
  
  
  1.38      +6 -1      jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- components.xml	14 Jan 2008 05:10:45 -0000	1.37
  +++ components.xml	16 Jan 2008 01:40:42 -0000	1.38
  @@ -115,12 +115,13 @@
               <value>messages_forum</value>
               <value>messages_flash</value>
               <value>messages_docPager</value>
  +            <value>messages_faqBrowser</value>
           </core:bundle-names>
       </core:resource-loader>
   
       <!-- Misc Settings -->
   
  -    <web:context-filter url-pattern="/service/*"/>
  +    <web:context-filter regex-url-pattern="/(service|servlets)/.+"/>
   
       <component name="wikiUrlRewriteFilter" class="org.jboss.seam.wiki.core.ui.WikiUrlRewriteFilter" precedence="30">
           <property name="initParameters">
  @@ -145,6 +146,10 @@
   
       <factory name="themePath" scope="CONVERSATION" value="#{basePath}/themes/#{preferences.get('Wiki').themeName}"/>
   
  +    <factory name="themePathGetRequest" scope="CONVERSATION"
  +             value="#{servletContexts.request.scheme}://#{servletContexts.request.serverName
  +                     }:#{servletContexts.request.serverPort}#{servletContexts.request.contextPath}/themes/#{preferences.get('Wiki').themeName}"/>
  +
       <factory name="skin" scope="SESSION" value="d"/>
   
       <factory name="sessionTimeoutSeconds" scope="SESSION"