roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r354105 - in /incubator/roller/trunk: metadata/xdoclet/filter-mappings.xml src/org/roller/presentation/filters/IfPlanetModifiedFilter.java src/org/roller/presentation/filters/RequestFilter.java
Date Mon, 05 Dec 2005 17:24:52 GMT
Author: agilliland
Date: Mon Dec  5 09:24:41 2005
New Revision: 354105

URL: http://svn.apache.org/viewcvs?rev=354105&view=rev
Log:
- put IfPlanetModified filter mapping in our xdoclet filter-mappings file
- modified request filter to set request attribute "DisplayException" if it gets an exception
while constructing the RollerRequest object.
- moved IfModified filters before gzip filters in the filter chain



Modified:
    incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml
    incubator/roller/trunk/src/org/roller/presentation/filters/IfPlanetModifiedFilter.java
    incubator/roller/trunk/src/org/roller/presentation/filters/RequestFilter.java

Modified: incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml?rev=354105&r1=354104&r2=354105&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml Mon Dec  5 09:24:41 2005
@@ -60,6 +60,26 @@
 </filter-mapping>
 
 
+<!-- cache lastModified dates used for HTTP 304 responses -->
+<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>IfModifiedFeedCacheFilter</filter-name>
+    <url-pattern>/flavor/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+    <filter-name>IfPlanetModifiedFilter</filter-name>
+    <url-pattern>/planetrss/*</url-pattern>
+</filter-mapping>
+
+
 <!-- Compression Filters -->
 <filter-mapping>
     <filter-name>PageGzipFilter</filter-name>
@@ -92,21 +112,6 @@
 </filter-mapping>
 
 
-<!-- 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>IfModifiedFeedCacheFilter</filter-name>
-    <url-pattern>/flavor/*</url-pattern>
-</filter-mapping>
-
-
 <!-- Feed Caching (rss, atom, etc) -->
 <filter-mapping>
     <filter-name>FeedCacheFilter</filter-name>
@@ -147,7 +152,6 @@
 
 
 <!-- Do we still need the RequestFilter? -->
-<!--
 <filter-mapping>
     <filter-name>RequestFilter</filter-name>
     <url-pattern>/page/*</url-pattern>
@@ -156,7 +160,10 @@
     <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>/xmlrpc/*</url-pattern>

Modified: incubator/roller/trunk/src/org/roller/presentation/filters/IfPlanetModifiedFilter.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/IfPlanetModifiedFilter.java?rev=354105&r1=354104&r2=354105&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/filters/IfPlanetModifiedFilter.java
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/filters/IfPlanetModifiedFilter.java
Mon Dec  5 09:24:41 2005
@@ -27,7 +27,7 @@
  * modified since. Also, sets Last-Modified on outgoing response.
  *
  * @web.filter name="IfPlanetModifiedFilter"
- * @web.filter-mapping url-pattern="/planetrss/*"
+ * web.filter-mapping url-pattern="/planetrss/*"
  * 
  * @author David M Johnson
  */

Modified: incubator/roller/trunk/src/org/roller/presentation/filters/RequestFilter.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/RequestFilter.java?rev=354105&r1=354104&r2=354105&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/filters/RequestFilter.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/filters/RequestFilter.java Mon Dec
 5 09:24:41 2005
@@ -75,6 +75,11 @@
             response.sendError(
                     HttpServletResponse.SC_NOT_FOUND, 
                     "Page not found or error parsing requested URL");
+            
+            // make sure any filters earlier in the chain know that we had
+            // an exception happen
+            request.setAttribute("DisplayException", e);
+            
             return;
         }
 



Mime
View raw message