From 33e084ea2621e5c9b13cba3359e3f34b20fe300c 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 --- .../alfresco/repo/web/scripts/invite/InviteServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java b/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java index d99ace83ef..b4817c9743 100644 --- a/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java +++ b/source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java @@ -35,6 +35,7 @@ import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.web.scripts.BaseWebScriptTest; +import org.alfresco.repo.workflow.jbpm.JBPMEngine; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; @@ -150,7 +151,7 @@ public class InviteServiceTest extends BaseWebScriptTest ClassPathResource inviteWfResource = new ClassPathResource( "alfresco/workflow/invitation-nominated_processdefinition.xml"); workflowService.deployDefinition( - "jbpm", inviteWfResource.getInputStream(), MimetypeMap.MIMETYPE_XML); + JBPMEngine.ENGINE_ID, inviteWfResource.getInputStream(), MimetypeMap.MIMETYPE_XML); // Create new invitee email address list this.inviteeEmailAddrs = new ArrayList();