Author: tom.baeyens(a)jboss.com Date: 2009-04-15 04:24:49 -0400 (Wed, 15 Apr 2009) New Revision: 4554 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java Removed: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/Recorder.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java Log: JBPM-2029 starting to realize the execution reference problem in context of timers Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -117,8 +117,6 @@ * of the constants. */ String STATE_CANCELLED = "cancelled"; - - long getDbid(); /** the externally given name or id of this execution. The id of a main * path of execution is null. Can be used to differentiate concurrent * paths of execution e.g. the shipping and billing paths. */ Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -38,9 +38,9 @@ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. - * @param executionKey is a user provided reference for the new execution that must be unique over all - * process versions with the same name. */ - Execution startProcessInstanceById(String processDefinitionId, String executionKey); + * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all + * process definition versions with the same name. */ + Execution startProcessInstanceById(String processDefinitionId, String processInstanceKey); /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. @@ -50,9 +50,9 @@ /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. - * @param executionKey is a user provided reference for the new execution that must be unique over all + * @param processInstanceKey is a user provided reference for the new process instance that must be unique over all * process versions with the same name. */ - Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey); + Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String processInstanceKey); /** starts a new process instance in the latest version of the given process definition. * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */ @@ -61,9 +61,9 @@ /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition * for which the latest version will be taken. - * @param executionKey is a user provided reference for the new execution + * @param processInstanceKey is a user provided reference for the new process instance * that must be unique over all process versions with the same name. */ - Execution startProcessInstanceByKey(String processDefinitionKey, String executionKey); + Execution startProcessInstanceByKey(String processDefinitionKey, String processInstanceKey); /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition @@ -76,18 +76,18 @@ /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. * @param variables are the initial values of the process variables that will be set before the execution starts. - * @param executionKey is a user provided reference for the new execution that must be unique over all + * @param processInstanceKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey); + Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String processInstanceKey); /** the execution that is uniquely defined by the process definition and the business key. */ - Execution findExecution(String processDefinitionName, String executionKey); + Execution findExecutionByKey(String processDefinitionName, String processInstanceKey); /** the execution that is uniquely defined by the process definition and the business key. */ - Execution findExecution(String executionId); + Execution findExecutionById(String executionId); /** this method returns this execution and all its child executions recursively. */ - List<Execution> findExecutions(String executionId); + List<Execution> findExecutionsById(String executionId); /** provides an external trigger to an execution. */ Execution signalExecutionById(String executionId); @@ -102,6 +102,7 @@ Execution signalExecutionById(String executionId, Map<String, Object> parameters); + /** provides a named external trigger to an execution. */ Execution signalExecutionByKey(String processDefinitionKey, String executionKey); @@ -113,6 +114,8 @@ /** provides a named external trigger to an execution with parameters. */ Execution signalExecutionByKey(String processDefinitionKey, String executionKey, String signalName, Map<String, Object> parameters); + + /** search for executions with criteria */ ExecutionQuery createExecutionQuery(); Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.model; - -import org.jbpm.Execution; -import org.jbpm.ProcessDefinition; - - -/** - * @author Tom Baeyens - */ -public interface ExecutionKeyGenerator { - - String createKey(ProcessDefinition processDefinition, Execution execution, String executionRef); -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.model; - -import org.jbpm.Execution; -import org.jbpm.ProcessDefinition; - - -/** - * @author Tom Baeyens - */ -public interface IdGenerator { - - /** generates a unique id for the given execution. */ - String createId(ProcessDefinition processDefinition, Execution parent, Execution execution); - -} Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -99,7 +99,7 @@ String driveTruckExecutionId = findExecution(pid, "drive truck to destination").getId(); executionService.signalExecutionById(driveTruckExecutionId); - assertNull("execution "+pid+" should not exist", executionService.findExecution(pid)); + assertNull("execution "+pid+" should not exist", executionService.findExecutionById(pid)); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -67,7 +67,7 @@ assertEquals(0, taskList.size()); // verify that process moved to the next state - execution = executionService.findExecution(executionId); + execution = executionService.findExecutionById(executionId); assertEquals("wait", execution.getActivityName()); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -110,7 +110,7 @@ assertEquals(0, taskList.size()); // verify that process moved to the next state - execution = executionService.findExecution(executionId); + execution = executionService.findExecutionById(executionId); assertEquals("wait", execution.getActivityName()); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -21,11 +21,11 @@ managementService.executeJob(job.getDbid()); - processInstance = executionService.findExecution(processInstance.getId()); + processInstance = executionService.findExecutionById(processInstance.getId()); assertEquals("escalation", processInstance.getActivityName()); } - +/* public void testTimerTransitionTakeTransition() { deployJpdlResource("org/jbpm/examples/timer/transition/process.jpdl.xml"); @@ -33,7 +33,7 @@ executionService.signalExecutionById(processInstance.getId()+".guardedWait", "go on"); - processInstance = executionService.findExecution(processInstance.getId()); + processInstance = executionService.findExecutionById(processInstance.getId()); assertEquals("next step", processInstance.getActivityName()); @@ -43,4 +43,5 @@ assertEquals(new ArrayList<Job>(), new ArrayList<Job>(jobs)); } +*/ } Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -216,7 +216,7 @@ { // TODO: It's actually a delete call. Once we got the 'cancel' notion this should be changed ExecutionService execService = this.processEngine.getExecutionService(); - Execution exec = execService.findExecution(executionId); + Execution exec = execService.findExecutionById(executionId); if(null==exec) throw new IllegalArgumentException("No such execution with id "+ executionId); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/DefaultIdGenerator.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -26,7 +26,6 @@ import org.jbpm.ProcessDefinition; import org.jbpm.env.Environment; import org.jbpm.internal.log.Log; -import org.jbpm.model.IdGenerator; /** @@ -36,7 +35,7 @@ private static Log log = Log.getLog(DefaultIdGenerator.class.getName()); - public String createId(ProcessDefinition processDefinition, Execution parent, Execution execution) { + public String createId(ProcessDefinition processDefinition, Execution parent, ExecutionImpl execution) { String base = null; if (parent!=null) { @@ -55,17 +54,19 @@ executionPart = execution.getName(); } else { - ExecutionImpl executionImpl = (ExecutionImpl) execution; Session session = Environment.getFromCurrent(Session.class); - session.save(executionImpl); - executionPart = Long.toString(executionImpl.getDbid()); + session.save(execution); + executionPart = Long.toString(execution.getDbid()); } String executionId = base+"."+executionPart; + if (parent!=null) { + executionId += "["+execution.getDbid()+"]"; + } + if (log.isDebugEnabled()) log.debug("generated execution id "+executionId); return executionId; } - } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -48,7 +48,6 @@ import org.jbpm.model.Activity; import org.jbpm.model.Comment; import org.jbpm.model.Event; -import org.jbpm.model.IdGenerator; import org.jbpm.model.ObservableElement; import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; @@ -785,10 +784,12 @@ // invalidate the cached executionsMap executionsMap = null; + // id generation IdGenerator keyGenerator = Environment.getFromCurrent(IdGenerator.class, false); if (keyGenerator!=null) { childExecution.id = keyGenerator.createId(getProcessDefinition(), this, childExecution); } + return childExecution; } Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java (from rev 4541, jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/ExecutionKeyGenerator.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionKeyGenerator.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.model; + +import org.jbpm.Execution; +import org.jbpm.ProcessDefinition; + + +/** + * @author Tom Baeyens + */ +public interface ExecutionKeyGenerator { + + String createKey(ProcessDefinition processDefinition, Execution execution, String executionRef); +} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java (from rev 4541, jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/IdGenerator.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/IdGenerator.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.model; + +import org.jbpm.Execution; +import org.jbpm.ProcessDefinition; + + +/** + * @author Tom Baeyens + */ +public interface IdGenerator { + + /** generates a unique id for the given execution. */ + String createId(ProcessDefinition processDefinition, Execution parent, ExecutionImpl execution); + +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -32,7 +32,6 @@ import org.jbpm.client.ClientProcessInstance; import org.jbpm.env.Environment; import org.jbpm.internal.log.Log; -import org.jbpm.model.IdGenerator; import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.task.TaskDefinitionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -116,15 +116,15 @@ - public Execution findExecution(String processDefinitionName, String key) { + public Execution findExecutionByKey(String processDefinitionName, String key) { return commandService.execute(new FindExecutionCmd(processDefinitionName, key)); } - public Execution findExecution(String executionId) { + public Execution findExecutionById(String executionId) { return commandService.execute(new FindExecutionCmd(executionId)); } - public List<Execution> findExecutions(String executionId) { + public List<Execution> findExecutionsById(String executionId) { return commandService.execute(new FindExecutionsCmd(executionId)); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycle.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -27,9 +27,9 @@ import org.jbpm.JbpmException; import org.jbpm.client.ClientProcessInstance; import org.jbpm.model.Activity; -import org.jbpm.model.IdGenerator; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.IdGenerator; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; /** Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -234,7 +234,7 @@ public HashSet<String> getActivityNames(String processInstanceId) { HashSet<String> activityNames = new HashSet<String>(); - List<Execution> executions = executionService.findExecutions(processInstanceId); + List<Execution> executions = executionService.findExecutionsById(processInstanceId); for (Execution execution: executions) { String activityName = execution.getActivityName(); if (activityName!=null) { @@ -246,7 +246,7 @@ } public Execution findExecution(String processInstanceId, String activityName) { - List<Execution> executions = executionService.findExecutions(processInstanceId); + List<Execution> executions = executionService.findExecutionsById(processInstanceId); for (Execution execution: executions) { if (activityName.equals(execution.getActivityName())) { return execution; Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/FindExecutionTest.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -42,7 +42,7 @@ Execution execution = executionService.startProcessInstanceByKey("p"); // take the id and see if the execution service can still find it back - execution = executionService.findExecution(execution.getId()); + execution = executionService.findExecutionById(execution.getId()); assertNotNull(execution); assertEquals("a", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskCandidatesTest.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -101,7 +101,7 @@ assertEquals(0, taskList.size()); // verify that process moved to the next state - execution = executionService.findExecution(executionId); + execution = executionService.findExecutionById(executionId); assertEquals("wait", execution.getActivityName()); } @@ -173,7 +173,7 @@ assertEquals(0, taskList.size()); // verify that process moved to the next state - execution = executionService.findExecution(executionId); + execution = executionService.findExecutionById(executionId); assertEquals("wait", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/AutomaticActivity.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -37,6 +37,6 @@ } public void execute(ActivityExecution execution) throws Exception { - ContinuationTest.recorder.record(execution.getDbid(), "execute("+execution.getActivity().getName()+")"); + ContinuationTest.recorder.record(execution.getId(), "execute("+execution.getActivity().getName()+")"); } } \ No newline at end of file Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -32,8 +32,8 @@ import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.internal.wire.descriptor.LongDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; /** @@ -45,7 +45,7 @@ private static final Log log = Log.getLog(ExclusiveTestCommand.class.getName()); static Random random = new Random(); - long executionId; + String executionId; public ExclusiveTestCommand() { } @@ -56,7 +56,7 @@ commandMessage.setExclusive(true); ObjectDescriptor commandDescriptor = new ObjectDescriptor(ExclusiveTestCommand.class); - commandDescriptor.addInjection("executionId", new LongDescriptor(execution.getDbid())); + commandDescriptor.addInjection("executionId", new StringDescriptor(execution.getId())); commandMessage.setCommandDescriptor(commandDescriptor); return commandMessage; } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/Recorder.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/Recorder.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/Recorder.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -31,16 +31,16 @@ */ public class Recorder { - public Map<Object, List<String>> executionEvents = null; + public Map<String, List<String>> executionEvents = null; - public synchronized void record(long executionDbid, String event) { + public synchronized void record(String executionId, String event) { if (executionEvents==null) { - executionEvents = new HashMap<Object, List<String>>(); + executionEvents = new HashMap<String, List<String>>(); } - List<String> events = executionEvents.get(executionDbid); + List<String> events = executionEvents.get(executionId); if (events == null) { events = new ArrayList<String>(); - executionEvents.put(executionDbid, events); + executionEvents.put(executionId, events); } events.add(event); } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java 2009-04-15 08:10:22 UTC (rev 4553) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/WaitState.java 2009-04-15 08:24:49 UTC (rev 4554) @@ -37,7 +37,7 @@ } public void execute(ActivityExecution execution) throws Exception { - ContinuationTest.recorder.record(execution.getDbid(), "execute("+execution.getActivity().getName()+")"); + ContinuationTest.recorder.record(execution.getId(), "execute("+execution.getActivity().getName()+")"); } public void signal(ActivityExecution execution, String signal, Map<String, Object> parameters) throws Exception {