inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 07:00:28 +00:00
parent 825e6c29a6
commit 8aececc730
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

@@ -51,7 +51,6 @@ import org.activiti.engine.impl.RepositoryServiceImpl;
import org.activiti.engine.impl.bpmn.behavior.ReceiveTaskActivityBehavior;
import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
import org.activiti.engine.impl.bpmn.deployer.BpmnDeployer;
import org.activiti.engine.impl.bpmn.diagram.ProcessDiagramGenerator;
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.form.DefaultTaskFormHandler;
import org.activiti.engine.impl.form.TaskFormHandler;
@@ -71,6 +70,8 @@ import org.activiti.engine.runtime.Job;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.activiti.engine.task.TaskQuery;
import org.activiti.image.ProcessDiagramGenerator;
import org.activiti.image.impl.DefaultProcessDiagramGenerator;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.i18n.MessageService;
import org.alfresco.repo.model.Repository;
@@ -1110,10 +1111,10 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
if (model != null && model.getLocationMap().size() > 0)
{
return ProcessDiagramGenerator
.generateDiagram(model,
ActivitiConstants.PROCESS_INSTANCE_IMAGE_FORMAT,
runtimeService.getActiveActivityIds(processInstanceId));
ProcessDiagramGenerator generator = new DefaultProcessDiagramGenerator();
return generator.generateDiagram(model,
ActivitiConstants.PROCESS_INSTANCE_IMAGE_FORMAT,
runtimeService.getActiveActivityIds(processInstanceId));
}
}
return null;

11
source/java/org/alfresco/repo/workflow/activiti/variable/CustomStringVariableType.java
View File

@@ -33,6 +33,17 @@ import org.activiti.engine.impl.variable.ValueFields;
public class CustomStringVariableType extends StringType {
protected static final int MAX_TEXT_LENGTH = 4000;
public CustomStringVariableType()
{
super(MAX_TEXT_LENGTH);
}
public CustomStringVariableType(int length)
{
super(length);
}
@Override
public void setValue(Object value, ValueFields valueFields)
{

8
source/test-java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.java
View File

@@ -37,7 +37,6 @@ import java.util.List;
import java.util.Map;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.impl.util.ClockUtil;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.Execution;
import org.activiti.engine.runtime.Job;
@@ -585,7 +584,6 @@ public class ActivitiWorkflowComponentTest extends AbstractActivitiComponentTest
WorkflowDefinition def = deployTestAdhocDefinition();
Date startTime = new SimpleDateFormat("dd-MM-yyy hh:mm:ss").parse("01-01-2011 12:11:10");
ClockUtil.setCurrentTime(startTime);
// Add some variables which should be used in the WorkflowInstance
Map<String, Object> variables = new HashMap<String, Object>();
@@ -621,8 +619,6 @@ public class ActivitiWorkflowComponentTest extends AbstractActivitiComponentTest
assertEquals(startTime, workflowInstance.getStartDate());
// Reset current time used in activiti
ClockUtil.setCurrentTime(null);
}
@Test
@@ -631,7 +627,6 @@ public class ActivitiWorkflowComponentTest extends AbstractActivitiComponentTest
WorkflowDefinition def = deployTestAdhocDefinition();
Date startTime = new SimpleDateFormat("dd-MM-yyy hh:mm:ss").parse("01-01-2011 01:02:03");
ClockUtil.setCurrentTime(startTime);
// Add some variables which should be used in the WorkflowInstance
Map<String, Object> variables = new HashMap<String, Object>();
@@ -649,7 +644,6 @@ public class ActivitiWorkflowComponentTest extends AbstractActivitiComponentTest
ActivitiConstants.ENGINE_ID, processInstance.getProcessInstanceId());
Date endTime = new SimpleDateFormat("dd-MM-yyy hh:mm:ss").parse("01-01-2011 02:03:04");
ClockUtil.setCurrentTime(endTime);
// Finish the task
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
@@ -673,8 +667,6 @@ public class ActivitiWorkflowComponentTest extends AbstractActivitiComponentTest
assertEquals(3, workflowInstance.getPriority().intValue());
assertEquals(startTime, workflowInstance.getStartDate());
// Reset current time used in activiti
ClockUtil.setCurrentTime(null);
}
@Test