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/WebScriptDescription.java

@@ -56,6 +56,33 @@ public interface WebScriptDescription
         requiresnew
     }
 
+    /**
+     * Caching requirements
+     */
+    public interface RequiredCache
+    {
+        /**
+         * Determine if Web Script should ever be cached
+         * 
+         * @return  true => do not cache, false => caching may or not occur
+         */
+        public boolean getNeverCache();
+
+        /**
+         * Determine if Web Script content is for public caching
+         * 
+         * @return  true => content is public, so allow cache
+         */
+        public boolean getIsPublic();
+
+        /**
+         * Must cache re-validate to ensure content is fresh
+         *  
+         * @return  true => must re-validate
+         */
+        public boolean getMustRevalidate();
+    }
+
     /**
      * Enumeration of ways to specify format 
      */
@@ -66,6 +93,7 @@ public interface WebScriptDescription
         argument      // /a/b/c?format=x
     }
     
+    
     /**
      * Gets the root path of the store of this web script
      * 
@@ -128,6 +156,12 @@ public interface WebScriptDescription
      */
     public RequiredTransaction getRequiredTransaction();
     
+    /**
+     * Gets the required level of caching
+     * @return
+     */
+    public RequiredCache getRequiredCache();
+    
     /**
      * Gets the HTTP method this service is bound to
      *