Merged V2.1 to V2.0

6435: AR-1644 Web Scripts do not provide any control over caching
   6469: Replaced EUPL licence with standard license header
   6526: AR-1685 Error creating workflow with no document associated
   6565: Fix for issue with file Upload in main web-client portlet for JBoss/Liferay portal integration.
   6578: AR-1620: Upgraded One-Jar to 0.96-RC4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/scripts/WebScriptResponse.java

@@ -58,6 +58,13 @@ public interface WebScriptResponse
      */
     public void setContentType(String contentType);
     
+    /**
+     * Sets the Cache control
+     * 
+     * @param  cache  cache control
+     */
+    public void setCache(WebScriptCache cache);
+    
     /**
      * Gets the Writer
      * 
@@ -78,7 +85,7 @@ public interface WebScriptResponse
      * Clears response buffer
      */
     public void reset();
-    
+        
     /**
      * Encode a script URL
      * 
@@ -97,4 +104,5 @@ public interface WebScriptResponse
      * @return javascript function definition
      */
     public String getEncodeScriptUrlFunction(String name);
+        
 }