From 19a061dc046d21f2142046b9c683983b16974ddb Mon Sep 17 00:00:00 2001 From: Sara Date: Thu, 22 Sep 2022 11:14:46 +0100 Subject: [PATCH] Feature/acs 3555 add custom embedded workflow license code (#1420) * ACS-3555 Add license code for custom embedded workflow * ACS-3555 remove unused import --- .../repo/descriptor/DescriptorStartupLog.java | 12 ++++++++++-- .../alfresco/service/license/LicenseDescriptor.java | 8 +++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java b/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java index 181334939b..0cfd681737 100644 --- a/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java +++ b/repository/src/main/java/org/alfresco/repo/descriptor/DescriptorStartupLog.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -25,7 +25,6 @@ */ package org.alfresco.repo.descriptor; -import java.security.Principal; import java.util.Date; import java.util.Properties; @@ -125,6 +124,15 @@ public class DescriptorStartupLog extends AbstractLifecycleBean { msg += ", NO CLUSTER"; } + + if(license.isCustomEmbeddedWorkflowEnabled()) + { + msg += ", customEmbeddedWorkflow:enabled"; + } + else + { + msg += ", NO CUSTOM EMBEDDED WORKFLOW"; + } String holder = license.getHolderOrganisation(); if (holder != null) diff --git a/repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java b/repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java index f8bd4e4d1b..9e6845ecbf 100644 --- a/repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java +++ b/repository/src/main/java/org/alfresco/service/license/LicenseDescriptor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -139,6 +139,12 @@ public interface LicenseDescriptor * @return true if the license allows cryptodoc */ boolean isCryptodocEnabled(); + + /** + * Does this license allow custom embedded workflows? + * @return true if the license allows custom embedded workflows + */ + boolean isCustomEmbeddedWorkflowEnabled(); /** * ATS Transformation Server Expiry Date