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

[Christian Bauer]

  User: cbauer  
  Date: 07/04/08 11:10:31

  Modified:    examples/wiki/src/etc/WEB-INF    components.xml pages.xml
                        web.xml
  Log:
  Implemented Atom feeds for site and directories
  
  Revision  Changes    Path
  1.8       +2 -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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- components.xml	2 Apr 2007 18:25:06 -0000	1.7
  +++ components.xml	8 Apr 2007 15:10:31 -0000	1.8
  @@ -81,7 +81,8 @@
                          remember-me="false"/>
   
       <!-- Misc Settings -->
  -    <web:context-filter url-pattern="/files/*"/>
  +    
  +    <web:context-filter url-pattern="/servlets/*"/>
   
       <factory name="themePath" scope="APPLICATION"
                value="#{facesContext.externalContext.request.contextPath}/themes/#{wikiPreferences.themeName}"/>
  
  
  
  1.10      +8 -9      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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- pages.xml	5 Apr 2007 14:38:24 -0000	1.9
  +++ pages.xml	8 Apr 2007 15:10:31 -0000	1.10
  @@ -63,14 +63,13 @@
       <page view-id="/docEdit.xhtml">
           <description>Edit Document</description>
   
  -        <navigation from-action="#{documentHome.remove}">
  +        <navigation>
  +            <rule if-outcome="removed">
               <end-conversation/>
  -            <redirect view-id="/display.xhtml">
  +                <redirect view-id="/dirDisplay.xhtml">
                   <param name="nodeId" value="#{documentHome.parentDirectory.id}"/>
               </redirect>
  -        </navigation>
  -
  -        <navigation>
  +            </rule>
               <rule if-outcome="uploadFile">
                   <begin-conversation flush-mode="MANUAL"/>
                   <redirect view-id="/fileEdit.xhtml">
  @@ -144,8 +143,8 @@
       <page view-id="/dirEdit.xhtml">
           <description>Edit Directory</description>
   
  -        <navigation from-action="#{directoryHome.remove}">
  -            <rule>
  +        <navigation>
  +            <rule if-outcome="removed">
                   <end-conversation/>
                   <redirect view-id="/dirDisplay.xhtml">
                       <param name="nodeId" value="#{directoryHome.parentDirectory.id}"/>
  
  
  
  1.5       +18 -5     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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- web.xml	2 Apr 2007 18:25:06 -0000	1.4
  +++ web.xml	8 Apr 2007 15:10:31 -0000	1.5
  @@ -110,15 +110,21 @@
       </servlet>
       <servlet-mapping>
           <servlet-name>File Servlet</servlet-name>
  -        <url-pattern>/files/*</url-pattern>
  +        <url-pattern>/servlets/files/*</url-pattern>
       </servlet-mapping>
   
  -    <session-config>
  -        <session-timeout>10</session-timeout> 
  -    </session-config>
  +    <!-- Wiki: Feed Servlet -->
   
  -    <!-- URL Rewrite -->
  +    <servlet>
  +        <servlet-name>Feed Servlet</servlet-name>
  +        <servlet-class>org.jboss.seam.wiki.core.ui.FeedServlet</servlet-class>
  +    </servlet>
  +    <servlet-mapping>
  +        <servlet-name>Feed Servlet</servlet-name>
  +        <url-pattern>/servlets/feeds/*</url-pattern>
  +    </servlet-mapping>
   
  +    <!-- URL Rewrite -->
       <filter>
            <filter-name>UrlRewriteFilter</filter-name>
            <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
  @@ -136,4 +142,11 @@
            <url-pattern>/*</url-pattern>
        </filter-mapping>
   
  +    <!-- Misc Settings -->
  +
  +    <session-config>
  +        <session-timeout>10</session-timeout>
  +    </session-config>
  +
  +
   </web-app>