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

[Christian Bauer]

  User: cbauer  
  Date: 07/09/06 11:54:27

  Modified:    examples/wiki/src/etc/WEB-INF   urlrewrite.xml pages.xml
  Log:
  Creator/history footer on documents
  
  Revision  Changes    Path
  1.8       +6 -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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- urlrewrite.xml	4 Sep 2007 09:33:18 -0000	1.7
  +++ urlrewrite.xml	6 Sep 2007 15:54:27 -0000	1.8
  @@ -14,6 +14,9 @@
       <rule>
           <from>.*</from>
           <condition next="or" name="user-agent">Windows CE</condition>
  +        <!-- iPhone looks better with regular skin
  +        <condition next="or" name="user-agent">iPhone</condition>
  +        -->
           <condition name="user-agent">BlackBerry</condition>
           <set type="session" name="skin">m</set>
       </rule>
  @@ -97,7 +100,7 @@
       </rule>
   
   
  -    <!-- Blosxom migration from blog.hibernate.org, the best we can do:
  +    <!-- Blosxom migration from blog.hibernate.org, the best we can do (you probably can delete all of this):
   
           http://blog.hibernate.org/cgi-bin/blosxom.cgi
           http://blog.hibernate.org/cgi-bin/blosxom.cgi/2007/08/
  @@ -110,11 +113,11 @@
       </rule>
       <rule>
           <from casesensitive="true">^/cgi-bin/blosxom.cgi/([0-9]{4})/([0-9]{2})/?$</from>
  -        <to last="true" type="permanent-redirect">%{scheme}://%{server-name}:%{port}%{context-path}/Bloggers/Browser/$1/$2</to>
  +        <to last="true" type="permanent-redirect">%{scheme}://%{server-name}:%{port}%{context-path}/Bloggers/Everyone/$1/$2</to>
       </rule>
       <rule>
           <from casesensitive="true">^/cgi-bin/blosxom.cgi/([0-9]{4})/([0-9]{2})/([0-9]{2})/?$</from>
  -        <to last="true" type="permanent-redirect">%{scheme}://%{server-name}:%{port}%{context-path}/Bloggers/Browser/$1/$2/$3</to>
  +        <to last="true" type="permanent-redirect">%{scheme}://%{server-name}:%{port}%{context-path}/Bloggers/Everyone/$1/$2/$3</to>
       </rule>
       <rule>
           <from casesensitive="true">^/cgi-bin/blosxom.cgi/index.rss$</from>
  
  
  
  1.27      +2 -3      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.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- pages.xml	4 Sep 2007 09:33:18 -0000	1.26
  +++ pages.xml	6 Sep 2007 15:54:27 -0000	1.27
  @@ -34,6 +34,7 @@
   
       <page view-id="/docHistory*" no-conversation-view-id="/wiki.xhtml">
           <param name="nodeId" value="#{nodeHistory.nodeId}"/>
  +        <param name="historicalNodeId" value = "#{nodeHistory.historicalNodeId}"/>
           <action execute="#{nodeHistory.init}"/>
           <begin-conversation flush-mode="MANUAL" join="true"/>
           <navigation>
  @@ -311,9 +312,7 @@
   
       <exception class="org.jboss.seam.framework.EntityNotFoundException">
           <end-conversation/>
  -        <redirect view-id="/message.xhtml">
  -            <message severity="ERROR">Entity not found.</message>
  -        </redirect>
  +        <http-error error-code="404"/>
       </exception>
   
       <exception class="org.jboss.seam.security.AuthorizationException">