[jboss-svn-commits] JBL Code SVN: r25844 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/files and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2009-03-26 22:56:32 -0400 (Thu, 26 Mar 2009)
New Revision: 25844

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
Log:
setting Last-Modified field

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java	2009-03-27 02:19:47 UTC (rev 25843)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java	2009-03-27 02:56:32 UTC (rev 25844)
@@ -19,6 +19,9 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Locale;
+import java.util.Date;
+import java.text.SimpleDateFormat;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -45,7 +48,9 @@
 
     private static final long serialVersionUID = 400L;
 
+    public static SimpleDateFormat RFC822DATEFORMAT  = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US);
 
+
     @Override
     protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException,
                                                                             IOException {
@@ -54,6 +59,7 @@
             FileManagerUtils fm = getFileManager();
             long mod = fm.getLastModified( helper.getPackageName(), helper.getVersion() );
             response.addHeader( "lastModified", "" + mod);
+            response.addHeader("Last-Modified", RFC822DATEFORMAT.format(new Date(mod)));
 
         } else {
             super.doHead(request, response);

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java	2009-03-27 02:19:47 UTC (rev 25843)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java	2009-03-27 02:56:32 UTC (rev 25844)
@@ -22,9 +22,10 @@
 	ServletInputStream stream;
 	String queryString;
     Map<String, String> parameters;
+    public String method;
 
 
-	public MockHTTPRequest(String uri, Map<String, String> headers) {
+    public MockHTTPRequest(String uri, Map<String, String> headers) {
 		this.uri = uri;
 		this.headers = headers;
 	}
@@ -81,8 +82,8 @@
 	}
 
 	public String getMethod() {
-		// TODO Auto-generated method stub
-		return null;
+
+		return method;
 	}
 
 	public String getPathInfo() {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java	2009-03-27 02:19:47 UTC (rev 25843)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPResponse.java	2009-03-27 02:56:32 UTC (rev 25844)
@@ -38,7 +38,7 @@
 	}
 
 	public void addHeader(String arg0, String arg1) {
-		// TODO Auto-generated method stub
+		headers.put(arg0, arg1);
 
 	}
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java	2009-03-27 02:19:47 UTC (rev 25843)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java	2009-03-27 02:56:32 UTC (rev 25844)
@@ -63,7 +63,6 @@
 		byte[] bin = out.toByteArray();
 		byte[] bin_ = pkg.getCompiledPackageBytes();
 
-
         org.drools.rule.Package o = (org.drools.rule.Package) DroolsStreamUtils.streamIn( new ByteArrayInputStream(bin) );
         assertNotNull(o);
         assertEquals(1, o.getRules().length);
@@ -112,6 +111,29 @@
 		assertTrue(drl.indexOf("rule") > -1);
 		assertEquals(-1, drl.indexOf("package"));
 
+
+        //now test HEAD
+        serv = new PackageDeploymentServlet();
+        req = new MockHTTPRequest("/package/testPDSGetPackage/LATEST", null);
+        req.method = "HEAD";
+        out = new ByteArrayOutputStream();
+        res = new MockHTTPResponse(out);
+        serv.doHead(req, res);
+        assertTrue(res.headers.size() > 0);
+        String lm = res.headers.get("Last-Modified");
+        assertNotNull(lm);
+
+        serv = new PackageDeploymentServlet();
+        req = new MockHTTPRequest("/package/testPDSGetPackage/LATEST", null);
+        req.method = "HEAD";
+        out = new ByteArrayOutputStream();
+        res = new MockHTTPResponse(out);
+        serv.doHead(req, res);
+        assertTrue(res.headers.size() > 0);
+
+        assertEquals(lm, res.headers.get("Last-Modified"));
+
+
 	}
 
 	public void testScenarios() throws Exception {