From 2f8212aa7abe7cc363209bd41124702c2bfd0ab4 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Mon, 25 Jul 2011 21:42:37 +0000 Subject: [PATCH] Fixed ALF-9515: Activiti can no longer be disabled Both Activiti and JBPM can now be "disabled" using the properties "system.workflow.engine.activiti.enabled" and "system.workflow.engine.jbpm.enabled", respectively. However, disabling JBPM is NOT recommended as several parts of the system are reliant on it. Furthermore, "disabled" just means the process definitions are not deployed and the engine is not registered with the WorkflowService, all DB tables etc. are still present. This means the engines can be disabled and re-enabled at will. Also added back-end support for ALF-9392: More workflow metrics are required on the Workflow Console Admin Tool. An MBean is now available in Enterprise mode that provides the number of tasks, workflow definitions deployed and workflow instances in the system. Added ENGINE_ID constant to JBPMEngine and globally replaced use of "jbpm" hard coded string. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java b/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java index 0a2f4f8533..9b4d1a1e2e 100644 --- a/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java +++ b/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.alfresco.repo.content.MimetypeMap; +import org.alfresco.repo.workflow.jbpm.JBPMEngine; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowDeployment; @@ -136,7 +137,7 @@ public class JBPMDeployProcessServlet extends HttpServlet { WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); WorkflowService workflowService = (WorkflowService)wc.getBean(ServiceRegistry.WORKFLOW_SERVICE.getLocalName()); - WorkflowDeployment deployment = workflowService.deployDefinition("jbpm", deploymentArchive, MimetypeMap.MIMETYPE_ZIP); + WorkflowDeployment deployment = workflowService.deployDefinition(JBPMEngine.ENGINE_ID, deploymentArchive, MimetypeMap.MIMETYPE_ZIP); return deployment.definition; }