Author: agilliland
Date: Sun Jan 15 14:31:46 2006
New Revision: 369272
URL: http://svn.apache.org/viewcvs?rev=369272&view=rev
Log:
remapping CompressionFilter to CompressionFilter instead having duplicate
PageGzipFilter and RssGzipFilter which are not needed.
Modified:
incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml
incubator/roller/trunk/metadata/xdoclet/filters.xml
incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.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=369272&r1=369271&r2=369272&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/filter-mappings.xml Sun Jan 15
14:31:46 2006
@@ -77,32 +77,32 @@
<!-- Compression Filters -->
<filter-mapping>
- <filter-name>PageGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/page/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>PageGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/planet.do</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>PageGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/main.do</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>RssGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/atom/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>RssGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/rss/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>RssGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/flavor/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>RssGzipFilter</filter-name>
+ <filter-name>CompressionFilter</filter-name>
<url-pattern>/foaf/*</url-pattern>
</filter-mapping>
Modified: incubator/roller/trunk/metadata/xdoclet/filters.xml
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/filters.xml?rev=369272&r1=369271&r2=369272&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/filters.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/filters.xml Sun Jan 15 14:31:46 2006
@@ -7,11 +7,6 @@
</init-param>
</filter>
-<filter>
- <filter-name>RssGzipFilter</filter-name>
-
<filter-class>org.roller.presentation.filters.CompressionFilter</filter-class>
-</filter>
-
<!--
<filter>
<filter-name>UrlRewriteFilter</filter-name>
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java?rev=369272&r1=369271&r2=369272&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java
Sun Jan 15 14:31:46 2006
@@ -22,21 +22,20 @@
* Sun Microsystems Press, http://www.moreservlets.com/.
* © 2002 Marty Hall; may be freely used or adapted.
*
- * @web.filter name="PageGzipFilter"
+ * @web.filter name="CompressionFilter"
*/
public class CompressionFilter implements Filter {
private static Log mLogger = LogFactory.getLog(CompressionFilter.class);
+
/**
- * If browser does not support gzip, invoke resource
- * normally. If browser <I>does</I> support gzip,
- * set the Content-Encoding response header and
- * invoke resource with a wrapped response that
- * collects all the output. Extract the output
- * and write it into a gzipped byte array. Finally,
- * write that array to the client's output stream.
+ * If browser does not support gzip, invoke resource normally. If browser
+ * does support gzip, set the Content-Encoding response header and invoke
+ * resource with a wrapped response that collects all the output. Extract
+ * the output and write it into a gzipped byte array. Finally, write that
+ * array to the client's output stream.
*/
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain)
throws ServletException, IOException {
@@ -60,9 +59,7 @@
ByteArrayOutputStream outputStream =
responseWrapper.getByteArrayOutputStream();
// Get character array representing output.
- if (mLogger.isDebugEnabled()) {
- mLogger.debug("Pre-zip size:" + outputStream.size());
- }
+ mLogger.debug("Pre-zip size:" + outputStream.size());
// Make a writer that compresses data and puts
// it into a byte array.
@@ -75,9 +72,7 @@
// Gzip streams must be explicitly closed.
zipOut.close();
- if (mLogger.isDebugEnabled()) {
- mLogger.debug("Gzip size:" + byteStream.size());
- }
+ mLogger.debug("Gzip size:" + byteStream.size());
// Update the Content-Length header.
res.setContentLength(byteStream.size());
