From f9bec19af645ad7d994d8cd411e0c5c9ee4968dc Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 4 Sep 2006 22:11:21 +0000 Subject: [PATCH] Added missing annotation to WorkFlowService Fixed incorrect workflow URL reference Added authentication to test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/workflow/StartWorkflowActionExecuterTest.java | 2 +- .../org/alfresco/repo/workflow/WorkflowServiceImplTest.java | 5 +++++ .../org/alfresco/service/cmr/workflow/WorkflowService.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java b/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java index c9e271362a..8a635cbab3 100644 --- a/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java +++ b/source/java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java @@ -77,7 +77,7 @@ public class StartWorkflowActionExecuterTest extends BaseSpringTest { // Execute the action ActionImpl action = new ActionImpl(null, GUID.generate(), StartWorkflowActionExecuter.NAME, null); - action.setParameterValue(StartWorkflowActionExecuter.PARAM_WORKFLOW_NAME, "jbpm://wf:review"); + action.setParameterValue(StartWorkflowActionExecuter.PARAM_WORKFLOW_NAME, "jbpm$wf:review"); action.setParameterValue(WorkflowModel.PROP_REVIEW_DUE_DATE.toPrefixString(namespaceService), new Date()); NodeRef reviewer = personService.getPerson("admin"); action.setParameterValue(WorkflowModel.ASSOC_REVIEWER.toPrefixString(namespaceService), reviewer); diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java index e61718f534..5747b33103 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java @@ -18,6 +18,7 @@ package org.alfresco.repo.workflow; import java.util.List; +import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -42,6 +43,10 @@ public class WorkflowServiceImplTest extends BaseSpringTest { workflowService = (WorkflowService)applicationContext.getBean(ServiceRegistry.WORKFLOW_SERVICE.getLocalName()); nodeService = (NodeService)applicationContext.getBean(ServiceRegistry.NODE_SERVICE.getLocalName()); + + // authenticate + AuthenticationComponent auth = (AuthenticationComponent) applicationContext.getBean("authenticationComponent"); + auth.setSystemUserAsCurrentUser(); } public void testGetWorkflowDefinitions() diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java index d1c22d461d..80938eefb3 100644 --- a/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java +++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java @@ -111,6 +111,7 @@ public interface WorkflowService * @param workflowName workflow name e.g. jbpm://review * @return the deployed workflow definition */ + @Auditable(parameters = {"workflowName"}) public WorkflowDefinition getDefinitionByName(String workflowName);