Changed the default package to com.samaxes.filter.

Updated the distribution repositories to Sonatype Nexus.

Author: samaxes

ChangeLog.txt

@@ -2,6 +2,10 @@
 = J2EE Cache Filter =
 =====================
 
+== 1.2 ==
+ * Changed the default package to com.samaxes.filter.
+ * Updated the distribution repositories to Sonatype Nexus.
+
 == 1.1.0 ==
  * Use response.setDateHeader() instead of response.setHeader() to set "Expires" HTTP cache header.
  * Compiled against JDK 1.5 instead of JDK 1.6.

pom.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.samaxes.cachefilter</groupId>
+    <groupId>com.samaxes.filter</groupId>
     <artifactId>cachefilter</artifactId>
     <version>1.2-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -11,6 +14,10 @@
     <description>J2EE Cache Filter is a Servlet Filter that allows you to set HTTP headers in order to enable browser caching.</description>
     <url>http://code.google.com/p/cache-filter/</url>
     <inceptionYear>2010</inceptionYear>
+    <organization>
+        <name>samaxes</name>
+        <url>http://www.samaxes.com/</url>
+    </organization>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -42,12 +49,16 @@
         <url>http://cache-filter.googlecode.com/svn/trunk</url>
     </scm>
 
+    <prerequisites>
+        <maven>[2.1.0,)</maven>
+    </prerequisites>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.3</version>
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
@@ -79,8 +90,8 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.0-beta-9</version>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.0</version>
             </plugin>
         </plugins>
     </build>

src/main/java/com/samaxes/cachefilter/presentation/CacheFilter.java

@@ -32,6 +32,7 @@
  * 
  * @author : Samuel Santos
  * @version : $Revision: 25 $
+ * @deprecated Please update to the new {@link com.samaxes.filter.CacheFilter CacheFilter} instead.
  */
 public class CacheFilter implements Filter {
 

src/main/java/com/samaxes/filter/CacheFilter.java

@@ -0,0 +1,83 @@
+/*
+ * $Id$ 
+ *
+ * Copyright 2008 samaxes.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.samaxes.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Filter responsible for browser caching.
+ * 
+ * @author : Samuel Santos
+ * @version : $Revision: 25 $
+ */
+public class CacheFilter implements Filter {
+
+    private FilterConfig filterConfig;
+
+    /**
+     * Place this filter into service.
+     * 
+     * @param filterConfig {@link FilterConfig}
+     */
+    public void init(FilterConfig filterConfig) throws ServletException {
+        this.filterConfig = filterConfig;
+    }
+
+    /**
+     * Take this filter out of service.
+     */
+    public void destroy() {
+        this.filterConfig = null;
+    }
+
+    /**
+     * Sets cache headers directives.
+     * 
+     * @param servletRequest {@link ServletRequest}
+     * @param servletResponse {@link ServletResponse}
+     * @param filterChain {@link FilterChain}
+     * @throws IOException {@link FilterChain}
+     * @throws ServletException {@link ServletException}
+     */
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+            throws IOException, ServletException {
+        HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
+        String privacy = filterConfig.getInitParameter("privacy");
+        String expirationTime = filterConfig.getInitParameter("expirationTime");
+
+        if (httpServletResponse != null && privacy != null && !"".equals(privacy) && expirationTime != null
+                && !"".equals(expirationTime)) {
+            long seconds = Long.valueOf(expirationTime);
+
+            // set the provided HTTP response parameters
+            httpServletResponse.setHeader("Cache-Control", privacy + ", max-age=" + seconds + ", must-revalidate");
+            httpServletResponse.setDateHeader("Expires", System.currentTimeMillis() + seconds * 1000L);
+        }
+
+        // pass the request/response on
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+}