You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2005/11/28 21:42:57 UTC
svn commit: r349497 - in /incubator/roller/trunk/metadata/xdoclet:
filter-mappings.xml filters.xml
Author: agilliland
Date: Mon Nov 28 12:42:52 2005
New Revision: 349497
URL: http://svn.apache.org/viewcvs?rev=349497&view=rev
Log:
caching rewrite.
- modified filter definitions and mappings to put the new cache filters to use.
Modified:
incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml
incubator/roller/trunk/metadata/xdoclet/filters.xml
Modified: incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml?rev=349497&r1=349496&r2=349497&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml Mon Nov 28 12:42:52 2005
@@ -48,63 +48,19 @@
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
-<!-- Use RequestFilter on all requests except for Newsfeed requests -->
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>/page/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>/comments/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>/preview/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>/flavor/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>/foaf/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>/xmlrpc/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>RequestFilter</filter-name>
- <url-pattern>*.do</url-pattern>
-</filter-mapping>
<filter-mapping>
<filter-name>RefererFilter</filter-name>
<url-pattern>/page/*</url-pattern>
</filter-mapping>
-<!--
-Currently we only support If-Modified-Since using weblog last pub
-time, so the only place we should us it is on the RSS feed.
--->
-<filter-mapping>
- <filter-name>IfModifiedFilter</filter-name>
- <url-pattern>/atom/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>IfModifiedFilter</filter-name>
- <url-pattern>/rss/*</url-pattern>
-</filter-mapping>
-<filter-mapping>
- <filter-name>IfModifiedFilter</filter-name>
- <url-pattern>/flavor/*</url-pattern>
-</filter-mapping>
-
<filter-mapping>
<filter-name>BreadCrumbFilter</filter-name>
<url-pattern>*.do</url-pattern>
</filter-mapping>
+
+<!-- Compression Filters -->
<filter-mapping>
<filter-name>PageGzipFilter</filter-name>
<url-pattern>/page/*</url-pattern>
@@ -135,47 +91,79 @@
<url-pattern>/foaf/*</url-pattern>
</filter-mapping>
-<!-- Cache filters should be last in line -->
+<!-- cache lastModified dates for feeds -->
+<filter-mapping>
+ <filter-name>IfModifiedFeedCacheFilter</filter-name>
+ <url-pattern>/rss/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>IfModifiedFeedCacheFilter</filter-name>
+ <url-pattern>/atom/*</url-pattern>
+</filter-mapping>
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
- <url-pattern>/rss</url-pattern>
+ <filter-name>IfModifiedFeedCacheFilter</filter-name>
+ <url-pattern>/flavor/*</url-pattern>
</filter-mapping>
+
+
+<!-- Feed Caching (rss, atom, etc) -->
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
+ <filter-name>FeedCacheFilter</filter-name>
<url-pattern>/rss/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
+ <filter-name>FeedCacheFilter</filter-name>
<url-pattern>/atom/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
+ <filter-name>FeedCacheFilter</filter-name>
+ <url-pattern>/flavor/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>FeedCacheFilter</filter-name>
<url-pattern>/planetrss</url-pattern>
</filter-mapping>
+
+
+<!-- Page Caching -->
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
- <url-pattern>/flavor</url-pattern>
+ <filter-name>WeblogPageCacheFilter</filter-name>
+ <url-pattern>/page/*</url-pattern>
</filter-mapping>
+
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
- <url-pattern>/flavor/*</url-pattern>
+ <filter-name>MainPageCacheFilter</filter-name>
+ <url-pattern>/main.do</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
</filter-mapping>
<filter-mapping>
- <filter-name>RssCacheFilter</filter-name>
- <url-pattern>/foaf/*</url-pattern>
+ <filter-name>MainPageCacheFilter</filter-name>
+ <url-pattern>/planet.do</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
</filter-mapping>
+
+<!-- Do we still need the RequestFilter? -->
+<!--
<filter-mapping>
- <filter-name>PageCacheFilter</filter-name>
+ <filter-name>RequestFilter</filter-name>
<url-pattern>/page/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>PageCacheFilter</filter-name>
- <url-pattern>/main.do</url-pattern>
+ <filter-name>RequestFilter</filter-name>
+ <url-pattern>/preview/*</url-pattern>
</filter-mapping>
+-->
<filter-mapping>
- <filter-name>PageCacheFilter</filter-name>
- <url-pattern>/planet.do</url-pattern>
+ <filter-name>RequestFilter</filter-name>
+ <url-pattern>/xmlrpc/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>RequestFilter</filter-name>
+ <url-pattern>*.do</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
</filter-mapping>
-
Modified: incubator/roller/trunk/metadata/xdoclet/filters.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/filters.xml?rev=349497&r1=349496&r2=349497&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/filters.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/filters.xml Mon Nov 28 12:42:52 2005
@@ -12,21 +12,6 @@
<filter-class>org.roller.presentation.filters.CompressionFilter</filter-class>
</filter>
-<filter>
- <filter-name>RssCacheFilter</filter-name>
- <filter-class>org.roller.presentation.pagecache.PageCacheFilter</filter-class>
- <init-param>
- <param-name>size</param-name>
- <param-value>100</param-value>
- <description><![CDATA[Number of pages to keep in cache]]></description>
- </init-param>
- <init-param>
- <param-name>timeout</param-name>
- <param-value>1800</param-value>
- <description><![CDATA[Page Cache timeout interval in seconds]]></description>
- </init-param>
-</filter>
-
<!--
<filter>
<filter-name>UrlRewriteFilter</filter-name>
@@ -34,4 +19,4 @@
</filter>
-->
-<!-- begin xdoclet generated Filter declarations -->
\ No newline at end of file
+<!-- begin xdoclet generated Filter declarations -->