svn commit: r407852 - in /incubator/roller/trunk: src/org/apache/roller/ui/core/filters/CompressionFilter.java web/WEB-INF/classes/roller.properties

[ag...@apache.org]

Author: agilliland
Date: Fri May 19 09:40:40 2006
New Revision: 407852

URL: http://svn.apache.org/viewvc?rev=407852&view=rev
Log:
make it easy to enable/disable compression filter from config.


Modified:
    incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java
    incubator/roller/trunk/web/WEB-INF/classes/roller.properties

Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java?rev=407852&r1=407851&r2=407852&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/filters/CompressionFilter.java Fri May 19 09:40:40 2006
@@ -15,6 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
+
 package org.apache.roller.ui.core.filters;
 
 import java.io.ByteArrayOutputStream;
@@ -30,6 +31,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.config.RollerConfig;
 import org.apache.roller.ui.core.util.ByteArrayOutputStreamWrapper;
 import org.apache.roller.ui.core.util.ByteArrayResponseWrapper;
 
@@ -48,6 +50,8 @@
     
     private static Log mLogger = LogFactory.getLog(CompressionFilter.class);
     
+    private boolean enabled = true;
+    
     
     /** 
      * If browser does not support gzip, invoke resource normally. If browser 
@@ -62,7 +66,7 @@
         HttpServletRequest req = (HttpServletRequest) request;
         HttpServletResponse res = (HttpServletResponse) response;
         
-        if (!isGzipSupported(req)) {
+        if (!this.enabled || !isGzipSupported(req)) {
             // Invoke resource normally.
             chain.doFilter(req, res);
         } else {
@@ -109,7 +113,17 @@
     }
     
 
-    public void init(FilterConfig config) throws ServletException {}
+    public void init(FilterConfig config) throws ServletException {
+        
+        // is compression enabled?
+        if(RollerConfig.getBooleanProperty("compression.gzipResponse.enabled")) {
+            this.enabled = true;
+            mLogger.info("Compressed Output ENABLED");
+        } else {
+            this.enabled = false;
+            mLogger.info("Compressed Output DISABLED");
+        }
+    }
     
     
     public void destroy() {}

Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?rev=407852&r1=407851&r2=407852&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Fri May 19 09:40:40 2006
@@ -347,6 +347,7 @@
 rememberme.enabled=true
 breadcrumbs.stacksize=3
 debug.memory.enabled=false
+compression.gzipResponse.enabled=true
 
 # editor theme to be used (corresponds to directory name under /theme)
 editor.theme=tan