[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...
Christian Bauer
christian at hibernate.org
Mon Jan 14 00:10:45 EST 2008
User: cbauer
Date: 08/01/14 00:10:45
Modified: examples/wiki/src/etc/WEB-INF urlrewrite.xml
components.xml
Log:
JBSEAM-2457 - Render "REST" feed/file download URLs, breaks all current feed/file bookmarks
Revision Changes Path
1.14 +13 -110 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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- urlrewrite.xml 19 Dec 2007 04:29:28 -0000 1.13
+++ urlrewrite.xml 14 Jan 2008 05:10:45 -0000 1.14
@@ -32,127 +32,30 @@
<to last="true">/wiki.seam?nodeId=$1</to>
</rule>
- <!-- /Foo -->
+ <!-- /service/Feed/atom (/Foo) (/Bar) /Feed/atom (/Comments/exclude/) (Tag/foobar) -->
<rule>
- <from casesensitive="true">^/([A-Za-z0-9]+[A-Za-z0-9]*)$</from>
- <to last="true">/wiki.seam?areaName=$1</to>
+ <from casesensitive="true">^/service/Feed/atom(?:/([A-Z0-9]+[A-Za-z0-9]*))?(?:/([A-Z0-9]+[A-Za-z0-9]*))?(?:/Comments/([a-z]+))?(?:/Tag/(.+))?$</from>
+ <to last="true">/servlets/feeds/atom.seam?areaName=$1&nodeName=$2&comments=$3&tag=$4</to>
</rule>
- <!-- /Foo/Bar -->
+ <!-- /service/File/123 -->
<rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2</to>
+ <from casesensitive="true">^/service/File/([0-9]+)$</from>
+ <to last="true">/servlets/files/download.seam?fileId=$1</to>
</rule>
- <!-- /Foo/Bar/Tag/Abcd -->
+ <!-- /Foo (/Bar) (/Year/2007 (/Month/08) (/Day/23) (/Page/3) (/Tag/foobar) -->
<rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&tag=$3</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/(.+))?$</from>
+ <to>/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5&page=$6&tag=$7</to>
</rule>
- <!-- /Foo/Bar/2007 -->
+ <!-- /Foo (/Bar) (/Year/2007) (/Month/08) (/Day/23) /Summary -->
<rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3</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}))?/Summary$</from>
+ <to>/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5&summary=true</to>
</rule>
- <!-- /Foo/Bar/2007/08 -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/23 -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/([0-9]{2})$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5</to>
- </rule>
-
- <!-- /Foo/Bar/2007/Tag/Abcd -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&tag=$4</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/Tag/Abcd -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&tag=$5</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/23/Abcd -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/([0-9]{2})/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5&tag=$6</to>
- </rule>
-
- <!-- /Foo/Bar/Page/3 -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/Page/([0-9]+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&page=$3</to>
- </rule>
-
- <!-- /Foo/Bar/Page/3/Tag/Abcd -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/Page/([0-9]+)/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&page=$3&tag=$4</to>
- </rule>
-
- <!-- /Foo/Bar/2007/Page/3 -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/Page/([0-9]+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&page=$4</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/Page/3 -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/Page/([0-9]+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&page=$5</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/23/Page/3 -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/([0-9]{2})/Page/([0-9]+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5&page=$6</to>
- </rule>
-
- <!-- /Foo/Bar/2007/Page/3/Tag/Asdf -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/Page/([0-9]+)/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&page=$4&tag=$5</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/Page/3/Tag/Asdf -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/Page/([0-9]+)/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&page=$5&tag=$6</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/23/Page/3/Tag/Asdf -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/([0-9]{2})/Page/([0-9]+)/Tag/(.+)$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5&page=$6&tag=$7</to>
- </rule>
-
- <!-- /Foo/Bar/2007/Summary-->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/Summary$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&summary=true</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/Summary -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/Summary$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&summary=true</to>
- </rule>
-
- <!-- /Foo/Bar/2007/08/23/Summary -->
- <rule>
- <from casesensitive="true">^/([A-Z0-9]+[A-Za-z0-9]*)/([A-Z0-9]+[A-Za-z0-9]*)/([0-9]{4})/([0-9]{2})/([0-9]{2})/Summary$</from>
- <to last="true">/wiki.seam?areaName=$1&nodeName=$2&year=$3&month=$4&day=$5&summary=true</to>
- </rule>
-
-
<!-- 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
@@ -174,7 +77,7 @@
</rule>
<rule>
<from casesensitive="true">^/cgi-bin/blosxom.cgi/index.rss$</from>
- <to last="true" type="permanent-redirect">%{scheme}://%{server-name}%{context-path}/servlets/feeds/atom.seam?feedId=1</to>
+ <to last="true" type="permanent-redirect">%{scheme}://%{server-name}%{context-path}/Feed/atom</to>
</rule>
<!-- ROOT / -->
1.37 +1 -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.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- components.xml 11 Jan 2008 00:09:16 -0000 1.36
+++ components.xml 14 Jan 2008 05:10:45 -0000 1.37
@@ -120,7 +120,7 @@
<!-- Misc Settings -->
- <web:context-filter url-pattern="/servlets/*"/>
+ <web:context-filter url-pattern="/service/*"/>
<component name="wikiUrlRewriteFilter" class="org.jboss.seam.wiki.core.ui.WikiUrlRewriteFilter" precedence="30">
<property name="initParameters">
More information about the jboss-cvs-commits
mailing list