[MRM-165] add HTTP headers

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@451600 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
index b75a2a97a1928c2d3fff76f183f16c26ab533950..10a6945ee9fbbe44283240ad81700f0cdca7df4c 100644 (file)
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
@@ -26,6 +26,10 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
+import com.opensymphony.webwork.interceptor.ServletResponseAware;
+
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Proxy functionality.
  *
@@ -33,6 +37,7 @@ import java.io.InputStream;
  */
 public class ProxyAction
     extends PlexusActionSupport
+    implements ServletResponseAware
 {
     /**
      * @plexus.requirement
@@ -49,6 +54,10 @@ public class ProxyAction
 
     private InputStream artifactStream;
 
+    private long contentLength;
+
+    private HttpServletResponse httpServletResponse;
+
     public String execute()
         throws ProxyException
     {
@@ -62,6 +71,10 @@ public class ProxyAction
             contentType = "application/octet-stream";
 
             filename = file.getName();
+
+            contentLength = file.length();
+
+            httpServletResponse.addDateHeader( "Last-Modified", file.lastModified() );
         }
         catch ( ResourceDoesNotExistException e )
         {
@@ -99,8 +112,18 @@ public class ProxyAction
         return contentType;
     }
 
+    public long getContentLength()
+    {
+        return contentLength;
+    }
+
     public InputStream getArtifactStream()
     {
         return artifactStream;
     }
+
+    public void setServletResponse( HttpServletResponse httpServletResponse )
+    {
+        this.httpServletResponse = httpServletResponse;
+    }
 }

diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index fa2c9a8d01a7354a0cd26a0a7c5b0599b4bc50a2..35ac7aa938ff783237c4549ee682bef724b7c045 100644 (file)
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -176,6 +176,7 @@
         <param name="contentDisposition">filename="${filename}"</param>
         <param name="inputName">artifactStream</param>
         <param name="bufferSize">1024</param>
+        <param name="contentLength">${contentLength}</param>
       </result>
       <result name="notFound" type="httpheader">404</result>
     </action>