From d16f78b9b20c437d65d122417c3670684c07b78a Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 23 Jul 2014 16:40:37 +0000 Subject: [PATCH] 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 --- .../service/license/LicenseDescriptor.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/service/license/LicenseDescriptor.java b/source/java/org/alfresco/service/license/LicenseDescriptor.java index 1996f5587a..23b5fe608d 100644 --- a/source/java/org/alfresco/service/license/LicenseDescriptor.java +++ b/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 true if the license allows cryptodoc + */ + boolean isCryptodocEnabled(); + /** * ATS Transformation Server Expiry Date * @return the ATS Transformation Server Expiry Date or null */ public String getTransformationServerExpiryDate(); - - + /** + * Get the extra public parameters in the license. + * @return the parameters + */ + public Map getExtras(); }