Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

77225: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75644: ACE-2083 - Only allow document encryption if the capability has been licensed


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

source/java/org/alfresco/service/license/LicenseDescriptor.java

@@ -20,6 +20,7 @@ package org.alfresco.service.license;
 
 import java.security.Principal;
 import java.util.Date;
+import java.util.Map;
 
 import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
 
@@ -133,13 +134,22 @@ public interface LicenseDescriptor
      */
     public boolean isClusterEnabled();
     
+    /**
+     * Does this license allow cryptodoc
+     * @return <code>true</code> if the license allows cryptodoc
+     */
+    boolean isCryptodocEnabled();
+    
     /**
      * ATS Transformation Server Expiry Date
      * @return the ATS Transformation Server Expiry Date or <code>null</code>
      */
     public String getTransformationServerExpiryDate();
 
-
-    
+    /**
+     * Get the extra public parameters in the license.
+     * @return the parameters
+     */
+    public Map<String, Object> getExtras();
     
 }