From 68b9a0e8a6bdc59772352fe45d259952b7867de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Wed, 5 Oct 2022 15:53:42 +0200 Subject: [PATCH] ACS-3643 Add meaningful message in the Workflow Console when deployment fails (#1467) --- .../repo/workflow/WorkflowInterpreter.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java index 40768cf9bc..a03fe39f4f 100644 --- a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.java +++ b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowInterpreter.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 @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.BaseInterpreter; @@ -54,6 +55,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService.PersonInfo; +import org.alfresco.service.cmr.workflow.FailedWorkflowDeployment; import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowDeployment; import org.alfresco.service.cmr.workflow.WorkflowException; @@ -726,10 +728,18 @@ public class WorkflowInterpreter extends BaseInterpreter { out.println(problem); } - out.println("deployed definition id: " + def.getId() + " , name: " + def.getName() + " , title: " + def.getTitle() + " , version: " + def.getVersion()); - currentDeployEngine = command[1]; - currentDeployResource = command[2]; - out.print(executeCommand("use definition " + def.getId())); + final Optional possibleDeploymentFailure = FailedWorkflowDeployment.getFailure(deployment); + if (possibleDeploymentFailure.isPresent()) + { + out.println("Failed to deploy the workflow definition."); + } + else + { + out.println("deployed definition id: " + def.getId() + " , name: " + def.getName() + " , title: " + def.getTitle() + " , version: " + def.getVersion()); + currentDeployEngine = command[1]; + currentDeployResource = command[2]; + out.print(executeCommand("use definition " + def.getId())); + } } else if (command[0].equals("redeploy"))