[jboss-svn-commits] JBL Code SVN: r19535 - labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2008-04-12 10:51:42 -0400 (Sat, 12 Apr 2008)
New Revision: 19535

Modified:
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
Log:
Handling expires in file-access

Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2008-04-11 21:44:05 UTC (rev 19534)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2008-04-12 14:51:42 UTC (rev 19535)
@@ -13,6 +13,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.util.Calendar;
 import java.util.Enumeration;
 
 /**
@@ -36,6 +37,8 @@
     private Pair<String, String> confKey;
 
     private CacheItemUser<Pair<String, String>, FileAccessConfiguration> conf;
+    
+    private long farOffDate;
 
     public void init(ServletConfig conf) {
         this.conf = CacheItem.create(new FileAccessConfigurationWatcher());
@@ -47,6 +50,10 @@
         confKey = new Pair<String, String>(
                 contentManager.getId(),
                 conf.getInitParameter("configFileDirectory"));
+        
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2020, 5, 8);
+        farOffDate = calendar.getTimeInMillis();
     }
 
     private void writeErrorMessage(HttpServletResponse response) throws IOException {
@@ -110,6 +117,14 @@
             
             if (ci == null) {
                 Node requestedNode = contentManager.getNode(path);
+                          
+                response.setDateHeader("Last-Modified", requestedNode.getLastModification());
+                
+                if (requestedNode.getMimeType().startsWith("image")) {
+                    response.setDateHeader("Expires", farOffDate);               	
+                } else {
+                    response.setDateHeader("Expires", requestedNode.getLastModification()+1);
+                }
 
                 long ifModifiedSince = request.getDateHeader("If-modified-since");
                 long nodeLastMod = requestedNode.getLastModification();
@@ -120,9 +135,6 @@
                 	
                 	return;
                 }
-                
-                response.setDateHeader("Last-Modified", requestedNode.getLastModification());
-                response.setDateHeader("Expires", requestedNode.getLastModification()+1);
 
                 ci = new ContentInformation(requestedNode.getMimeType(),
                         requestedNode.getLength(),