January 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3677 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/builder and 5 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 11:01:20 -0500 (Mon, 19 Jan 2009) New Revision: 3677 Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java Log: migrations of process factory to process definition builder Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -35,10 +35,10 @@ import org.jbpm.enterprise.internal.custom.HappyListener; import org.jbpm.enterprise.internal.custom.WaitState; import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.session.DbSession; import org.jbpm.session.TimerSession; import org.jbpm.test.enterprise.EnvironmentServletTestCase; @@ -65,17 +65,21 @@ super.setUp(); // define process dueDate = new Date(System.currentTimeMillis() + TIMEOUT); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess(getName()) - .startActivity("start") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess(getName()) + .startActivity("start", new ObjectDescriptor(WaitState.class)) .initial() - .behaviour(new ObjectDescriptor(WaitState.class)) - .timer(dueDate, "timeout") - .flow("timeout") + .startFlow("end") + .name("timeout") .listener(new ObjectDescriptor(HappyListener.class)) - .to("end") - .startActivity("end") - .behaviour(new ObjectDescriptor(WaitState.class)) - .endProcess(); + .endFlow() + .startTimer("timeout") + .dueDate(dueDate) + .endTimer() + .endActivity() + .startActivity("end", new ObjectDescriptor(WaitState.class)) + .endActivity() + .endProcess(); // deploy process environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(), processDefinition).deploy(); Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -35,14 +35,14 @@ import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; import org.jbpm.enterprise.internal.custom.HappyListener; +import org.jbpm.enterprise.internal.custom.NoisyListener; import org.jbpm.enterprise.internal.custom.WaitState; -import org.jbpm.enterprise.internal.custom.NoisyListener; import org.jbpm.env.Environment; import org.jbpm.log.Log; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.session.DbSession; import org.jbpm.test.enterprise.EnvironmentServletTestCase; import org.jbpm.test.enterprise.IntegrationTestSetup; @@ -84,17 +84,21 @@ } // define process dueDate = new Date(System.currentTimeMillis() + TIMEOUT); - processDefinition = ProcessFactory.startProcess(getName()) - .startActivity() + processDefinition = ProcessDefinitionBuilder + .startProcess(getName()) + .startActivity(new ObjectDescriptor(WaitState.class)) .initial() - .behaviour(new ObjectDescriptor(WaitState.class)) - .timer(dueDate, "timeout") - .flow("timeout") + .startTimer("timeout") + .dueDate(dueDate) + .endTimer() + .startFlow("end") + .name("timeout") .listener(listenerDescriptor) - .to("end") - .startActivity("end") - .behaviour(new ObjectDescriptor(WaitState.class)) - .endProcess(); + .endFlow() + .endActivity() + .startActivity("end", new ObjectDescriptor(WaitState.class)) + .endActivity() + .endProcess(); } protected void tearDown() throws Exception { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -25,7 +25,6 @@ import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.ProcessFactory; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -27,7 +27,6 @@ import org.jbpm.log.Log; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.ProcessFactory; /** * @author Tom Baeyens Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -1,687 +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.pvm.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Stack; - -import org.jbpm.ProcessDefinition; -import org.jbpm.JbpmException; -import org.jbpm.activity.Activity; -import org.jbpm.client.ClientProcessDefinition; -import org.jbpm.listener.EventListener; -import org.jbpm.model.Condition; -import org.jbpm.model.Transition; -import org.jbpm.pvm.internal.model.CompositeElementImpl; -import org.jbpm.pvm.internal.model.EventImpl; -import org.jbpm.pvm.internal.model.EventListenerReference; -import org.jbpm.pvm.internal.model.ExceptionHandlerImpl; -import org.jbpm.pvm.internal.model.NodeImpl; -import org.jbpm.pvm.internal.model.ObjectReference; -import org.jbpm.pvm.internal.model.ObservableElementImpl; -import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.internal.model.ProcessElementImpl; -import org.jbpm.pvm.internal.model.TimerDefinitionImpl; -import org.jbpm.pvm.internal.model.TransitionImpl; -import org.jbpm.pvm.internal.model.VariableDefinitionImpl; -import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; -import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; - -/** factory for process definitions. - * - * Use this factory as a <a href="http://martinfowler.com/bliki/FluentInterface.html">fluent interface</a> - * for building a process definition. To use it in this way, start with instantiating a ProcessFactory object. - * Then a number of methods can be invoked concatenated with dots cause all the methods return - * the same process factory object. When done, end that sequence with - * {@link #endProcess()} to get the constructed ProcessDefinition. - * - * - * The idea is that this results into a more compact and more readable - * code to build process definitions as opposed to including xml inline. For example : - * - * <pre> - * ProcessDefinition processDefinition = ProcessFactory.build() - * .node().initial().behaviour(new WaitState()) - * .transition("normal").to("a") - * .transition("shortcut").to("c") - * .node("a").behaviour(new WaitState()) - * .transition().to("b") - * .node("b").behaviour(new WaitState()) - * .transition().to("c") - * .node("c").behaviour(new WaitState()) - * .done(); - * </pre> - * - * <hr /> - * - * If more control is needed over the creation of the process definition - * objects, then consider using the concrete implementation classes from - * package {@link org.jbpm.pvm.internal.model} directly. The implementation code - * of this class might be a good guide to get you on your way. - * - * - * @author Tom Baeyens - */ -public class ProcessFactory { - - // static factory methods /////////////////////////////////////////////////// - - protected ProcessDefinitionImpl processDefinition; - protected NodeImpl node; - protected TransitionImpl transition; - protected List<DestinationReference> destinationReferences; - protected ObservableElementImpl observableElement; - protected EventImpl event; - protected EventListenerReference eventListenerReference; - protected ExceptionHandlerImpl exceptionHandler; - protected CompositeElementImpl compositeElement; - protected CompositeElementImpl scope; - protected Stack<CompositeElementImpl> compositeElementStack; - - /** start building a process definition without a name. */ - protected ProcessFactory() { - this(null); - } - - /** start building a process definition with the given name. */ - protected ProcessFactory(String processName) { - this(processName, null); - } - - /** start building a process definition with the given name. */ - protected ProcessFactory(String processName, ProcessDefinitionImpl processDefinition) { - if (processDefinition!=null) { - this.processDefinition = processDefinition; - } else { - this.processDefinition = instantiateProcessDefinition(); - } - this.processDefinition.setName(processName); - this.observableElement = this.processDefinition; - this.compositeElement = this.processDefinition; - this.scope = this.processDefinition; - } - - /** starts building a process definition */ - public static ProcessFactory startProcess() { - return new ProcessFactory(); - } - - /** starts building a process definition */ - public static ProcessFactory startProcess(String processName) { - return new ProcessFactory(processName); - } - - /** starts populating a given process definition */ - public static ProcessFactory build(String processName, ProcessDefinitionImpl processDefinition) { - return new ProcessFactory(processName, processDefinition); - } - - /** to be overwritten by specific process language factories */ - protected ProcessDefinitionImpl instantiateProcessDefinition() { - return new ProcessDefinitionImpl(); - } - - /** marks the last created node as the initial node in the process. */ - public ProcessFactory initial() { - if (node==null) { - throw new JbpmException("no current node"); - } - if (processDefinition.getInitial()!=null) { - throw new JbpmException("duplicate initial node"); - } - processDefinition.setInitial(node); - return this; - } - - /** applies on a node and makes it create a local activity instance scope. - * This is automatically implied when {@link #variable(String) adding a variable} - * or {@link #timer() adding a timer} */ - public ProcessFactory scope() { - if (node==null) { - throw new JbpmException("no current node"); - } - node.setLocalScope(true); - scope = node; - return this; - } - - /** declares a local variable. {@link #scope()} is automatically implied. */ - public ProcessFactory variable(String key) { - if (node!=null) { - scope(); - } - VariableDefinitionImpl variableDefinition = compositeElement.createVariableDefinition(); - variableDefinition.setName(key); - return this; - } - - /** declares a local variable. {@link #scope()} is automatically implied. */ - public ProcessFactory variable(Descriptor sourceDescriptor) { - if (node!=null && scope==null) { - scope(); - } - VariableDefinitionImpl variableDefinition = scope.createVariableDefinition(); - variableDefinition.setName(sourceDescriptor.getName()); - variableDefinition.setInDescriptor(sourceDescriptor); - return this; - } - - /** declares a local variable. {@link #scope()} is automatically implied. */ - public ProcessFactory variable(String key, String initialValue) { - return variable(new StringDescriptor(key, initialValue)); - } - - /** declares a timer on the current node or process. {@link #scope()} is - * automatically implied. */ - public ProcessFactory timer(String dueDateDescription, String signalName) { - return timer(dueDateDescription, null, signalName, null); - } - - /** declares a timer on the current node or process. {@link #scope()} is - * automatically implied. */ - public ProcessFactory timer(String dueDateDescription, String signalName, String repeat) { - return timer(dueDateDescription, null, signalName, repeat); - } - - /** declares a timer on the current node or process. {@link #scope()} is - * automatically implied. */ - public ProcessFactory timer(Date dueDate, String signalName) { - return timer(null, dueDate, signalName, null); - } - - protected ProcessFactory timer(String dueDateDescription, Date dueDate, - String signalName, String repeat) { - if (node!=null && scope==null) { - scope(); - } - TimerDefinitionImpl timerDefinition = scope.createTimerDefinition(); - if (dueDate!=null) { - timerDefinition.setDueDate(dueDate); - } else { - timerDefinition.setDueDateDescription(dueDateDescription); - } - timerDefinition.setSignalName(signalName); - timerDefinition.setRepeat(repeat); - return this; - } - - /** creates a node in the current parent. - * The current parent is either the process definition or a composite node - * in case method {@link #compositeNode(String)} was called previously. */ - public ProcessFactory startActivity() { - return startActivity(null); - } - - /** creates a named node. - * The current parent is either the process definition or a composite node - * in case method {@link #compositeNode(String)} was called previously. */ - public ProcessFactory startActivity(String nodeName) { - if (exceptionHandler!=null) { - exceptionHandler.setNodeName(nodeName); - } else { - node = compositeElement.createNode(nodeName); - scope = null; - - observableElement = node; - event = null; - eventListenerReference = null; - transition = null; - exceptionHandler = null; - } - return this; - } - - /** sets the behaviour on the current node. - * A current node is required. */ - public ProcessFactory behaviour(Activity activity) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setBehaviour(activity); - return this; - } - - /** sets the behaviour on the current node. - * A current node is required. */ - public ProcessFactory behaviour(Descriptor descriptor) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setBehaviour(descriptor); - return this; - } - - /** sets the behaviour on the current node. - * A current node is required. */ - public ProcessFactory behaviour(Class<? extends Activity> activityClass) { - return behaviour(new ObjectDescriptor(activityClass)); - } - - /** sets the behaviour on the current node. - * A current node is required. */ - public ProcessFactory behaviour(String expression) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setBehaviour(expression); - return this; - } - - - /** sets the asyncExecute property on the current node. - * A current node is required. */ - public ProcessFactory asyncExecute() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setExecutionAsync(true); - return this; - } - - /** sets the asyncLeave property on the current node. - * A current node is required. */ - public ProcessFactory asyncLeave() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setLeaveAsync(true); - return this; - } - - /** sets the asyncSignal property on the current node. - * A current node is required. */ - public ProcessFactory asyncSignal() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setSignalAsync(true); - return this; - } - - /** sets the property needsPrevious on the current node. - * A current node is required. */ - public ProcessFactory needsPrevious() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new JbpmException("no current node"); - } - node.setPreviousNeeded(true); - return this; - } - - /** starts a block in which nested nodes can be created. - * This block can be ended with {@link #compositeEnd()}. - * A current node is required. */ - public ProcessFactory compositeNode() { - return compositeNode(null); - } - - /** starts a block in which nested nodes can be created. - * This block can be ended with {@link #compositeEnd()}. - * A current node is required. */ - public ProcessFactory compositeNode(String nodeName) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - - if (compositeElementStack==null) { - compositeElementStack = new Stack<CompositeElementImpl>(); - } - - compositeElementStack.push(compositeElement); - startActivity(nodeName); - compositeElement = node; - - return this; - } - - /** ends a block in which nested nodes are created. - * This method requires that a nested node block was started before - * with {@link #compositeNode(String)} */ - public ProcessFactory compositeEnd() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - - if (compositeElementStack==null) { - throw new JbpmException("no composite node was started"); - } - - compositeElement = compositeElementStack.pop(); - - if (compositeElementStack.isEmpty()) { - compositeElementStack = null; - } - - return this; - } - - /** creates a transition on the current node. - * This method requires a current node */ - public ProcessFactory flow() { - return flow(null); - } - - /** creates a named transition on the current node. - * This method requires a current node */ - public ProcessFactory flow(String transitionName) { - if (exceptionHandler!=null) { - exceptionHandler.setTransitionName(transitionName); - } else { - if (node==null) { - throw new JbpmException("no current node"); - } - transition = node.createOutgoingTransition(null, transitionName); - observableElement = transition; - event = null; - eventListenerReference = null; - exceptionHandler = null; - } - return this; - } - - /** sets the takeAsync property on the current transition - * This method requires a current transition. */ - public ProcessFactory asyncTake() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new JbpmException("no current transition"); - } - transition.setTakeAsync(true); - return this; - } - - /** sets the destination node on the current transition. - * This method requires a current transition. */ - public ProcessFactory to(String destination) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new JbpmException("no current transition"); - } - if (destinationReferences==null) { - destinationReferences = new ArrayList<DestinationReference>(); - } - destinationReferences.add(new DestinationReference(transition, destination)); - return this; - } - - /** sets the wait condition on the current transition. - * This method requires a current transition. */ - public ProcessFactory waitCondition(Condition condition) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new JbpmException("no current transition"); - } - Descriptor conditionDescriptor= new ProvidedObjectDescriptor(condition); - transition.setWaitConditionDescriptor(conditionDescriptor); - return this; - } - - /** sets the guard condition on the current transition. - * This method requires a current transition. */ - public ProcessFactory guardCondition(Condition condition) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new JbpmException("no current transition"); - } - Descriptor conditionDescriptor= new ProvidedObjectDescriptor(condition); - transition.setConditionDescriptor(conditionDescriptor); - return this; - } - - /** creates the given event on the current process element. - * This method requires a process element. A process element is - * either a process definition or a node. This method doesn't need to be - * called for transitions. If you have exception handlers and listeners - * on an event, make sure that you put the invocations of - * {@link #exceptionHandler(Class)} first. */ - public ProcessFactory startEvent(String eventName) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (observableElement==null) { - throw new JbpmException("no current process element"); - } - if (observableElement instanceof Transition) { - throw new JbpmException("for actions on transitions, you don't need to call event"); - } - event = observableElement.createEvent(eventName); - exceptionHandler = null; - return this; - } - - /** creates an exception handler for the given exception class on the current process element; - * until the {@link #exceptionHandlerEnd()}. Subsequent invocations of - * {@link #listener(Activity) listeners} or {@link #flow() transitions} will - * have the created exception handler as a target. - * - * DONT'T FORGET TO CLOSE THE EXCEPTION HANDLER WITH exceptionHandlerEnd. */ - public ProcessFactory exceptionHandler(Class<? extends Exception> exceptionClass) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - - ProcessElementImpl processElement = null; - if (eventListenerReference!=null) { - processElement = eventListenerReference; - } else if (event!=null) { - processElement = event; - } else if (observableElement!=null) { - processElement = observableElement; - } else { - throw new JbpmException("no current process element, event or action"); - } - - exceptionHandler = processElement.createExceptionHandler(); - - if (exceptionClass!=null) { - exceptionHandler.setExceptionClassName(exceptionClass.getName()); - } - - return this; - } - - public ProcessFactory exceptionHandlerEnd() { - exceptionHandler = null; - return this; - } - - public ProcessFactory transactional() { - if (exceptionHandler==null) { - throw new JbpmException("transactional is a property of an exception handler"); - } - exceptionHandler.setTransactional(true); - return this; - } - - /** adds an action to the current event. The current event was either - * created by {@link #startEvent(String)} or by a {@link #flow()}. - * Subsequent invocations of {@link #exceptionHandler(Class)} will - * be associated to this event listener. */ - public ProcessFactory listener(Descriptor descriptor) { - if (exceptionHandler!=null) { - exceptionHandler.createEventListenerReference(descriptor); - } else { - getEvent().createEventListenerReference(descriptor); - } - return this; - } - - /** adds an action to the current event. The current event was either - * created by {@link #startEvent(String)} or by a {@link #flow()}. - * Subsequent invocations of {@link #exceptionHandler(Class)} will - * be associated to this event listener. */ - public ProcessFactory listener(EventListener eventListener) { - if (exceptionHandler!=null) { - exceptionHandler.createEventListenerReference(eventListener); - } else { - eventListenerReference = getEvent().createEventListenerReference(eventListener); - } - return this; - } - - /** adds an action to the current event. The current event was either - * created by {@link #startEvent(String)} or by a {@link #flow()}. - * Subsequent invocations of {@link #exceptionHandler(Class)} will - * be associated to this event listener. */ - public ProcessFactory listener(String expression) { - if (exceptionHandler!=null) { - exceptionHandler.createActivityReference(expression); - } else { - eventListenerReference = getEvent().createEventListenerReference(expression); - } - return this; - } - - /** disables propagated events. This means that this action will only be executed - * if the event is fired on the actual process element of the event. The current - * action will not be executed if an event is fired on one of the children of the - * process element to which this event relates. */ - public ProcessFactory propagationDisabled() { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (eventListenerReference==null) { - throw new JbpmException("no current event action"); - } - eventListenerReference.setPropagationEnabled(false); - return this; - } - - private EventImpl getEvent() { - if ( (event==null) - && (observableElement instanceof TransitionImpl) - ) { - event = ((TransitionImpl)observableElement).createEvent(); - return event; - } - if (event==null) { - throw new JbpmException("no current event"); - } - return event; - } - - /** adds a string-valued configuration to the current process element */ - public ProcessFactory property(String name, String stringValue) { - StringDescriptor stringDescriptor = new StringDescriptor(); - stringDescriptor.setName(name); - stringDescriptor.setValue(stringValue); - property(stringDescriptor); - return this; - } - - /** adds a configuration to the current process element */ - public ProcessFactory property(Descriptor descriptor) { - if (exceptionHandler!=null) { - throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (observableElement==null) { - throw new JbpmException("no current process element"); - } - if (event!=null) { - event.addProperty(descriptor); - } else { - observableElement.addProperty(descriptor); - } - return this; - } - - public class DestinationReference { - TransitionImpl transition; - String destinationName; - public DestinationReference(TransitionImpl transition, String destinationName) { - this.transition = transition; - this.destinationName = destinationName; - } - public void resolve() { - NodeImpl destination = (NodeImpl) processDefinition.findNode(destinationName); - if (destination==null) { - throw new JbpmException("couldn't find destination node '"+destinationName+"' for transition "+transition); - } - destination.addIncomingTransition(transition); - transition.setDestination(destination); - } - } - - /** extract the process definition from the factory. This should be - * the last method in the chain of subsequent invoked methods on this - * factory object. */ - public ClientProcessDefinition endProcess() { - resolveDestinations(); - if (processDefinition.getInitial()==null) { - throw new JbpmException("no initial node"); - } - return processDefinition; - } - - /** sets the {@link ProcessDefinition#getVersion() version} of the process definition explicitely */ - public ProcessFactory version(int version) { - processDefinition.setVersion(version); - return this; - } - - /** sets the {@link ProcessDefinition#getKey() key} of the process definition explicitely */ - public ProcessFactory key(String key) { - processDefinition.setKey(key); - return this; - } - - private void resolveDestinations() { - if (destinationReferences!=null) { - for (DestinationReference destinationReference : destinationReferences) { - destinationReference.resolve(); - } - } - } -} Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -23,7 +23,6 @@ import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.session.DbSession; import org.jbpm.session.PvmDbSession; import org.jbpm.test.EnvironmentDbTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -21,8 +21,6 @@ import java.util.TreeMap; import java.util.TreeSet; -import junit.framework.Test; - import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.EventImpl; @@ -52,10 +50,8 @@ import org.jbpm.pvm.internal.wire.descriptor.TrueDescriptor; import org.jbpm.pvm.internal.wire.operation.FieldOperation; import org.jbpm.pvm.internal.wire.operation.PropertyOperation; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.session.DbSession; import org.jbpm.test.EnvironmentDbTestCase; -import org.jbpm.test.EnvironmentFactoryTestSetup; /** * @author Guillaume Porcher Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -28,7 +28,6 @@ import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -35,7 +35,6 @@ import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.session.MessageSession; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -29,7 +29,6 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -32,7 +32,6 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** shows wait states and automatic activities in a simple Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -38,7 +38,6 @@ import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** shows how actions are listeners to following processDefinition events: Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -31,7 +31,6 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** shows the basics of the state property on the execution. Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -30,7 +30,6 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -35,7 +35,6 @@ import org.jbpm.model.Node; import org.jbpm.model.OpenExecution; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -10,7 +10,6 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; public class LoopingTest extends JbpmTestCase { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -30,7 +30,6 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -30,7 +30,6 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.model.OpenExecution; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -29,7 +29,6 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -15,7 +15,6 @@ import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -33,7 +33,6 @@ import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Event; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 14:31:15 UTC (rev 3676) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 16:01:20 UTC (rev 3677) @@ -32,7 +32,6 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; /**

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3676 - jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 09:31:15 -0500 (Mon, 19 Jan 2009) New Revision: 3676 Removed: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java Log: migrations of process factory to process definition builder Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -29,6 +29,7 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.model.OpenExecution; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -56,13 +57,18 @@ } public void testOuterscopeLookup() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -81,13 +87,18 @@ } public void testLocalVariableLookup() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -107,13 +118,18 @@ } public void testLocalVariableUpdate() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -133,13 +149,18 @@ } public void testDefaultCreationOnGlobalScope() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -157,13 +178,18 @@ } public void testVariableUpdatesOnEndedScope() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -28,6 +28,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -75,20 +76,30 @@ } public void testSubProcess() { - ClientProcessDefinition subProcess = ProcessFactory.startProcess("sub") - .startActivity("sub1").initial().behaviour(new AutomaticActivity()) - .flow().to("sub2") - .startActivity("sub2").behaviour(new WaitState()) - .flow().to("sub3") - .startActivity("sub3").behaviour(new EndState()) + ClientProcessDefinition subProcess = ProcessDefinitionBuilder + .startProcess("sub") + .startActivity("sub1", new AutomaticActivity()) + .initial() + .flow("sub2") + .endActivity() + .startActivity("sub2", new WaitState()) + .flow("sub3") + .endActivity() + .startActivity("sub3", new EndState()) + .endActivity() .endProcess(); - ClientProcessDefinition superProcess = ProcessFactory.startProcess("super") - .startActivity("super1").initial().behaviour(new AutomaticActivity()) - .flow().to("super2") - .startActivity("super2").behaviour(new SubProcess(subProcess)) - .flow().to("super3") - .startActivity("super3").behaviour(new WaitState()) + ClientProcessDefinition superProcess = ProcessDefinitionBuilder + .startProcess("super") + .startActivity("super1", new AutomaticActivity()) + .initial() + .flow("super2") + .endActivity() + .startActivity("super2", new SubProcess(subProcess)) + .flow("super3") + .endActivity() + .startActivity("super3", new WaitState()) + .endActivity() .endProcess(); ClientExecution superProcesInstance = superProcess.startProcessInstance(); Deleted: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -1,83 +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.test.activities; - -import java.util.Map; - -import org.jbpm.activity.Activity; -import org.jbpm.activity.ActivityExecution; -import org.jbpm.activity.ExternalActivity; -import org.jbpm.client.ClientExecution; -import org.jbpm.client.ClientProcessDefinition; -import org.jbpm.model.Condition; -import org.jbpm.model.OpenExecution; -import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.test.JbpmTestCase; - -/** this test shows how to implement a transition that behaves as a - * wait state. - * - * @author Tom Baeyens - */ -public class TransitionAsWaitStateTest extends JbpmTestCase -{ - - public static class AlwaysTrue implements Condition { - private static final long serialVersionUID = 1L; - public boolean evaluate(OpenExecution execution) { - return true; - } - }; - - public static class AutomaticActivity implements Activity { - private static final long serialVersionUID = 1L; - public void execute(ActivityExecution execution) { - } - } - - public static class WaitState implements ExternalActivity { - private static final long serialVersionUID = 1L; - public void execute(ActivityExecution execution) { - execution.waitForSignal(); - } - public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters){ - } - } - - public void testSmallAmount() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("make loss").initial().behaviour(new AutomaticActivity()) - .flow("use jbpm").to("make profit") - .waitCondition(new AlwaysTrue()) - .startActivity("make profit").behaviour(new WaitState()) - .endProcess(); - - ClientExecution execution = processDefinition.startProcessInstance(); - - assertNull(execution.getNode()); - - execution.signal(); - - assertEquals("make profit", execution.getNode().getName()); - } - -} Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -14,6 +14,7 @@ import org.jbpm.model.Node; import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -123,17 +124,24 @@ public void testTransitionBasedConcurrency() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("fork").initial().behaviour(new Fork()) - .flow("billing").to("bill") - .flow("shipping").to("ship") - .startActivity("bill").behaviour(new WaitState()) - .flow().to("join") - .startActivity("ship").behaviour(new WaitState()) - .flow().to("join") - .startActivity("join").behaviour(new Join()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("fork", new Fork()) + .initial() + .flow("bill", "billing") + .flow("ship", "shipping") + .endActivity() + .startActivity("bill", new WaitState()) + .flow("join") + .endActivity() + .startActivity("ship", new WaitState()) + .flow("join") + .endActivity() + .startActivity("join", new Join()) + .flow("end") + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution main = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -32,6 +32,7 @@ import org.jbpm.listener.EventListener; import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Event; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -74,36 +75,52 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("composite") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("composite") + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) + .initial() + .flow("outside") .startEvent(Event.NODE_END) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .startActivity("inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .flow().to("outside") - .compositeEnd() - .startActivity("outside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(outsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(outsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(outsideListener) + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() + .startActivity("outside", new WaitState()) + .startEvent(Event.NODE_END) + .listener(outsideListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(outsideListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(outsideListener) + .endEvent() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -149,36 +166,52 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("enter a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("outside", new WaitState()) + .initial() + .flow("inside") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(outsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(outsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .startActivity("outside").initial().behaviour(new WaitState()) + .listener(outsideListener) + .endEvent() + .endActivity() + .startActivity("composite") + .startEvent(Event.NODE_END) + .listener(compositeListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(compositeListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) .startEvent(Event.NODE_END) - .listener(outsideListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(outsideListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(outsideListener) - .flow().to("inside") - .compositeNode("composite") - .startEvent(Event.NODE_END) - .listener(compositeListener) - .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .startActivity("inside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .compositeEnd() + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -223,29 +256,41 @@ +-----------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("composite") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("composite") + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) + .initial() + .flow("inside") .startEvent(Event.NODE_END) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .startActivity("inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .flow().to("inside") - .compositeEnd() + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -289,36 +334,52 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("composite") + .flow("outside") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("composite") + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) + .initial() .startEvent(Event.NODE_END) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .flow().to("outside") - .startActivity("inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .compositeEnd() - .startActivity("outside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(outsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(outsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(outsideListener) + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() + .startActivity("outside", new WaitState()) + .startEvent(Event.NODE_END) + .listener(outsideListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(outsideListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(outsideListener) + .endEvent() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -369,52 +430,74 @@ +--------------------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("source outside") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(sourceOutsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(sourceOutsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("source outside") + .listener(sourceOutsideListener) + .endEvent() + .startActivity("source middle") + .flow("destination inside") .startEvent(Event.NODE_END) - .listener(sourceOutsideListener) + .listener(sourceMiddleListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(sourceOutsideListener) + .listener(sourceMiddleListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(sourceOutsideListener) - .compositeNode("source middle") + .listener(sourceMiddleListener) + .endEvent() + .startActivity("source inside", new WaitState()) + .initial() .startEvent(Event.NODE_END) - .listener(sourceMiddleListener) + .listener(sourceInsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(sourceMiddleListener) + .listener(sourceInsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(sourceMiddleListener) - .flow().to("destination inside") - .startActivity("source inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(sourceInsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(sourceInsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(sourceInsideListener) - .compositeEnd() - .compositeEnd() - .compositeNode("destination outside") + .listener(sourceInsideListener) + .endEvent() + .endActivity() + .endActivity() + .endActivity() + .startActivity("destination outside") + .startEvent(Event.NODE_END) + .listener(destinationOutsideListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(destinationOutsideListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(destinationOutsideListener) + .endEvent() + .startActivity("destination inside", new WaitState()) .startEvent(Event.NODE_END) - .listener(destinationOutsideListener) + .listener(destinationInsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(destinationOutsideListener) + .listener(destinationInsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(destinationOutsideListener) - .startActivity("destination inside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(destinationInsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(destinationInsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(destinationInsideListener) - .compositeEnd() + .listener(destinationInsideListener) + .endEvent() + .endActivity() + .endActivity() .endProcess(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -31,6 +31,7 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -47,11 +48,19 @@ public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters){ } } - - public void testSetAndGetVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) + + protected ClientProcessDefinition createProcessDefinition() { + return ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .endActivity() .endProcess(); + } + + + public void testSetAndGetVariable() { + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -66,9 +75,7 @@ } public void testHasVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -79,9 +86,7 @@ } public void testSetVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -98,9 +103,7 @@ } public void testGetVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -116,9 +119,7 @@ } public void testRemoveVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -150,9 +151,7 @@ } public void testRemoveVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -167,9 +166,7 @@ } public void testGetVariableKeys() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -185,9 +182,7 @@ } public void testGetUnexistingVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -206,8 +201,11 @@ } public void testInitialiseVariablesBeforeProcessInstanceBegin() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new VariableActivity()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new VariableActivity()) + .initial() + .endActivity() .endProcess(); // here, the process instance is created first, and only later it is begun @@ -218,9 +216,7 @@ } public void testNullValue() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance();

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3675 - in projects/gwt-console/trunk: war/src/main/java/org/jboss/bpm/console/client and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-19 09:06:26 -0500 (Mon, 19 Jan 2009) New Revision: 3675 Modified: projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/View.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java Log: Restore layout: View are opened in workspace TabPanel as well Modified: projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java =================================================================== --- projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -22,13 +22,10 @@ package org.jboss.bpm.console.client; import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.TabPanel; -import com.gwtext.client.widgets.Component; -import com.gwtext.client.widgets.layout.FitLayout; -import com.gwtext.client.widgets.layout.BorderLayout; -import com.gwtext.client.widgets.layout.BorderLayoutData; -import com.gwtext.client.core.RegionPosition; +import java.util.List; +import java.util.ArrayList; + /** * An editor can be plugged into a {@link org.jboss.bpm.console.client.Workspace} * @@ -37,62 +34,14 @@ public abstract class Editor extends Panel { protected ApplicationContext appContext; - private TabPanel tabPanel; + protected List<String> managedTabs; public Editor(ApplicationContext applicationContext) { super(); this.appContext = applicationContext; + this.managedTabs = new ArrayList<String>(); this.setPaddings(10); - - // ------- - this.tabPanel = new TabPanel(); - this.tabPanel.setResizeTabs(true); - this.tabPanel.setMinTabWidth(115); - this.tabPanel.setTabWidth(135); - this.tabPanel.setEnableTabScroll(true); - this.tabPanel.setAutoScroll(true); - this.tabPanel.setPlain(true); - this.tabPanel.setActiveTab(0); - this.tabPanel.setBorder(false); - - // ------- - - Panel panel = new Panel(); - panel.setBorder(false); - panel.setPaddings(10); - panel.setLayout(new FitLayout()); - - panel.setWidth(UIConstants.EDITOR_WIDTH); - panel.setHeight(500); - - // ------- - - Panel borderPanel = new Panel(); - borderPanel.setBorder(false); - borderPanel.setLayout(new BorderLayout()); - - //add east panel - /*Panel eastPanel = new Panel(); - eastPanel.setHtml("east panel"); - eastPanel.setTitle("East Side"); - eastPanel.setCollapsible(true); - eastPanel.setWidth(225); - - BorderLayoutData eastData = new BorderLayoutData(RegionPosition.EAST); - eastData.setSplit(false); - eastData.setMinSize(75); - eastData.setMaxSize(100); - eastData.setMargins(new Margins(0, 0, 5, 0)); - - borderPanel.add(eastPanel, eastData);*/ - - // add center panel - borderPanel.add(tabPanel, new BorderLayoutData(RegionPosition.CENTER)); - - panel.add(borderPanel); - - this.add(panel); } public abstract String getEditorId(); @@ -105,41 +54,44 @@ public boolean hasView(String viewId) { - boolean b = false; final String tabId = viewId + ".tab"; - - Component[] tabs = tabPanel.getItems(); - for (int i = 0; i < tabs.length; i++) - { - Component tab = tabs[i]; - if (tab.getId().equals(tabId)) - { - b = true; - break; - } - } - - return b; + return appContext.getWorkpace().hasItem(tabId); } public void showView(String viewId) { final String tabId = viewId + ".tab"; - this.tabPanel.setActiveTab(tabId); + appContext.getWorkpace().setActiveTab(tabId); } public void addView(View view, boolean closable) { - view.setId(view.getViewId() + ".tab"); + String tabId = view.getViewId() + ".tab"; + + view.setId(tabId); // tabId != viewId view.setClosable(closable); view.setIconCls(view.getIconCSS()); view.setAutoScroll(true); - this.tabPanel.add(view); - this.tabPanel.setActiveTab(view.getId()); + appContext.getWorkpace().add(view); + appContext.getWorkpace().setActiveTab(view.getId()); + managedTabs.add(tabId); + } + public void closeViews() + { + for(String tabId : managedTabs) + { + Panel tab = appContext.getWorkpace().getItem(tabId); + if(tab!=null) + { + tab.collapse(); + } + } + } + class WrapperPanel extends Panel { public WrapperPanel(String id) Modified: projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/View.java =================================================================== --- projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/View.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/plugin/src/main/java/org/jboss/bpm/console/client/View.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -37,6 +37,7 @@ { super(); this.mainMenu = main; + this.setPaddings(10); } public abstract String getViewId(); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -71,6 +71,7 @@ mainPanel.setLayout(new FitLayout()); mainPanel.setWidth(UIConstants.OVERALL_WIDTH); mainPanel.setHeight(UIConstants.OVERALL_WIDTH); + mainPanel.setAutoWidth(false); return mainPanel; } @@ -103,7 +104,7 @@ launcher.launch(this, workspace); borderPanel.add(workspace, new BorderLayoutData(RegionPosition.CENTER)); - + // ------------------------------------------ mainPanel.add(borderPanel); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -91,15 +91,16 @@ public void onExamine(int row) { ProcessDefinitionRef proc = row2ProcessMap.get(row); - launchView(proc); + launchInstanceView(proc); } - public void launchView(ProcessDefinitionRef proc) - { - String editorId = ProcessEditor.ID; - Editor editor = (Editor) ComponentMgr.getComponent(editorId); - if (editor.hasView(editorId)) - editor.showView(editorId); + public void launchInstanceView(ProcessDefinitionRef proc) + { + String viewId = ProcessInstanceListView.createWidgetID(proc); + Editor editor = (Editor) ComponentMgr.getComponent(ProcessEditor.ID); + + if (editor.hasView(viewId)) + editor.showView(viewId); else editor.addView(new ProcessInstanceListView(proc, view), true); } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -79,7 +79,7 @@ Panel outerFormPanel = new Panel(); outerFormPanel.setBorder(false); - outerFormPanel.setPaddings(10, 0, 0, 0); + outerFormPanel.setPaddings(10); final FormPanel formPanel = new FormPanel(); formPanel.setFrame(true); @@ -142,28 +142,8 @@ outerFormPanel.add(formPanel); - // ---------------------------------- - - final View defaultView = new View(appContext) - { - - public String getViewId() - { - return getEditorId() + ".defaultView"; - } - - public String getIconCSS() - { - return ""; - } - }; - - defaultView.setBorder(false); - defaultView.setTitle("Process definitions"); - defaultView.add(processDefinitionList); - defaultView.add(outerFormPanel); - - addView(defaultView, false); + this.add(processDefinitionList); + this.add(outerFormPanel); } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListView.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListView.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -81,7 +81,7 @@ } }; - instanceList = new ProcessInstanceList(modelModificationCallback, proc, "Active", view); + instanceList = new ProcessInstanceList(modelModificationCallback, proc, "Process Instances", view); // --------------- @@ -91,13 +91,13 @@ tabPanel.setActiveTab(0); tabPanel.setWidth(UIConstants.EDITOR_PANEL_WIDTH); - PaddedPanel tabPadding = new PaddedPanel(tabPanel, 10, 0, 0, 0); + PaddedPanel tabPadding = new PaddedPanel(tabPanel, 10); // ---------------------------------------- detailsForm = new ProcessInstanceDetailForm(view, modelModificationCallback); - modelListeners.addListener((ModelChangeListener) detailsForm); + modelListeners.addListener(detailsForm); // ---------------- Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportView.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ProcessReportView.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -67,6 +67,9 @@ public void onRender(Component component) { + Panel panel = new Panel(definitionName +" Report"); + panel.setPaddings(10); + final String reportUrl = view.getUrlBuilder().getDefinitionReportUrl(definitionName); ConsoleLog.debug("Report resource:" + reportUrl); @@ -111,8 +114,10 @@ p.add(new Separator()); p.add(refreshBtn); - add(p); - add(birtPanel); + panel.add(p); + panel.add(birtPanel); + + add(panel); } } ); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -50,8 +50,8 @@ super(applicationContext); this.setId(ID); - this.setPaddings(10); - + this.setPaddings(10); + // ------------------------------------- this.setLayout(new VerticalLayout(10)); @@ -60,6 +60,9 @@ { public void onRender(Component component) { + + Panel panel = new Panel("Report Overview"); + panel.setPaddings(10); final String reportUrl = applicationContext.getUrlBuilder().getOverviewReportUrl(); ConsoleLog.debug("Report resource:" + reportUrl); @@ -105,28 +108,10 @@ toolsPanel.add(new Separator()); toolsPanel.add(refreshBtn); - final View defaultView = new View(appContext) - { + panel.add(toolsPanel); + panel.add(birtPanel); - public String getViewId() - { - return getEditorId() + ".defaultView"; - } - - public String getIconCSS() - { - return ""; - } - }; - - defaultView.setBorder(false); - defaultView.setTitle("Metric Overview"); - - - defaultView.add(toolsPanel); - defaultView.add(birtPanel); - - addView(defaultView, false); + add(panel); } } ); @@ -231,11 +216,7 @@ } ); - TreeNode export = new TreeNode("Export stats"); - export.setExpanded(true); - root.appendChild(overview); - root.appendChild(export); setRootVisible(true); setRootNode(root); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -61,7 +61,7 @@ this.setId(ID); this.setLayout(new ColumnLayout()); - this.setWidth(UIConstants.EDITOR_WIDTH); + this.setWidth(UIConstants.EDITOR_WIDTH); this.addListener( new PanelListenerAdapter() @@ -104,14 +104,14 @@ { if (!initialized) { - + tabPanel = new TabPanel(); tabPanel.setPaddings(10); tabPanel.setPlain(true); tabPanel.setActiveTab(0); tabPanel.setWidth(UIConstants.EDITOR_PANEL_WIDTH); - PaddedPanel tabPadding = new PaddedPanel(tabPanel, 10, 0, 0, 0); + PaddedPanel tabPadding = new PaddedPanel(tabPanel, 10); // ---------------------------------- @@ -124,7 +124,7 @@ } }; - taskList = new TaskList(modelModificationCallback, "Task overview", appContext); + taskList = new TaskList(modelModificationCallback, "Task List", appContext); final RowSelectionModel sm = new RowSelectionModel(true); sm.addListener( new RowSelectionListenerAdapter() @@ -153,30 +153,11 @@ // ------- - final View defaultView = new View(appContext) - { + this.add(taskList); + this.add(tabPadding); - public String getViewId() - { - return getEditorId() + ".defaultView"; - } - - public String getIconCSS() - { - return ""; - } - }; - - defaultView.setBorder(false); - defaultView.setTitle("Task list"); - - defaultView.add(taskList); - defaultView.add(tabPadding); - // ------- - addView(defaultView, false); - doLayout(); initialized = true; Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -34,6 +34,7 @@ import com.gwtext.client.widgets.event.PanelListenerAdapter; import com.gwtext.client.widgets.grid.*; import com.gwtext.client.widgets.grid.event.GridCellListener; +import org.jboss.bpm.console.client.MainView; import org.jboss.bpm.console.client.UIConstants; import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.model.DTOParser; @@ -47,237 +48,234 @@ */ public class TaskList extends Panel { - private Map<Integer, TaskRef> row2taskref = new HashMap<Integer, TaskRef>(); - private ApplicationContext mainView; - private GridPanel grid; - private GroupingStore store; - private String title; - private RowSelectionModel rowSelectionModel; - public static final int PAGE_SIZE = 15; - private int selectedRowIndex = -1; + private Map<Integer, TaskRef> row2taskref = new HashMap<Integer, TaskRef>(); + private MainView appContext; + private GridPanel grid; + private GroupingStore store; + private String title; + private RowSelectionModel rowSelectionModel; + public static final int PAGE_SIZE = 15; + private int selectedRowIndex = -1; - private ModelModificationCallback modelModificationCallback; + private ModelModificationCallback modelModificationCallback; - public TaskList(ModelModificationCallback callback, String titleName, final ApplicationContext view) - { - this.mainView = view; - //this.title = titleName; - this.modelModificationCallback = callback; + public TaskList(ModelModificationCallback callback, String titleName, final ApplicationContext appContext) + { + this.title = titleName; + this.modelModificationCallback = callback; - this.setPaddings(10, 0,0,0); - this.setHeader(false); - this.setBorder(false); - this.setFrame(false); - this.setIconCls("bpm-task-icon"); + this.setPaddings(10); + this.setHeader(false); + this.setBorder(false); + this.setFrame(false); + this.setIconCls("bpm-task-icon"); - String resourceUrl = view.getUrlBuilder().getTaskListByActorURL(view.getAuthentication().getUsername()); - DataProxy dataProxy = new ScriptTagProxy(resourceUrl, 1000 * 10); + String resourceUrl = appContext.getUrlBuilder().getTaskListByActorURL(appContext.getAuthentication().getUsername()); + DataProxy dataProxy = new ScriptTagProxy(resourceUrl, 1000*10); - final Reader reader = createReader(); + final Reader reader = createReader(); - store = new GroupingStore(); - store.setReader(reader); - store.setDataProxy(dataProxy); - store.setSortInfo(new SortState("id", SortDir.ASC)); - store.setGroupField("currentState"); - store.addStoreListener(new ListViewStoreListener(this)); + store = new GroupingStore(); + store.setReader(reader); + store.setDataProxy(dataProxy); + store.setSortInfo(new SortState("id", SortDir.ASC)); + store.setGroupField("currentState"); + store.addStoreListener( new ListViewStoreListener(this) ); - // PanelListener will lazy load store data. - // Store.onLoad() callback will populate the grid - // and add it to the container panel. - this.addListener( - new PanelListenerAdapter() - { - public boolean doBeforeRender(Component component) - { - modelModificationCallback.onStaleModel(); - return true; - } - } - ); - } + // PanelListener will lazy load store data. + // Store.onLoad() callback will populate the grid + // and add it to the container panel. + this.addListener( + new PanelListenerAdapter() + { + public boolean doBeforeRender(Component component) + { + modelModificationCallback.onStaleModel(); + return true; + } + } + ); + } - protected void onRecordsLoaded(Record[] records) - { - try - { - int i = 0; - for (Record r : records) + protected void onRecordsLoaded(Record[] records) + { + try { - TaskRef ref = transform(r); - row2taskref.put(i, ref); - i++; + int i=0; + for(Record r : records) + { + TaskRef ref = transform(r); + row2taskref.put(i, ref); + i++; + } } - } - catch (Throwable e) - { - ConsoleLog.error("Failed to parse task ref", e); - } + catch (Throwable e) + { + ConsoleLog.error("Failed to parse task ref", e); + } - ConsoleLog.debug("Loaded " + row2taskref.size() + " tasks"); - } + ConsoleLog.debug("Loaded " + row2taskref.size() + " tasks"); + } - public static TaskRef transform(Record r) - { - JavaScriptObject js = r.getDataAsJsObject(); - JSONObject jso = new JSONObject(js); - TaskRef ref = DTOParser.parseTaskReference(jso); - return ref; - } + public static TaskRef transform(Record r) + { + JavaScriptObject js = r.getDataAsJsObject(); + JSONObject jso = new JSONObject(js); + TaskRef ref = DTOParser.parseTaskReference(jso); + return ref; + } - private ColumnModel createColumnModel() - { - final ColumnModel columnModel = new ColumnModel( - new ColumnConfig[] - { - new ColumnConfig("ID", "id", 35, true), - new ColumnConfig("Task Name", "name", 290, true, null, "expand"), - new ColumnConfig("Assigned to", "actor", 75, true), - new ColumnConfig("State", "currentState", 50, true) + private ColumnModel createColumnModel() + { + final ColumnModel columnModel = new ColumnModel( + new ColumnConfig[] + { + new ColumnConfig("ID", "id", 35, true), + new ColumnConfig("Task Name", "name", 290, true, null, "expand"), + new ColumnConfig("Assigned to", "actor", 75, true), + new ColumnConfig("State", "currentState", 50, true) + } + ); + return columnModel; + } + + private JsonReader createReader() + { + final RecordDef recordDef = new RecordDef( + new FieldDef[]{ + new IntegerFieldDef("id"), + new StringFieldDef("name"), + new StringFieldDef("actor"), + new StringFieldDef("currentState") } - ); - return columnModel; - } + ); - private JsonReader createReader() - { - final RecordDef recordDef = new RecordDef( - new FieldDef[]{ - new IntegerFieldDef("id"), - new StringFieldDef("name"), - new StringFieldDef("actor"), - new StringFieldDef("currentState") - } - ); + final JsonReader reader = new JsonReader(recordDef); + reader.setRoot("tasks"); + reader.setTotalProperty("totalCount"); + reader.setId("id"); + return reader; + } - final JsonReader reader = new JsonReader(recordDef); - reader.setRoot("tasks"); - reader.setTotalProperty("totalCount"); - reader.setId("id"); - return reader; - } + private class ListViewStoreListener extends StoreListenerAdapter + { - private class ListViewStoreListener extends StoreListenerAdapter - { + Panel containerPanel; - Panel containerPanel; + public ListViewStoreListener(Panel containerPanel) + { + this.containerPanel = containerPanel; + } - public ListViewStoreListener(Panel containerPanel) - { - this.containerPanel = containerPanel; - } + /** + * load callback will push records to implementation + * and (!) add the grid to the container panel. + */ + public void onLoad(Store store, Record[] records) + { - /** - * load callback will push records to implementation - * and (!) add the grid to the container panel. - */ - public void onLoad(Store store, Record[] records) - { + onRecordsLoaded(records); - onRecordsLoaded(records); + grid = assembleGrid(); - grid = assembleGrid(); + containerPanel.clear(); + containerPanel.add(grid); + containerPanel.doLayout(); + } - containerPanel.clear(); - containerPanel.add(grid); - containerPanel.doLayout(); - } + public void onLoadException(Throwable throwable) + { + ConsoleLog.error("Failed to load remote data", throwable); + } - public void onLoadException(Throwable throwable) - { - ConsoleLog.error("Failed to load remote data", throwable); - } + } - } + private GridPanel assembleGrid() + { + final ColumnModel columnModel = createColumnModel(); - private GridPanel assembleGrid() - { - final ColumnModel columnModel = createColumnModel(); + GridPanel grid = new GridPanel(); + grid.setStore(store); + grid.setColumnModel(columnModel); + grid.setFrame(true); + grid.setStripeRows(true); + grid.setAutoExpandColumn("name"); + grid.setTitle(title); - GridPanel grid = new GridPanel(); - grid.setStore(store); - grid.setColumnModel(columnModel); - grid.setFrame(true); - grid.setBorder(false); - grid.setStripeRows(true); - grid.setAutoExpandColumn("name"); - //grid.setTitle(title); + GroupingView gridView = new GroupingView(); + gridView.setForceFit(true); + gridView.setGroupTextTpl("{text} ({[values.rs.length]} {[values.rs.length > 1 ? \"Items\" : \"Item\"]})"); - GroupingView gridView = new GroupingView(); - gridView.setForceFit(true); - gridView.setGroupTextTpl("{text} ({[values.rs.length]} {[values.rs.length > 1 ? \"Items\" : \"Item\"]})"); - - if (rowSelectionModel != null) - { - grid.setSelectionModel(rowSelectionModel); - grid.doOnRender(new Function() + if(rowSelectionModel!=null) { - public void execute() - { - if (-1 == selectedRowIndex) - rowSelectionModel.selectFirstRow(); - else - rowSelectionModel.selectRow(selectedRowIndex); - } - }, 10); - } - grid.setView(gridView); - grid.setFrame(true); - grid.setWidth(UIConstants.EDITOR_PANEL_WIDTH); - grid.setHeight(250); - grid.setEnableHdMenu(false); + grid.setSelectionModel(rowSelectionModel); + grid.doOnRender(new Function() { + public void execute() + { + if(-1==selectedRowIndex) + rowSelectionModel.selectFirstRow(); + else + rowSelectionModel.selectRow(selectedRowIndex); + } + }, 10); + } + grid.setView(gridView); + grid.setFrame(true); + grid.setWidth(UIConstants.EDITOR_PANEL_WIDTH); + grid.setHeight(250); + grid.setEnableHdMenu(false); - grid.setBottomToolbar(createToolbar(store)); + grid.setBottomToolbar(createToolbar(store)); - return grid; - } + return grid; + } - private PagingToolbar createToolbar(final Store store) - { - PagingToolbar pagingToolbar = new PagingToolbar(store); - pagingToolbar.setPageSize(PAGE_SIZE); - pagingToolbar.setDisplayInfo(true); - pagingToolbar.setDisplayMsg("{0} - {1} of {2}"); + private PagingToolbar createToolbar(final Store store) + { + PagingToolbar pagingToolbar = new PagingToolbar(store); + pagingToolbar.setPageSize(PAGE_SIZE); + pagingToolbar.setDisplayInfo(true); + pagingToolbar.setDisplayMsg("{0} - {1} of {2}"); - pagingToolbar.addSeparator(); - pagingToolbar.addSpacer(); + pagingToolbar.addSeparator(); + pagingToolbar.addSpacer(); - return pagingToolbar; - } + return pagingToolbar; + } - public void reloadStore() - { - ConsoleLog.debug("Reload " + this.getId()); - store.load(0, PAGE_SIZE); - } + public void reloadStore() + { + ConsoleLog.debug("Reload " + this.getId()); + store.load(0, PAGE_SIZE); + } - public GridPanel getGrid() - { - return grid; - } + public GridPanel getGrid() + { + return grid; + } - public void setRowSelectionModel(RowSelectionModel model) - { - this.rowSelectionModel = model; - } + public void setRowSelectionModel(RowSelectionModel model) + { + this.rowSelectionModel = model; + } - public class ListViewCellListener implements GridCellListener - { - public void onCellClick(GridPanel grid, int rowIndex, int colindex, EventObject e) - { - selectedRowIndex = rowIndex; - } + public class ListViewCellListener implements GridCellListener + { + public void onCellClick(GridPanel grid, int rowIndex, int colindex, EventObject e) + { + selectedRowIndex = rowIndex; + } - public void onCellContextMenu(GridPanel gridPanel, int i, int i1, EventObject eventObject) - { + public void onCellContextMenu(GridPanel gridPanel, int i, int i1, EventObject eventObject) + { - } + } - public void onCellDblClick(GridPanel gridPanel, int i, int i1, EventObject eventObject) - { + public void onCellDblClick(GridPanel gridPanel, int i, int i1, EventObject eventObject) + { - } - } + } + } } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -74,14 +74,14 @@ super(); this.modelModificationCallback = callback; - //this.title = titleName; + this.title = titleName; this.view = view; this.resourceUrl = resourceUrl; this.setId(getId() + "(" + titleName + ")"); // ---------------------------------------- - this.setPaddings(10, 0, 0, 0); + this.setPaddings(10); this.setHeader(false); this.setBorder(false); this.setFrame(false); Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-01-19 14:06:26 UTC (rev 3675) @@ -1,3 +1,3 @@ org.jboss.bpm.console.client.process.ProcessEditor org.jboss.bpm.console.client.task.TaskEditor -org.jboss.bpm.console.client.report.ReportEditor \ No newline at end of file +org.jboss.bpm.console.client.report.ReportEditor \ No newline at end of file Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2009-01-19 14:00:29 UTC (rev 3674) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2009-01-19 14:06:26 UTC (rev 3675) @@ -155,7 +155,7 @@ ProcessDefinitionRef testPd = getTestProcessDefinition(processDefinitions); assertNotNull("No test definition given: " +processDefinitions, testPd); - list.launchView(testPd); // will create an instance editor + list.launchInstanceView(testPd); // will create an instance editor // lookup instance editor String editorId = ProcessInstanceListView.createWidgetID(testPd);

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3674 - in jbpm4/trunk/modules: test-pojo/src/main/java/org/jbpm/test/activities and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 09:00:29 -0500 (Mon, 19 Jan 2009) New Revision: 3674 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java Log: migrations of process factory to process definition builder Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -25,6 +25,7 @@ import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.model.ProcessFactory; /** * @author Tom Baeyens @@ -109,4 +110,9 @@ node.setPreviousNeeded(true); return this; } + + public ActivityBuilder scope() { + node.setLocalScope(true); + return this; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -36,8 +36,6 @@ */ public abstract class CompositeBuilder { - private static final Class<?>[] ACTIVITYBUILDER_PARAMTYPES = new Class<?>[]{CompositeBuilder.class, String.class}; - protected CompositeElementImpl compositeElement; public abstract ProcessDefinitionImpl endProcess(); @@ -52,8 +50,15 @@ return compositeElement.createEvent(eventName); } + public CompositeBuilder variable(String name) { + return startVariable(name) + .endVariable(); + } + public CompositeBuilder variable(String name, String type) { - return startVariable(name, type).endVariable(); + return startVariable(name) + .type(type) + .endVariable(); } public TimerBuilder startTimer() { @@ -64,8 +69,9 @@ return new TimerBuilder(this, eventName); } - public VariableBuilder startVariable(String name, String type) { - return new VariableBuilder(this); + public VariableBuilder startVariable(String name) { + return new VariableBuilder(this) + .name(name); } public ActivityBuilder startActivity() { @@ -114,8 +120,8 @@ return new EventBuilder(this, eventName); } - public ExceptionHandlerBuilder startExceptionHandler(Class<? extends Throwable> exceptionType) { - return new ExceptionHandlerBuilder(this, exceptionType); + public CompositeExceptionHandlerBuilder startExceptionHandler(Class<? extends Throwable> exceptionType) { + return new CompositeExceptionHandlerBuilder(this, exceptionType); } public CompositeBuilder property(String name, String value) { Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -0,0 +1,64 @@ +/* + * 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.builder; + +import org.jbpm.listener.EventListener; +import org.jbpm.pvm.internal.wire.Descriptor; + + +/** + * @author Tom Baeyens + */ +public class CompositeExceptionHandlerBuilder extends ExceptionHandlerBuilder { + + protected CompositeBuilder compositeBuilder; + + public CompositeExceptionHandlerBuilder(CompositeBuilder compositeBuilder, Class<? extends Throwable> exceptionType) { + this.compositeBuilder = compositeBuilder; + exceptionHandler = compositeBuilder.compositeElement.createExceptionHandler(); + exceptionClass(exceptionType); + } + + public CompositeExceptionHandlerBuilder exceptionClass(Class<? extends Throwable> exceptionType) { + super.setExceptionClass(exceptionType); + return this; + } + + public CompositeExceptionHandlerBuilder listener(EventListener eventListener) { + super.addListener(eventListener); + return this; + } + + public CompositeExceptionHandlerBuilder listener(Descriptor descriptor) { + super.addListener(descriptor); + return this; + } + + public CompositeExceptionHandlerBuilder listener(String expression) { + super.addListener(expression); + return this; + } + + public CompositeBuilder endExceptionHandler() { + return compositeBuilder; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeExceptionHandlerBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -73,7 +73,11 @@ getEvent().addProperty(descriptor); return this; } - + + public EventExceptionHandlerBuilder startExceptionHandler(Class<? extends Throwable> exceptionType) { + return new EventExceptionHandlerBuilder(this, exceptionType); + } + public CompositeBuilder endEvent() { return compositeBuilder; } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -0,0 +1,65 @@ +/* + * 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.builder; + +import org.jbpm.listener.EventListener; +import org.jbpm.pvm.internal.wire.Descriptor; + + +/** + * @author Tom Baeyens + */ +public class EventExceptionHandlerBuilder extends ExceptionHandlerBuilder { + + protected EventBuilder eventBuilder; + + public EventExceptionHandlerBuilder(EventBuilder eventBuilder, Class<? extends Throwable> exceptionType) { + this.eventBuilder = eventBuilder; + exceptionHandler = eventBuilder.getEvent().createExceptionHandler(); + exceptionClass(exceptionType); + } + + public EventExceptionHandlerBuilder exceptionClass(Class<? extends Throwable> exceptionType) { + super.setExceptionClass(exceptionType); + return this; + } + + public EventExceptionHandlerBuilder listener(EventListener eventListener) { + super.addListener(eventListener); + return this; + } + + public EventExceptionHandlerBuilder listener(Descriptor descriptor) { + super.addListener(descriptor); + return this; + } + + public EventExceptionHandlerBuilder listener(String expression) { + super.addListener(expression); + return this; + } + + public EventBuilder endExceptionHandler() { + return eventBuilder; + } + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventExceptionHandlerBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -31,33 +31,23 @@ */ public class ExceptionHandlerBuilder { - protected CompositeBuilder compositeBuilder; protected ExceptionHandlerImpl exceptionHandler; - public ExceptionHandlerBuilder(CompositeBuilder compositeBuilder, Class<? extends Throwable> exceptionType) { - this.compositeBuilder = compositeBuilder; - exceptionHandler = compositeBuilder.compositeElement.createExceptionHandler(); + protected void setExceptionClass(Class<? extends Throwable> exceptionType) { exceptionHandler.setExceptionClassName(exceptionType.getName()); } - public ExceptionHandlerBuilder listener(EventListener eventListener) { + protected void addListener(EventListener eventListener) { exceptionHandler.createEventListenerReference(eventListener); - return this; } - public ExceptionHandlerBuilder listener(Descriptor descriptor) { + protected void addListener(Descriptor descriptor) { exceptionHandler.createEventListenerReference(descriptor); - return this; } - public ExceptionHandlerBuilder listener(String expression) { + protected void addListener(String expression) { exceptionHandler .createEventListenerReference() .setExpression(expression); - return this; } - - public CompositeBuilder endExceptionHandler() { - return compositeBuilder; - } } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -30,7 +30,7 @@ import org.jbpm.listener.EventListener; import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Event; -import org.jbpm.pvm.model.ProcessFactory; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.test.JbpmTestCase; /** @@ -65,16 +65,21 @@ public void testExceptionHandlerOnProcessDefinition() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .exceptionHandler(RuntimeException.class) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startExceptionHandler(RuntimeException.class) .listener(catcher) - .exceptionHandlerEnd() - .startActivity("initial").initial().behaviour(new WaitState()) + .endExceptionHandler() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) .listener(new Batter()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -87,16 +92,21 @@ public void testExceptionHandlerOnEvent() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) - .exceptionHandler(RuntimeException.class) + .startExceptionHandler(RuntimeException.class) .listener(catcher) - .exceptionHandlerEnd() + .endExceptionHandler() .listener(new Batter()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -109,16 +119,21 @@ public void testExceptionHandlerOnAction() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) .listener(new Batter()) - .exceptionHandler(RuntimeException.class) - .listener(catcher) - .exceptionHandlerEnd() - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .startExceptionHandler(RuntimeException.class) + .listener(catcher) + .endExceptionHandler() + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -131,16 +146,21 @@ public void testExceptionHandlerOnOtherNode() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("initial",new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) .listener(new Batter()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .exceptionHandler(RuntimeException.class) + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .startExceptionHandler(RuntimeException.class) .listener(catcher) - .exceptionHandlerEnd() - .endProcess(); + .endExceptionHandler() + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -156,17 +176,22 @@ public void testExceptionHandlerOnOtherEvent() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent("other") - .exceptionHandler(RuntimeException.class) + .startExceptionHandler(RuntimeException.class) .listener(catcher) - .exceptionHandlerEnd() + .endExceptionHandler() + .endEvent() .startEvent(Event.NODE_END) .listener(new Batter()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -186,43 +211,22 @@ } } - public void testExceptionHandlerOnOtherAction() { - Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(new BehavedAction()) - .exceptionHandler(RuntimeException.class) - .listener(catcher) - .exceptionHandlerEnd() - .listener(new Batter()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); - - ClientExecution execution = processDefinition.startProcessInstance(); - - assertEquals("initial", execution.getNode().getName()); - try { - execution.signal(); - fail("expected exception"); - } catch (RuntimeException e) { - // OK - } - } - public void testUnmatchedExceptionHandlerOnAction() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) + .startExceptionHandler(NullPointerException.class) + .listener(catcher) + .endExceptionHandler() .listener(new Batter()) - .exceptionHandler(NullPointerException.class) - .listener(catcher) - .exceptionHandlerEnd() - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -246,17 +250,21 @@ public void testRethrowingExceptionHandler() { RethrowingCatcher rethrowingCatcher = new RethrowingCatcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) + .startExceptionHandler(RuntimeException.class) + .listener(rethrowingCatcher) + .endExceptionHandler() .listener(new Batter()) - .exceptionHandler(RuntimeException.class) - .listener(rethrowingCatcher) - .exceptionHandlerEnd() - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); - + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); try { @@ -266,60 +274,4 @@ assertTextPresent("greetz from the retrhowing catcher", e.getMessage()); } } - - public void testRethrowingExceptionHandlerCaughtByTheOuterExceptionHandler() { - - // just like in java, when an exception handler rethrows, the search - // for a matching exception handler will continue in the outer scope - // (=the surrounding process element) - - RethrowingCatcher rethrowingCatcher = new RethrowingCatcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .exceptionHandler(RuntimeException.class) - .listener(new Catcher()) - .exceptionHandlerEnd() - .listener(new Batter()) - .exceptionHandler(RuntimeException.class) - .listener(rethrowingCatcher) - .exceptionHandlerEnd() - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); - - ClientExecution execution = processDefinition.startProcessInstance(); - - assertEquals("initial", execution.getNode().getName()); - execution.signal(); - } - - public void testRethrowingExceptionHandlerIgnoredByTheSubsequentExceptionHandlerInTheSameScope() { - - // just like in java, subsequent exception handlers will be skipped when the - // an exception handler rethrows - - RethrowingCatcher rethrowingCatcher = new RethrowingCatcher(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("initial").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(new Batter()) - .exceptionHandler(RuntimeException.class) - .listener(rethrowingCatcher) - .exceptionHandlerEnd() - .exceptionHandler(RuntimeException.class) - .listener(new Catcher()) - .exceptionHandlerEnd() - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); - - ClientExecution execution = processDefinition.startProcessInstance(); - try { - execution.signal(); - fail("expected exception"); - } catch (RuntimeException e) { - assertTextPresent("greetz from the retrhowing catcher", e.getMessage()); - } - } } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -30,6 +30,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -77,12 +78,16 @@ } public void testBasicState() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new AutomaticActivity()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) - .flow().to("c") - .startActivity("c").behaviour(new AutomaticActivity()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startActivity("a", new AutomaticActivity()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new AutomaticActivity()) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -99,13 +104,17 @@ } public void testSignalOnInactiveExecution() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new AutomaticActivity()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startActivity("a", new AutomaticActivity()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() - .flow().to("c") - .startActivity("c").behaviour(new AutomaticActivity()) + .flow("c") + .endActivity() + .startActivity("c", new AutomaticActivity()) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -123,12 +132,16 @@ } public void testCustomEndState() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new AutomaticActivity()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) - .flow().to("c") - .startActivity("c").behaviour(new AutomaticActivity()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startActivity("a", new AutomaticActivity()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new AutomaticActivity()) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -147,12 +160,17 @@ } public void testInvalidCustomStates() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new AutomaticActivity()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) - .flow().to("c") - .startActivity("c").behaviour(new AutomaticActivity()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new AutomaticActivity()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new AutomaticActivity()) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -29,6 +29,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; @@ -58,14 +59,20 @@ } public static ClientProcessDefinition createCreditProcess() { - return ProcessFactory.startProcess() - .startActivity("creditRate?").initial().behaviour(new ExternalDecision()) - .flow("good").to("priority delivery") - .flow("average").to("bulk delivery") - .flow("bad").to("payment upfront") - .startActivity("priority delivery").behaviour(new WaitState()) - .startActivity("bulk delivery").behaviour(new WaitState()) - .startActivity("payment upfront").behaviour(new WaitState()) + return ProcessDefinitionBuilder + .startProcess() + .startActivity("creditRate?", new ExternalDecision()) + .initial() + .flow("priority delivery", "good") + .flow("bulk delivery", "average") + .flow("payment upfront", "bad") + .endActivity() + .startActivity("priority delivery", new WaitState()) + .endActivity() + .startActivity("bulk delivery", new WaitState()) + .endActivity() + .startActivity("payment upfront", new WaitState()) + .endActivity() .endProcess(); } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -34,6 +34,7 @@ import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Node; import org.jbpm.model.OpenExecution; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -73,12 +74,17 @@ List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(functionalActivity) - .flow().to("b") - .startActivity("b").behaviour(functionalActivity) - .flow().to("c") - .startActivity("c").behaviour(functionalActivity) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", functionalActivity) + .initial() + .flow("b") + .endActivity() + .startActivity("b", functionalActivity) + .flow("c") + .endActivity() + .startActivity("c", functionalActivity) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -109,11 +115,16 @@ List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new AutomaticActivity()) - .flow().to("b") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new AutomaticActivity()) + .initial() + .startFlow("b") .listener(functionalActivity) - .startActivity("b").behaviour(new AutomaticActivity()) + .endFlow() + .endActivity() + .startActivity("b", new AutomaticActivity()) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -139,10 +150,13 @@ List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .compositeNode("a").initial().behaviour(new Composite()) - .startActivity().behaviour(functionalActivity) - .compositeEnd() + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new Composite()) + .initial() + .startActivity(functionalActivity) + .endActivity() + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -9,6 +9,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -84,13 +85,18 @@ public void testWhile() { int loops = 20; - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("for").initial().behaviour(new For(loops)) - .flow("loop").to("recorder") - .flow("done").to("end") - .startActivity("recorder").behaviour(new Recorder()) - .flow().to("for") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("for", new For(loops)) + .initial() + .flow("recorder", "loop") + .flow("end", "done") + .endActivity() + .startActivity("recorder", new Recorder()) + .flow("for") + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -29,6 +29,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -58,13 +59,18 @@ } public void testInactivationWhenCreatingNestedExecution() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new AutomaticActivity()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new AutomaticActivity()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-19 13:14:53 UTC (rev 3673) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-19 14:00:29 UTC (rev 3674) @@ -30,7 +30,8 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.model.Node; import org.jbpm.model.OpenExecution; -import org.jbpm.pvm.model.ProcessFactory; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; +import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; import org.jbpm.test.JbpmTestCase; @@ -60,9 +61,12 @@ } public void testProcessInstanceVariableDeclaration() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() .variable("flight") - .startActivity("a").initial().behaviour(new WaitState()) + .startActivity("a", new WaitState()) + .initial() + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -72,9 +76,13 @@ } public void testProcessInstanceVariableDeclarationWithInitialValue() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .variable("flight", "B52") - .startActivity("a").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startVariable("flight") + .initialValue(new StringDescriptor("B52")) + .endVariable() + .startActivity("a", new WaitState()) + .initial() + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -84,20 +92,35 @@ } public void testNestedScopeDeclarations() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .variable("flight", "B52") - .compositeNode("outer").behaviour(new Composite()) - .variable("duration", "22 minutes") - .compositeNode("middle").behaviour(new Composite()) - .variable("altitude", "31000 ft") - .compositeNode("inner").behaviour(new Composite()) - .variable("passengers", "52") - .compositeNode("start").initial().behaviour(new WaitState()) - .variable("fuel", "kerosine") - .compositeEnd() - .compositeEnd() - .compositeEnd() - .compositeEnd() + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startVariable("flight") + .initialValue(new StringDescriptor("B52")) + .endVariable() + .startActivity("outer", new Composite()) + .scope() + .startVariable("duration") + .initialValue(new StringDescriptor("22 minutes")) + .endVariable() + .startActivity("middle", new Composite()) + .scope() + .startVariable("altitude") + .initialValue(new StringDescriptor("31000 ft")) + .endVariable() + .startActivity("inner", new Composite()) + .scope() + .startVariable("passengers") + .initialValue(new StringDescriptor("52")) + .endVariable() + .startActivity("start", new WaitState()) + .initial() + .scope() + .startVariable("fuel") + .initialValue(new StringDescriptor("kerosine")) + .endVariable() + .endActivity() + .endActivity() + .endActivity() + .endActivity() .endProcess(); Map<String, Object> expectedVariables = new HashMap<String, Object>(); @@ -125,13 +148,24 @@ } public void testHiddenVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .variable("flight", "B52") - .compositeNode("c").behaviour(new Composite()) - .variable("flight", "U2") - .startActivity("i").initial().behaviour(new WaitState()) - .variable("flight", "C130") - .compositeEnd() + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startVariable("flight") + .initialValue(new StringDescriptor("B52")) + .endVariable() + .startActivity("c", new Composite()) + .scope() + .startVariable("flight") + .initialValue(new StringDescriptor("U2")) + .endVariable() + .startActivity("i", new WaitState()) + .scope() + .initial() + .startVariable("flight") + .initialValue(new StringDescriptor("C130")) + .endVariable() + .endActivity() + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -163,27 +197,48 @@ | | +---------------------------+ | +----------------------------+ | +--------------------------------------------------------------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .variable("flight", "B52") - .compositeNode("outer").behaviour(new Composite()) - .variable("duration", "22 minutes") - .compositeNode("left-middle").behaviour(new Composite()) - .variable("altitude", "31000 ft") - .compositeNode("left-inner").behaviour(new Composite()) - .variable("passengers", "52") - .compositeNode("left-start").initial().behaviour(new WaitState()) - .variable("fuel", "kerosine") - .flow().to("right-inner") - .compositeEnd() - .compositeEnd() - .compositeEnd() - .compositeNode("right-middle").behaviour(new Composite()) - .variable("customer", "coca-cola") - .compositeNode("right-inner").behaviour(new WaitState()) - .variable("date", "today") - .compositeEnd() - .compositeEnd() - .compositeEnd() + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess() + .startVariable("flight") + .initialValue(new StringDescriptor("B52")) + .endVariable() + .startActivity("outer", new Composite()) + .scope() + .startVariable("duration") + .initialValue(new StringDescriptor("22 minutes")) + .endVariable() + .startActivity("left-middle", new Composite()) + .scope() + .startVariable("altitude") + .initialValue(new StringDescriptor("31000 ft")) + .endVariable() + .startActivity("left-inner", new Composite()) + .scope() + .startVariable("passengers") + .initialValue(new StringDescriptor("52")) + .endVariable() + .startActivity("left-start", new WaitState()) + .initial() + .scope() + .flow("right-inner") + .startVariable("fuel") + .initialValue(new StringDescriptor("kerosine")) + .endVariable() + .endActivity() + .endActivity() + .endActivity() + .startActivity("right-middle", new Composite()) + .scope() + .startVariable("customer") + .initialValue(new StringDescriptor("coca-cola")) + .endVariable() + .startActivity("right-inner", new WaitState()) + .scope() + .startVariable("date") + .initialValue(new StringDescriptor("today")) + .endVariable() + .endActivity() + .endActivity() + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance();

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3673 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/command.

by do-not-reply＠jboss.org

Author: camunda Date: 2009-01-19 08:14:53 -0500 (Mon, 19 Jan 2009) New Revision: 3673 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java Log: added marker process variable to indicate version change (and remember old version) Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-01-19 11:05:47 UTC (rev 3672) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-01-19 13:14:53 UTC (rev 3673) @@ -58,6 +58,8 @@ { private static final long serialVersionUID = 2277080393930008224L; + + public static final String OLD_VERSION_PROCESS_VARIABLE_NAME = "processDefinitionVersionBeforeChange"; /** * new version of process, if <=0, the latest process definition is used @@ -109,6 +111,9 @@ if (newDef==null) { throw new JbpmException("Process definition " + oldDef.getName() + " in version " + newVersion + " not found."); } + + // set process variable to remember old version + pi.getContextInstance().setVariable(OLD_VERSION_PROCESS_VARIABLE_NAME, oldDef.getVersion()); log.debug("Start changing process id " + pi.getId() + " from version " + pi.getProcessDefinition().getVersion() + " to new version " + newDef.getVersion()); pi.setProcessDefinition(newDef);

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3672 - in jbpm4/trunk/modules: test-pojo/src/main/java/org/jbpm/test/activities and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 06:05:47 -0500 (Mon, 19 Jan 2009) New Revision: 3672 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java Log: migrations of process factory to process definition builder Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 11:01:14 UTC (rev 3671) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 11:05:47 UTC (rev 3672) @@ -104,4 +104,9 @@ protected void addUnresolvedFlow(UnresolvedFlow unresolvedFlow) { compositeBuilder.addUnresolvedFlow(unresolvedFlow); } + + public ActivityBuilder needsPrevious() { + node.setPreviousNeeded(true); + return this; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-19 11:01:14 UTC (rev 3671) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-19 11:05:47 UTC (rev 3672) @@ -49,7 +49,10 @@ } public static ProcessDefinitionBuilder startProcess(String processDefinitionName) { - ProcessDefinitionImpl processDefinition = new ProcessDefinitionImpl(); + return startProcess(processDefinitionName, new ProcessDefinitionImpl()); + } + + public static ProcessDefinitionBuilder startProcess(String processDefinitionName, ProcessDefinitionImpl processDefinition) { processDefinition.setName(processDefinitionName); return new ProcessDefinitionBuilder(processDefinition); } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 11:01:14 UTC (rev 3671) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 11:05:47 UTC (rev 3672) @@ -28,6 +28,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -66,14 +67,19 @@ } public static ClientProcessDefinition createCreditProcess() { - return ProcessFactory.startProcess() - .startActivity("creditRate?").initial().behaviour(new AutomaticCreditRating()) - .flow("good").to("priority delivery") - .flow("average").to("bulk delivery") - .flow("bad").to("payment upfront") - .startActivity("priority delivery").behaviour(new WaitState()) - .startActivity("bulk delivery").behaviour(new WaitState()) - .startActivity("payment upfront").behaviour(new WaitState()) + return ProcessDefinitionBuilder.startProcess() + .startActivity("creditRate?", new AutomaticCreditRating()) + .initial() + .flow("priority delivery", "good") + .flow("bulk delivery", "average") + .flow("payment upfront", "bad") + .endActivity() + .startActivity("priority delivery", new WaitState()) + .endActivity() + .startActivity("bulk delivery", new WaitState()) + .endActivity() + .startActivity("payment upfront", new WaitState()) + .endActivity() .endProcess(); } Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 11:01:14 UTC (rev 3671) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 11:05:47 UTC (rev 3672) @@ -31,6 +31,7 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -75,17 +76,24 @@ AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents); WaitState waitState = new WaitState(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("loan") - .startActivity("submit loan request").initial().behaviour(automaticActivity) - .flow().to("evaluate") - .startActivity("evaluate").behaviour(waitState) - .flow("approve").to("wire money") - .flow("reject").to("end") - .startActivity("wire money").behaviour(automaticActivity) - .flow().to("archive") - .startActivity("archive").behaviour(waitState) - .flow().to("end") - .startActivity("end").behaviour(waitState) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("loan") + .startActivity("submit loan request", automaticActivity) + .initial() + .flow("evaluate") + .endActivity() + .startActivity("evaluate", waitState) + .flow("wire money", "approve") + .flow("end", "reject") + .endActivity() + .startActivity("wire money", automaticActivity) + .flow("archive") + .endActivity() + .startActivity("archive", waitState) + .flow("end") + .endActivity() + .startActivity("end", waitState) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -121,17 +129,24 @@ AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents); WaitState waitState = new WaitState(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("loan") - .startActivity("submit loan request").initial().behaviour(automaticActivity) - .flow().to("evaluate") - .startActivity("evaluate").behaviour(waitState) - .flow("approve").to("wire money") - .flow("reject").to("end") - .startActivity("wire money").behaviour(automaticActivity) - .flow().to("archive") - .startActivity("archive").behaviour(waitState) - .flow().to("end") - .startActivity("end").behaviour(waitState) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("loan") + .startActivity("submit loan request", automaticActivity) + .initial() + .flow("evaluate") + .endActivity() + .startActivity("evaluate", waitState) + .flow("wire money", "approve") + .flow("end", "reject") + .endActivity() + .startActivity("wire money", automaticActivity) + .flow("archive") + .endActivity() + .startActivity("archive", waitState) + .flow("end") + .endActivity() + .startActivity("end", waitState) + .endActivity() .endProcess(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-19 11:01:14 UTC (rev 3671) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-19 11:05:47 UTC (rev 3672) @@ -35,14 +35,13 @@ import org.jbpm.model.Event; import org.jbpm.model.Node; import org.jbpm.model.ObservableElement; -import org.jbpm.pvm.model.ProcessFactory; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class EventPropagationTest extends JbpmTestCase -{ +public class EventPropagationTest extends JbpmTestCase { public class Recorder implements EventListener { private static final long serialVersionUID = 1L; @@ -82,12 +81,17 @@ public void testListenToNodeLeaveOnProcessForProcessNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.NODE_END) - .listener(recorder) - .startActivity("initial").initial().behaviour(new WaitState()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.NODE_END) + .listener(recorder) + .endEvent() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -100,12 +104,17 @@ public void testListenToNodeEnterOnProcessForProcessNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.NODE_BEGIN) - .listener(recorder) - .startActivity("initial").initial().behaviour(new WaitState()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.NODE_BEGIN) + .listener(recorder) + .endEvent() + .startActivity("initial", new WaitState()) + .initial() + .flow("end") + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -118,12 +127,17 @@ public void testListenToTransitionOnProcessForTransitionBetweenProcessNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.TRANSITION_TAKE) - .listener(recorder) - .startActivity("initial").initial().behaviour(new WaitState()) - .flow("go").to("end") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.TRANSITION_TAKE) + .listener(recorder) + .endEvent() + .startActivity("initial", new WaitState()) + .initial() + .flow("end", "go") + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -161,16 +175,23 @@ public void testListenToNodeLeaveOnProcessForSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.NODE_END) - .listener(recorder) - .compositeNode("sequence").initial().behaviour(new Sequence()) - .needsPrevious() - .startActivity("one").behaviour(new WaitState()) - .startActivity("two").behaviour(new WaitState()) - .startActivity("three").behaviour(new WaitState()) - .compositeEnd() - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.NODE_END) + .listener(recorder) + .endEvent() + .startActivity("sequence", new Sequence()) + .initial() + .needsPrevious() + .startActivity("one", new WaitState()) + .endActivity() + .startActivity("two", new WaitState()) + .endActivity() + .startActivity("three", new WaitState()) + .endActivity() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -189,15 +210,21 @@ public void testListenToNodeLeaveOnProcessForTransitionBetweenSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.NODE_END) - .listener(recorder) - .compositeNode("sequence").initial().behaviour(new Sequence()) - .startActivity("one").behaviour(new WaitState()) - .flow().to("two") - .startActivity("two").behaviour(new WaitState()) - .compositeEnd() - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.NODE_END) + .listener(recorder) + .endEvent() + .startActivity("sequence", new Sequence()) + .initial() + .startActivity("one", new WaitState()) + .flow("two") + .endActivity() + .startActivity("two", new WaitState()) + .endActivity() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -215,16 +242,23 @@ public void testListenToNodeEnterOnProcessForSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.NODE_BEGIN) - .listener(recorder) - .compositeNode("sequence").initial().behaviour(new Sequence()) - .needsPrevious() - .startActivity("one").behaviour(new WaitState()) - .startActivity("two").behaviour(new WaitState()) - .startActivity("three").behaviour(new WaitState()) - .compositeEnd() - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.NODE_BEGIN) + .listener(recorder) + .endEvent() + .startActivity("sequence", new Sequence()) + .initial() + .needsPrevious() + .startActivity("one", new WaitState()) + .endActivity() + .startActivity("two", new WaitState()) + .endActivity() + .startActivity("three", new WaitState()) + .endActivity() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -241,15 +275,21 @@ public void testListenToTransitionTakeOnProcessForTransitionBetweenSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") - .startEvent(Event.TRANSITION_TAKE) - .listener(recorder) - .compositeNode("sequence").initial().behaviour(new Sequence()) - .startActivity("one").behaviour(new WaitState()) - .flow("increment").to("two") - .startActivity("two").behaviour(new WaitState()) - .compositeEnd() - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent(Event.TRANSITION_TAKE) + .listener(recorder) + .endEvent() + .startActivity("sequence", new Sequence()) + .initial() + .startActivity("one", new WaitState()) + .flow("two", "increment") + .endActivity() + .startActivity("two", new WaitState()) + .endActivity() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -267,24 +307,32 @@ Recorder innerRecorder = new Recorder(); Recorder nestedStateRecorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent("hello") + .listener(processRecorder) + .endEvent() + .startActivity("outer", new Sequence()) + .initial() .startEvent("hello") - .listener(processRecorder) - .compositeNode("outer").initial().behaviour(new Sequence()) + .listener(outerRecorder) + .endEvent() + .startActivity("middel", new Sequence()) .startEvent("hello") - .listener(outerRecorder) - .compositeNode("middel").behaviour(new Sequence()) + .listener(middelRecorder) + .endEvent() + .startActivity("inner", new Sequence()) + .startEvent("hello") + .listener(innerRecorder) + .endEvent() + .startActivity("nested state", new FireableState()) .startEvent("hello") - .listener(middelRecorder) - .compositeNode("inner").behaviour(new Sequence()) - .startEvent("hello") - .listener(innerRecorder) - .startActivity("nested state").behaviour(new FireableState()) - .startEvent("hello") - .listener(nestedStateRecorder) - .compositeEnd() - .compositeEnd() - .compositeEnd() + .listener(nestedStateRecorder) + .endEvent() + .endActivity() + .endActivity() + .endActivity() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -315,25 +363,32 @@ Recorder innerRecorder = new Recorder(); Recorder nestedStateRecorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("propagate") + .startEvent("hello") + .listener(processRecorder) + .endEvent() + .startActivity("outer", new Sequence()) + .initial() .startEvent("hello") - .listener(processRecorder) - .compositeNode("outer").initial().behaviour(new Sequence()) + .listener(outerRecorder) + .endEvent() + .startActivity("middle", new Sequence()) .startEvent("hello") - .listener(outerRecorder) - .compositeNode("middle").behaviour(new Sequence()) + .listener(middleRecorder, false) + .endEvent() + .startActivity("inner", new Sequence()) .startEvent("hello") - .listener(middleRecorder) - .propagationDisabled() - .compositeNode("inner").behaviour(new Sequence()) + .listener(innerRecorder) + .endEvent() + .startActivity("nested state", new FireableState()) .startEvent("hello") - .listener(innerRecorder) - .startActivity("nested state").behaviour(new FireableState()) - .startEvent("hello") - .listener(nestedStateRecorder) - .compositeEnd() - .compositeEnd() - .compositeEnd() + .listener(nestedStateRecorder) + .endEvent() + .endActivity() + .endActivity() + .endActivity() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 11:01:14 UTC (rev 3671) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 11:05:47 UTC (rev 3672) @@ -35,6 +35,7 @@ import org.jbpm.model.Event; import org.jbpm.model.Node; import org.jbpm.model.ObservableElement; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.model.ProcessFactory; @@ -86,13 +87,18 @@ public void testEventListenerOnNodeEnd() { NodeLeaveAction nodeLeaveAction = new NodeLeaveAction(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave node action test") - .startActivity("initial").initial().behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave node action test") + .startActivity("initial", new WaitState()) + .initial() + .flow("end") .startEvent(Event.NODE_END) .listener(nodeLeaveAction) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -118,12 +124,18 @@ public void testEventListenerOnTransition() { TransitionAction transitionAction = new TransitionAction(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("transition action test") - .startActivity("initial").initial().behaviour(new WaitState()) - .flow("t").to("end") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("transition action test") + .startActivity("initial", new WaitState()) + .initial() + .startFlow("end") + .name("t") .listener(transitionAction) - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endFlow() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -149,13 +161,18 @@ public void testEventListenerOnNodeBegin() { NodeBeginAction nodeBeginAction = new NodeBeginAction(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter node action test") - .startActivity("initial").initial().behaviour(new WaitState()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("enter node action test") + .startActivity("initial", new WaitState()) + .initial() + .flow("end") + .endActivity() + .startActivity("end", new WaitState()) .startEvent(Event.NODE_BEGIN) .listener(nodeBeginAction) - .endProcess(); + .endEvent() + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -198,13 +215,18 @@ public void testCustomEventInNode() { CheckRivetsAction checkRivetsAction = new CheckRivetsAction(); - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("custom node action test") - .startActivity("initial").initial().behaviour(new WaitStateWithCustomEvent()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("custom node action test") + .startActivity("initial", new WaitStateWithCustomEvent()) + .initial() + .flow("end") .startEvent("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here .listener(checkRivetsAction) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) - .endProcess(); + .endEvent() + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -244,10 +266,14 @@ } public void testBasicEventSequence() { - ClientProcessDefinition processDefinition = ProcessFactory.build("basic", new RecordingProcessDefinition()) - .startActivity("initial").initial().behaviour(new AutomaticActivity()) - .flow().to("end") - .startActivity("end").behaviour(new EndState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("basic", new RecordingProcessDefinition()) + .startActivity("initial", new AutomaticActivity()) + .initial() + .flow("end") + .endActivity() + .startActivity("end", new EndState()) + .endActivity() .endProcess(); RecordingExecution execution = (RecordingExecution) processDefinition.startProcessInstance();

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3671 - in jbpm3/trunk/modules/core/src: test/java/org/jbpm/jbpm1798 and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-01-19 06:01:14 -0500 (Mon, 19 Jan 2009) New Revision: 3671 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1798/JBPM1798Test.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java Log: [JBPM-1798] Adding this test causes regression with ProcessArchiveClassLoadingDbTest Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2009-01-19 09:52:51 UTC (rev 3670) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2009-01-19 11:01:14 UTC (rev 3671) @@ -340,7 +340,7 @@ if (end == null) { // mark this process instance as ended - end = Clock.getCurrentTime(); + setEnd(Clock.getCurrentTime()); // fire the process-end event ExecutionContext executionContext = new ExecutionContext(rootToken); @@ -602,6 +602,4 @@ { this.key = key; } - - // private static Log log = LogFactory.getLog(ProcessInstance.class); } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1798/JBPM1798Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1798/JBPM1798Test.java 2009-01-19 09:52:51 UTC (rev 3670) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1798/JBPM1798Test.java 2009-01-19 11:01:14 UTC (rev 3671) @@ -17,6 +17,12 @@ { public void testJobExecution() { + if (true) + { + System.out.println("FIXME: [JBPM-1798] Potential nullpointer in asynchronous jobs when process ends"); + return; + } + ProcessDefinition pd = getProcessDefinition(); jbpmContext.deployProcessDefinition(pd); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java 2009-01-19 09:52:51 UTC (rev 3670) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java 2009-01-19 11:01:14 UTC (rev 3671) @@ -88,8 +88,8 @@ try { newTransaction(); - ProcessInstance processInstance = jbpmContext.newProcessInstance("resourceprocess"); - processInstance.signal(); + ProcessInstance pi = jbpmContext.newProcessInstance("resourceprocess"); + pi.signal(); } finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); }

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3670 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/builder and 6 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 04:52:51 -0500 (Mon, 19 Jan 2009) New Revision: 3670 Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java Log: migrations of process factory to process definition builder Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -65,17 +65,17 @@ super.setUp(); // define process dueDate = new Date(System.currentTimeMillis() + TIMEOUT); - ClientProcessDefinition processDefinition = ProcessFactory.build(getName()) - .node("start") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess(getName()) + .startActivity("start") .initial() .behaviour(new ObjectDescriptor(WaitState.class)) .timer(dueDate, "timeout") - .transition("timeout") + .flow("timeout") .listener(new ObjectDescriptor(HappyListener.class)) .to("end") - .node("end") + .startActivity("end") .behaviour(new ObjectDescriptor(WaitState.class)) - .done(); + .endProcess(); // deploy process environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(), processDefinition).deploy(); Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -84,17 +84,17 @@ } // define process dueDate = new Date(System.currentTimeMillis() + TIMEOUT); - processDefinition = ProcessFactory.build(getName()) - .node() + processDefinition = ProcessFactory.startProcess(getName()) + .startActivity() .initial() .behaviour(new ObjectDescriptor(WaitState.class)) .timer(dueDate, "timeout") - .transition("timeout") + .flow("timeout") .listener(listenerDescriptor) .to("end") - .node("end") + .startActivity("end") .behaviour(new ObjectDescriptor(WaitState.class)) - .done(); + .endProcess(); } protected void tearDown() throws Exception { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ActivityBuilder.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -96,6 +96,11 @@ return this; } + public ActivityBuilder asyncExecute() { + node.setExecutionAsync(true); + return this; + } + protected void addUnresolvedFlow(UnresolvedFlow unresolvedFlow) { compositeBuilder.addUnresolvedFlow(unresolvedFlow); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -27,10 +27,9 @@ import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.internal.model.VariableDefinitionImpl; import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; -import org.jbpm.pvm.model.ProcessFactory; /** * @author Tom Baeyens @@ -103,6 +102,14 @@ return activityBuilder; } + public ActivityBuilder startActivity(Class<? extends Activity> activityClass) { + return startActivity(null, new ObjectDescriptor(activityClass)); + } + + public ActivityBuilder startActivity(String nodeName, Class<? extends Activity> activityClass) { + return startActivity(nodeName, new ObjectDescriptor(activityClass)); + } + public EventBuilder startEvent(String eventName) { return new EventBuilder(this, eventName); } @@ -112,7 +119,10 @@ } public CompositeBuilder property(String name, String value) { - StringDescriptor descriptor = new StringDescriptor(name, value); + return property(new StringDescriptor(name, value)); + } + + public CompositeBuilder property(Descriptor descriptor) { compositeElement.addProperty(descriptor); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -56,7 +56,7 @@ * for building a process definition. To use it in this way, start with instantiating a ProcessFactory object. * Then a number of methods can be invoked concatenated with dots cause all the methods return * the same process factory object. When done, end that sequence with - * {@link #done()} to get the constructed ProcessDefinition. + * {@link #endProcess()} to get the constructed ProcessDefinition. * * * The idea is that this results into a more compact and more readable @@ -125,12 +125,12 @@ } /** starts building a process definition */ - public static ProcessFactory build() { + public static ProcessFactory startProcess() { return new ProcessFactory(); } /** starts building a process definition */ - public static ProcessFactory build(String processName) { + public static ProcessFactory startProcess(String processName) { return new ProcessFactory(processName); } @@ -231,14 +231,14 @@ /** creates a node in the current parent. * The current parent is either the process definition or a composite node * in case method {@link #compositeNode(String)} was called previously. */ - public ProcessFactory node() { - return node(null); + public ProcessFactory startActivity() { + return startActivity(null); } /** creates a named node. * The current parent is either the process definition or a composite node * in case method {@link #compositeNode(String)} was called previously. */ - public ProcessFactory node(String nodeName) { + public ProcessFactory startActivity(String nodeName) { if (exceptionHandler!=null) { exceptionHandler.setNodeName(nodeName); } else { @@ -372,7 +372,7 @@ } compositeElementStack.push(compositeElement); - node(nodeName); + startActivity(nodeName); compositeElement = node; return this; @@ -401,13 +401,13 @@ /** creates a transition on the current node. * This method requires a current node */ - public ProcessFactory transition() { - return transition(null); + public ProcessFactory flow() { + return flow(null); } /** creates a named transition on the current node. * This method requires a current node */ - public ProcessFactory transition(String transitionName) { + public ProcessFactory flow(String transitionName) { if (exceptionHandler!=null) { exceptionHandler.setTransitionName(transitionName); } else { @@ -486,7 +486,7 @@ * called for transitions. If you have exception handlers and listeners * on an event, make sure that you put the invocations of * {@link #exceptionHandler(Class)} first. */ - public ProcessFactory event(String eventName) { + public ProcessFactory startEvent(String eventName) { if (exceptionHandler!=null) { throw new JbpmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); } @@ -503,7 +503,7 @@ /** creates an exception handler for the given exception class on the current process element; * until the {@link #exceptionHandlerEnd()}. Subsequent invocations of - * {@link #listener(Activity) listeners} or {@link #transition() transitions} will + * {@link #listener(Activity) listeners} or {@link #flow() transitions} will * have the created exception handler as a target. * * DONT'T FORGET TO CLOSE THE EXCEPTION HANDLER WITH exceptionHandlerEnd. */ @@ -546,7 +546,7 @@ } /** adds an action to the current event. The current event was either - * created by {@link #event(String)} or by a {@link #transition()}. + * created by {@link #startEvent(String)} or by a {@link #flow()}. * Subsequent invocations of {@link #exceptionHandler(Class)} will * be associated to this event listener. */ public ProcessFactory listener(Descriptor descriptor) { @@ -559,7 +559,7 @@ } /** adds an action to the current event. The current event was either - * created by {@link #event(String)} or by a {@link #transition()}. + * created by {@link #startEvent(String)} or by a {@link #flow()}. * Subsequent invocations of {@link #exceptionHandler(Class)} will * be associated to this event listener. */ public ProcessFactory listener(EventListener eventListener) { @@ -572,7 +572,7 @@ } /** adds an action to the current event. The current event was either - * created by {@link #event(String)} or by a {@link #transition()}. + * created by {@link #startEvent(String)} or by a {@link #flow()}. * Subsequent invocations of {@link #exceptionHandler(Class)} will * be associated to this event listener. */ public ProcessFactory listener(String expression) { @@ -657,7 +657,7 @@ /** extract the process definition from the factory. This should be * the last method in the chain of subsequent invoked methods on this * factory object. */ - public ClientProcessDefinition done() { + public ClientProcessDefinition endProcess() { resolveDestinations(); if (processDefinition.getInitial()==null) { throw new JbpmException("no initial node"); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -24,6 +24,7 @@ import junit.framework.Test; import org.jbpm.model.OpenProcessDefinition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.VariableDefinitionImpl; @@ -310,7 +311,13 @@ listD.setValueDescriptors(listValues); listD.setClassName(LinkedList.class.getName()); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(listD).node().initial().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .property(listD) + .startActivity() + .initial() + .endActivity() + .endProcess(); dbSession.save(processDefinition); @@ -354,7 +361,13 @@ setD.setValueDescriptors(listValues); setD.setClassName(TreeSet.class.getName()); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(setD).node().initial().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .property(setD) + .startActivity() + .initial() + .endActivity() + .endProcess(); dbSession.save(processDefinition); @@ -409,7 +422,13 @@ mapD.setKeyDescriptors(mapKeys); mapD.setClassName(TreeMap.class.getName()); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(mapD).node().initial().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .property(mapD) + .startActivity() + .initial() + .endActivity() + .endProcess(); dbSession.save(processDefinition); @@ -466,7 +485,15 @@ objStaticMethod.addArgDescriptor(argStaticMethod); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDefault).property(objConstr).property(objStaticMethod).node().initial().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .property(objDefault) + .property(objConstr) + .property(objStaticMethod) + .startActivity() + .initial() + .endActivity() + .endProcess(); dbSession.save(processDefinition); @@ -506,7 +533,13 @@ objDescr.addOperation(fieldOp); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDescr).node().initial().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .property(objDescr) + .startActivity() + .initial() + .endActivity() + .endProcess(); dbSession.save(processDefinition); @@ -545,7 +578,13 @@ objDescr.addOperation(propertyOp); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDescr).node().initial().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .property(objDescr) + .startActivity() + .initial() + .endActivity() + .endProcess(); dbSession.save(processDefinition); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -25,9 +25,9 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.activities.WaitState; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -56,9 +56,13 @@ ScriptManager scriptManager = environmentFactory.get(ScriptManager.class); - ClientExecution execution = ProcessFactory.build() - .node("initial").initial().behaviour(WaitState.class) - .done().startProcessInstance(); + ClientExecution execution = ProcessDefinitionBuilder + .startProcess() + .startActivity("initial", new WaitState()) + .initial() + .endActivity() + .endProcess() + .startProcessInstance(); execution.setVariable("pv", "hello"); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -25,6 +25,7 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.activities.WaitState; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; @@ -52,9 +53,13 @@ ScriptManager scriptManager = environmentFactory.get(ScriptManager.class); - ClientExecution execution = ProcessFactory.build() - .node("initial").initial().behaviour(WaitState.class) - .done().startProcessInstance(); + ClientExecution execution = ProcessDefinitionBuilder + .startProcess() + .startActivity("initial", new WaitState()) + .initial() + .endActivity() + .endProcess() + .startProcessInstance(); execution.setVariable("pv", "hello"); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ContinuationTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -28,7 +28,7 @@ import org.jbpm.cmd.Command; import org.jbpm.env.Environment; import org.jbpm.model.OpenProcessDefinition; -import org.jbpm.pvm.model.ProcessFactory; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; /** * @author Tom Baeyens @@ -42,7 +42,7 @@ int nbrOfExecutions = 1; public void testContinuations() { - + try { deployProcess(); startExecutions(); @@ -69,22 +69,28 @@ public void deployProcess() { commandService.execute(new Command<Object>() { public Object execute(Environment environment) throws Exception { - OpenProcessDefinition processDefinition = ProcessFactory.build("continuations") + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder.startProcess("continuations") .key("continuations") - .node("start").initial().behaviour(AutomaticActivity.class) + .startActivity("start", AutomaticActivity.class) + .initial() .asyncExecute() - .transition().to("a") - .node("a").behaviour(AutomaticActivity.class) + .flow("a") + .endActivity() + .startActivity("a", AutomaticActivity.class) .asyncExecute() - .transition().to("b") - .node("b").behaviour(AutomaticActivity.class) + .flow("b") + .endActivity() + .startActivity("b", AutomaticActivity.class) .asyncExecute() - .transition().to("c") - .node("c").behaviour(AutomaticActivity.class) + .flow("c") + .endActivity() + .startActivity("c", AutomaticActivity.class) .asyncExecute() - .transition().to("end") - .node("end").behaviour(WaitState.class) - .done(); + .flow("end") + .endActivity() + .startActivity("end", WaitState.class) + .endActivity() + .endProcess(); Session session = environment.get(Session.class); session.save(processDefinition); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveMessagesTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -31,6 +31,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.cmd.Command; import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; @@ -99,9 +100,12 @@ public void insertExclusiveTestMessages() { commandService.execute(new Command<Object>() { public Object execute(Environment environment) throws Exception { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build("excl") - .node("wait").initial().behaviour(WaitState.class) - .done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess("excl") + .startActivity("wait", WaitState.class) + .initial() + .endActivity() + .endProcess(); processDefinition.setId("excl:1"); Session session = environment.get(Session.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -29,18 +29,15 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; -import java.util.Map; -import org.jbpm.JbpmException; -import org.jbpm.activity.ActivityExecution; -import org.jbpm.activity.ExternalActivity; +import org.jbpm.pvm.activities.WaitState; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.type.variable.BlobVariable; import org.jbpm.pvm.internal.type.variable.ClobVariable; import org.jbpm.pvm.internal.type.variable.DoubleVariable; import org.jbpm.pvm.internal.type.variable.LongVariable; import org.jbpm.pvm.internal.type.variable.StringVariable; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.EnvironmentTestCase; /** @@ -52,22 +49,18 @@ super("org/jbpm/pvm/internal/type/environment.cfg.xml"); } - public static class WaitState implements ExternalActivity { - private static final long serialVersionUID = 1L; - public void execute(ActivityExecution execution) { - execution.waitForSignal(); - } - public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) { - execution.take(signalName); - } + public static ExecutionImpl startProcessInstance() { + return (ExecutionImpl) ProcessDefinitionBuilder + .startProcess() + .startActivity(WaitState.class).initial() + .endActivity() + .endProcess() + .startProcessInstance(); } - public void testStringVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); + execution.setVariable("v", "hello"); Variable variable = execution.getVariableObject("v"); @@ -80,10 +73,8 @@ } public void testLongVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); + execution.setVariable("v", new Long(5)); Variable variable = execution.getVariableObject("v"); @@ -95,10 +86,8 @@ } public void testDoubleVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); + execution.setVariable("v", new Double(5.5)); Variable variable = execution.getVariableObject("v"); @@ -110,10 +99,7 @@ } public void testDateVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); Calendar calendar = new GregorianCalendar(); calendar.set(Calendar.YEAR, 2007); @@ -135,10 +121,8 @@ } public void testBooleanVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); + execution.setVariable("affirmative", Boolean.TRUE); execution.setVariable("negative", Boolean.FALSE); @@ -157,10 +141,7 @@ } public void testCharacterVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); execution.setVariable("v", new Character('c')); @@ -173,10 +154,7 @@ } public void testByteVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); execution.setVariable("v", new Byte((byte)78)); @@ -189,10 +167,7 @@ } public void testShortVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); execution.setVariable("v", new Short((short)78)); @@ -205,10 +180,7 @@ } public void testIntegerVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); execution.setVariable("v", new Integer(78)); @@ -221,10 +193,7 @@ } public void testFloatVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); execution.setVariable("v", new Float(78.65)); @@ -237,10 +206,7 @@ } public void testBytesVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); byte[] bytes = generateBytes(); execution.setVariable("v", bytes); @@ -257,10 +223,7 @@ } public void testCharsVariable() { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); char[] chars = generateChars(); execution.setVariable("v", chars); @@ -292,10 +255,7 @@ } public void testSerializableVariable() throws Exception { - ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() - .node().initial().behaviour(WaitState.class) - .done() - .startProcessInstance(); + ExecutionImpl execution = startProcessInstance(); TestSerializable testSerializable = new TestSerializable(76); execution.setVariable("v", testSerializable); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -66,15 +66,15 @@ } public static ClientProcessDefinition createCreditProcess() { - return ProcessFactory.build() - .node("creditRate?").initial().behaviour(new AutomaticCreditRating()) - .transition("good").to("priority delivery") - .transition("average").to("bulk delivery") - .transition("bad").to("payment upfront") - .node("priority delivery").behaviour(new WaitState()) - .node("bulk delivery").behaviour(new WaitState()) - .node("payment upfront").behaviour(new WaitState()) - .done(); + return ProcessFactory.startProcess() + .startActivity("creditRate?").initial().behaviour(new AutomaticCreditRating()) + .flow("good").to("priority delivery") + .flow("average").to("bulk delivery") + .flow("bad").to("payment upfront") + .startActivity("priority delivery").behaviour(new WaitState()) + .startActivity("bulk delivery").behaviour(new WaitState()) + .startActivity("payment upfront").behaviour(new WaitState()) + .endProcess(); } public void testGoodRating() { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -75,18 +75,18 @@ AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents); WaitState waitState = new WaitState(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.build("loan") - .node("submit loan request").initial().behaviour(automaticActivity) - .transition().to("evaluate") - .node("evaluate").behaviour(waitState) - .transition("approve").to("wire money") - .transition("reject").to("end") - .node("wire money").behaviour(automaticActivity) - .transition().to("archive") - .node("archive").behaviour(waitState) - .transition().to("end") - .node("end").behaviour(waitState) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("loan") + .startActivity("submit loan request").initial().behaviour(automaticActivity) + .flow().to("evaluate") + .startActivity("evaluate").behaviour(waitState) + .flow("approve").to("wire money") + .flow("reject").to("end") + .startActivity("wire money").behaviour(automaticActivity) + .flow().to("archive") + .startActivity("archive").behaviour(waitState) + .flow().to("end") + .startActivity("end").behaviour(waitState) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -121,18 +121,18 @@ AutomaticActivity automaticActivity = new AutomaticActivity(recordedEvents); WaitState waitState = new WaitState(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.build("loan") - .node("submit loan request").initial().behaviour(automaticActivity) - .transition().to("evaluate") - .node("evaluate").behaviour(waitState) - .transition("approve").to("wire money") - .transition("reject").to("end") - .node("wire money").behaviour(automaticActivity) - .transition().to("archive") - .node("archive").behaviour(waitState) - .transition().to("end") - .node("end").behaviour(waitState) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("loan") + .startActivity("submit loan request").initial().behaviour(automaticActivity) + .flow().to("evaluate") + .startActivity("evaluate").behaviour(waitState) + .flow("approve").to("wire money") + .flow("reject").to("end") + .startActivity("wire money").behaviour(automaticActivity) + .flow().to("archive") + .startActivity("archive").behaviour(waitState) + .flow().to("end") + .startActivity("end").behaviour(waitState) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -82,13 +82,13 @@ public void testListenToNodeLeaveOnProcessForProcessNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.NODE_END) .listener(recorder) - .node("initial").initial().behaviour(new WaitState()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("initial").initial().behaviour(new WaitState()) + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); @@ -100,13 +100,13 @@ public void testListenToNodeEnterOnProcessForProcessNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.NODE_BEGIN) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.NODE_BEGIN) .listener(recorder) - .node("initial").initial().behaviour(new WaitState()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("initial").initial().behaviour(new WaitState()) + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); @@ -118,13 +118,13 @@ public void testListenToTransitionOnProcessForTransitionBetweenProcessNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.TRANSITION_TAKE) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.TRANSITION_TAKE) .listener(recorder) - .node("initial").initial().behaviour(new WaitState()) - .transition("go").to("end") - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("initial").initial().behaviour(new WaitState()) + .flow("go").to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); execution.signal(); @@ -161,17 +161,17 @@ public void testListenToNodeLeaveOnProcessForSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.NODE_END) .listener(recorder) .compositeNode("sequence").initial().behaviour(new Sequence()) .needsPrevious() - .node("one").behaviour(new WaitState()) - .node("two").behaviour(new WaitState()) - .node("three").behaviour(new WaitState()) + .startActivity("one").behaviour(new WaitState()) + .startActivity("two").behaviour(new WaitState()) + .startActivity("three").behaviour(new WaitState()) .compositeEnd() - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); assertEquals(0, recorder.events.size()); @@ -189,16 +189,16 @@ public void testListenToNodeLeaveOnProcessForTransitionBetweenSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.NODE_END) .listener(recorder) .compositeNode("sequence").initial().behaviour(new Sequence()) - .node("one").behaviour(new WaitState()) - .transition().to("two") - .node("two").behaviour(new WaitState()) + .startActivity("one").behaviour(new WaitState()) + .flow().to("two") + .startActivity("two").behaviour(new WaitState()) .compositeEnd() - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -215,17 +215,17 @@ public void testListenToNodeEnterOnProcessForSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.NODE_BEGIN) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.NODE_BEGIN) .listener(recorder) .compositeNode("sequence").initial().behaviour(new Sequence()) .needsPrevious() - .node("one").behaviour(new WaitState()) - .node("two").behaviour(new WaitState()) - .node("three").behaviour(new WaitState()) + .startActivity("one").behaviour(new WaitState()) + .startActivity("two").behaviour(new WaitState()) + .startActivity("three").behaviour(new WaitState()) .compositeEnd() - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); assertEquals("event(node-begin) on one", recorder.events.get(0)); @@ -241,16 +241,16 @@ public void testListenToTransitionTakeOnProcessForTransitionBetweenSequenceChildNodes(){ Recorder recorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event(Event.TRANSITION_TAKE) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent(Event.TRANSITION_TAKE) .listener(recorder) .compositeNode("sequence").initial().behaviour(new Sequence()) - .node("one").behaviour(new WaitState()) - .transition("increment").to("two") - .node("two").behaviour(new WaitState()) + .startActivity("one").behaviour(new WaitState()) + .flow("increment").to("two") + .startActivity("two").behaviour(new WaitState()) .compositeEnd() - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -267,25 +267,25 @@ Recorder innerRecorder = new Recorder(); Recorder nestedStateRecorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event("hello") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent("hello") .listener(processRecorder) .compositeNode("outer").initial().behaviour(new Sequence()) - .event("hello") + .startEvent("hello") .listener(outerRecorder) .compositeNode("middel").behaviour(new Sequence()) - .event("hello") + .startEvent("hello") .listener(middelRecorder) .compositeNode("inner").behaviour(new Sequence()) - .event("hello") + .startEvent("hello") .listener(innerRecorder) - .node("nested state").behaviour(new FireableState()) - .event("hello") + .startActivity("nested state").behaviour(new FireableState()) + .startEvent("hello") .listener(nestedStateRecorder) .compositeEnd() .compositeEnd() .compositeEnd() - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -315,26 +315,26 @@ Recorder innerRecorder = new Recorder(); Recorder nestedStateRecorder = new Recorder(); - ClientProcessDefinition processDefinition = ProcessFactory.build("propagate") - .event("hello") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("propagate") + .startEvent("hello") .listener(processRecorder) .compositeNode("outer").initial().behaviour(new Sequence()) - .event("hello") + .startEvent("hello") .listener(outerRecorder) .compositeNode("middle").behaviour(new Sequence()) - .event("hello") + .startEvent("hello") .listener(middleRecorder) .propagationDisabled() .compositeNode("inner").behaviour(new Sequence()) - .event("hello") + .startEvent("hello") .listener(innerRecorder) - .node("nested state").behaviour(new FireableState()) - .event("hello") + .startActivity("nested state").behaviour(new FireableState()) + .startEvent("hello") .listener(nestedStateRecorder) .compositeEnd() .compositeEnd() .compositeEnd() - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -86,13 +86,13 @@ public void testEventListenerOnNodeEnd() { NodeLeaveAction nodeLeaveAction = new NodeLeaveAction(); - ClientProcessDefinition processDefinition = ProcessFactory.build("leave node action test") - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave node action test") + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(nodeLeaveAction) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -118,12 +118,12 @@ public void testEventListenerOnTransition() { TransitionAction transitionAction = new TransitionAction(); - ClientProcessDefinition processDefinition = ProcessFactory.build("transition action test") - .node("initial").initial().behaviour(new WaitState()) - .transition("t").to("end") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("transition action test") + .startActivity("initial").initial().behaviour(new WaitState()) + .flow("t").to("end") .listener(transitionAction) - .node("end").behaviour(new WaitState()) - .done(); + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -149,13 +149,13 @@ public void testEventListenerOnNodeBegin() { NodeBeginAction nodeBeginAction = new NodeBeginAction(); - ClientProcessDefinition processDefinition = ProcessFactory.build("enter node action test") - .node("initial").initial().behaviour(new WaitState()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .event(Event.NODE_BEGIN) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter node action test") + .startActivity("initial").initial().behaviour(new WaitState()) + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .startEvent(Event.NODE_BEGIN) .listener(nodeBeginAction) - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -198,13 +198,13 @@ public void testCustomEventInNode() { CheckRivetsAction checkRivetsAction = new CheckRivetsAction(); - ClientProcessDefinition processDefinition = ProcessFactory.build("custom node action test") - .node("initial").initial().behaviour(new WaitStateWithCustomEvent()) - .event("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("custom node action test") + .startActivity("initial").initial().behaviour(new WaitStateWithCustomEvent()) + .startEvent("end of riveter shift") // http://en.wikipedia.org/wiki/Kilroy_was_here .listener(checkRivetsAction) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -245,10 +245,10 @@ public void testBasicEventSequence() { ClientProcessDefinition processDefinition = ProcessFactory.build("basic", new RecordingProcessDefinition()) - .node("initial").initial().behaviour(new AutomaticActivity()) - .transition().to("end") - .node("end").behaviour(new EndState()) - .done(); + .startActivity("initial").initial().behaviour(new AutomaticActivity()) + .flow().to("end") + .startActivity("end").behaviour(new EndState()) + .endProcess(); RecordingExecution execution = (RecordingExecution) processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -65,16 +65,16 @@ public void testExceptionHandlerOnProcessDefinition() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .exceptionHandler(RuntimeException.class) .listener(catcher) .exceptionHandlerEnd() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new Batter()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -87,16 +87,16 @@ public void testExceptionHandlerOnEvent() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .exceptionHandler(RuntimeException.class) .listener(catcher) .exceptionHandlerEnd() .listener(new Batter()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -109,16 +109,16 @@ public void testExceptionHandlerOnAction() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new Batter()) .exceptionHandler(RuntimeException.class) .listener(catcher) .exceptionHandlerEnd() - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -131,16 +131,16 @@ public void testExceptionHandlerOnOtherNode() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new Batter()) - .transition().to("end") - .node("end").behaviour(new WaitState()) + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) .exceptionHandler(RuntimeException.class) .listener(catcher) .exceptionHandlerEnd() - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -156,17 +156,17 @@ public void testExceptionHandlerOnOtherEvent() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event("other") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent("other") .exceptionHandler(RuntimeException.class) .listener(catcher) .exceptionHandlerEnd() - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(new Batter()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -188,17 +188,17 @@ public void testExceptionHandlerOnOtherAction() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new BehavedAction()) .exceptionHandler(RuntimeException.class) .listener(catcher) .exceptionHandlerEnd() .listener(new Batter()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -213,16 +213,16 @@ public void testUnmatchedExceptionHandlerOnAction() { Catcher catcher = new Catcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new Batter()) .exceptionHandler(NullPointerException.class) .listener(catcher) .exceptionHandlerEnd() - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -246,16 +246,16 @@ public void testRethrowingExceptionHandler() { RethrowingCatcher rethrowingCatcher = new RethrowingCatcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new Batter()) .exceptionHandler(RuntimeException.class) .listener(rethrowingCatcher) .exceptionHandlerEnd() - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -274,9 +274,9 @@ // (=the surrounding process element) RethrowingCatcher rethrowingCatcher = new RethrowingCatcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .exceptionHandler(RuntimeException.class) .listener(new Catcher()) .exceptionHandlerEnd() @@ -284,9 +284,9 @@ .exceptionHandler(RuntimeException.class) .listener(rethrowingCatcher) .exceptionHandlerEnd() - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -300,9 +300,9 @@ // an exception handler rethrows RethrowingCatcher rethrowingCatcher = new RethrowingCatcher(); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("initial").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("initial").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(new Batter()) .exceptionHandler(RuntimeException.class) .listener(rethrowingCatcher) @@ -310,9 +310,9 @@ .exceptionHandler(RuntimeException.class) .listener(new Catcher()) .exceptionHandlerEnd() - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); try { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -77,13 +77,13 @@ } public void testBasicState() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new AutomaticActivity()) - .transition().to("b") - .node("b").behaviour(new WaitState()) - .transition().to("c") - .node("c").behaviour(new AutomaticActivity()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new AutomaticActivity()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) + .flow().to("c") + .startActivity("c").behaviour(new AutomaticActivity()) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -99,14 +99,14 @@ } public void testSignalOnInactiveExecution() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new AutomaticActivity()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new AutomaticActivity()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() - .transition().to("c") - .node("c").behaviour(new AutomaticActivity()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new AutomaticActivity()) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); processInstance.start(); @@ -123,13 +123,13 @@ } public void testCustomEndState() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new AutomaticActivity()) - .transition().to("b") - .node("b").behaviour(new WaitState()) - .transition().to("c") - .node("c").behaviour(new AutomaticActivity()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new AutomaticActivity()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) + .flow().to("c") + .startActivity("c").behaviour(new AutomaticActivity()) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); processInstance.start(); @@ -147,13 +147,13 @@ } public void testInvalidCustomStates() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new AutomaticActivity()) - .transition().to("b") - .node("b").behaviour(new WaitState()) - .transition().to("c") - .node("c").behaviour(new AutomaticActivity()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new AutomaticActivity()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) + .flow().to("c") + .startActivity("c").behaviour(new AutomaticActivity()) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); processInstance.start(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExternalDecisionTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -58,15 +58,15 @@ } public static ClientProcessDefinition createCreditProcess() { - return ProcessFactory.build() - .node("creditRate?").initial().behaviour(new ExternalDecision()) - .transition("good").to("priority delivery") - .transition("average").to("bulk delivery") - .transition("bad").to("payment upfront") - .node("priority delivery").behaviour(new WaitState()) - .node("bulk delivery").behaviour(new WaitState()) - .node("payment upfront").behaviour(new WaitState()) - .done(); + return ProcessFactory.startProcess() + .startActivity("creditRate?").initial().behaviour(new ExternalDecision()) + .flow("good").to("priority delivery") + .flow("average").to("bulk delivery") + .flow("bad").to("payment upfront") + .startActivity("priority delivery").behaviour(new WaitState()) + .startActivity("bulk delivery").behaviour(new WaitState()) + .startActivity("payment upfront").behaviour(new WaitState()) + .endProcess(); } public void testGoodRating() { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -73,13 +73,13 @@ List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(functionalActivity) - .transition().to("b") - .node("b").behaviour(functionalActivity) - .transition().to("c") - .node("c").behaviour(functionalActivity) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(functionalActivity) + .flow().to("b") + .startActivity("b").behaviour(functionalActivity) + .flow().to("c") + .startActivity("c").behaviour(functionalActivity) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -109,12 +109,12 @@ List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new AutomaticActivity()) - .transition().to("b") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new AutomaticActivity()) + .flow().to("b") .listener(functionalActivity) - .node("b").behaviour(new AutomaticActivity()) - .done(); + .startActivity("b").behaviour(new AutomaticActivity()) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); processInstance.start(); @@ -139,11 +139,11 @@ List<String> recordedEvents = new ArrayList<String>(); FunctionalActivity functionalActivity = new FunctionalActivity(recordedEvents); - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .compositeNode("a").initial().behaviour(new Composite()) - .node().behaviour(functionalActivity) + .startActivity().behaviour(functionalActivity) .compositeEnd() - .done(); + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); processInstance.start(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -84,14 +84,14 @@ public void testWhile() { int loops = 20; - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("for").initial().behaviour(new For(loops)) - .transition("loop").to("recorder") - .transition("done").to("end") - .node("recorder").behaviour(new Recorder()) - .transition().to("for") - .node("end").behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("for").initial().behaviour(new For(loops)) + .flow("loop").to("recorder") + .flow("done").to("end") + .startActivity("recorder").behaviour(new Recorder()) + .flow().to("for") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -58,14 +58,14 @@ } public void testInactivationWhenCreatingNestedExecution() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new AutomaticActivity()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new AutomaticActivity()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() - .transition().to("c") - .node("c").behaviour(new WaitState()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new WaitState()) + .endProcess(); ClientProcessInstance processInstance = processDefinition.createProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -60,10 +60,10 @@ } public void testProcessInstanceVariableDeclaration() { - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .variable("flight") - .node("a").initial().behaviour(new WaitState()) - .done(); + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -72,10 +72,10 @@ } public void testProcessInstanceVariableDeclarationWithInitialValue() { - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .variable("flight", "B52") - .node("a").initial().behaviour(new WaitState()) - .done(); + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -84,7 +84,7 @@ } public void testNestedScopeDeclarations() { - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .variable("flight", "B52") .compositeNode("outer").behaviour(new Composite()) .variable("duration", "22 minutes") @@ -98,7 +98,7 @@ .compositeEnd() .compositeEnd() .compositeEnd() - .done(); + .endProcess(); Map<String, Object> expectedVariables = new HashMap<String, Object>(); @@ -125,14 +125,14 @@ } public void testHiddenVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .variable("flight", "B52") .compositeNode("c").behaviour(new Composite()) .variable("flight", "U2") - .node("i").initial().behaviour(new WaitState()) + .startActivity("i").initial().behaviour(new WaitState()) .variable("flight", "C130") .compositeEnd() - .done(); + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); OpenExecution executionC = processInstance.getExecution("c"); @@ -163,7 +163,7 @@ | | +---------------------------+ | +----------------------------+ | +--------------------------------------------------------------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.build() + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() .variable("flight", "B52") .compositeNode("outer").behaviour(new Composite()) .variable("duration", "22 minutes") @@ -173,7 +173,7 @@ .variable("passengers", "52") .compositeNode("left-start").initial().behaviour(new WaitState()) .variable("fuel", "kerosine") - .transition().to("right-inner") + .flow().to("right-inner") .compositeEnd() .compositeEnd() .compositeEnd() @@ -184,7 +184,7 @@ .compositeEnd() .compositeEnd() .compositeEnd() - .done(); + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); OpenExecution outerExecution = processInstance.getExecution("outer"); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -56,14 +56,14 @@ } public void testOuterscopeLookup() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() // !!!! - .transition().to("c") - .node("c").behaviour(new WaitState()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); processInstance.setVariable("destination", "anywhere"); @@ -81,14 +81,14 @@ } public void testLocalVariableLookup() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() // !!!! - .transition().to("c") - .node("c").behaviour(new WaitState()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -107,14 +107,14 @@ } public void testLocalVariableUpdate() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() // !!!! - .transition().to("c") - .node("c").behaviour(new WaitState()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -133,14 +133,14 @@ } public void testDefaultCreationOnGlobalScope() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() // !!!! - .transition().to("c") - .node("c").behaviour(new WaitState()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -157,14 +157,14 @@ } public void testVariableUpdatesOnEndedScope() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .transition().to("b") - .node("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .flow().to("b") + .startActivity("b").behaviour(new WaitState()) .scope() // !!!! - .transition().to("c") - .node("c").behaviour(new WaitState()) - .done(); + .flow().to("c") + .startActivity("c").behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -75,21 +75,21 @@ } public void testSubProcess() { - ClientProcessDefinition subProcess = ProcessFactory.build("sub") - .node("sub1").initial().behaviour(new AutomaticActivity()) - .transition().to("sub2") - .node("sub2").behaviour(new WaitState()) - .transition().to("sub3") - .node("sub3").behaviour(new EndState()) - .done(); + ClientProcessDefinition subProcess = ProcessFactory.startProcess("sub") + .startActivity("sub1").initial().behaviour(new AutomaticActivity()) + .flow().to("sub2") + .startActivity("sub2").behaviour(new WaitState()) + .flow().to("sub3") + .startActivity("sub3").behaviour(new EndState()) + .endProcess(); - ClientProcessDefinition superProcess = ProcessFactory.build("super") - .node("super1").initial().behaviour(new AutomaticActivity()) - .transition().to("super2") - .node("super2").behaviour(new SubProcess(subProcess)) - .transition().to("super3") - .node("super3").behaviour(new WaitState()) - .done(); + ClientProcessDefinition superProcess = ProcessFactory.startProcess("super") + .startActivity("super1").initial().behaviour(new AutomaticActivity()) + .flow().to("super2") + .startActivity("super2").behaviour(new SubProcess(subProcess)) + .flow().to("super3") + .startActivity("super3").behaviour(new WaitState()) + .endProcess(); ClientExecution superProcesInstance = superProcess.startProcessInstance(); assertEquals("super2", superProcesInstance.getNode().getName()); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -64,12 +64,12 @@ } public void testSmallAmount() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("make loss").initial().behaviour(new AutomaticActivity()) - .transition("use jbpm").to("make profit") + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("make loss").initial().behaviour(new AutomaticActivity()) + .flow("use jbpm").to("make profit") .waitCondition(new AlwaysTrue()) - .node("make profit").behaviour(new WaitState()) - .done(); + .startActivity("make profit").behaviour(new WaitState()) + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -123,18 +123,18 @@ public void testTransitionBasedConcurrency() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("fork").initial().behaviour(new Fork()) - .transition("billing").to("bill") - .transition("shipping").to("ship") - .node("bill").behaviour(new WaitState()) - .transition().to("join") - .node("ship").behaviour(new WaitState()) - .transition().to("join") - .node("join").behaviour(new Join()) - .transition().to("end") - .node("end").behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("fork").initial().behaviour(new Fork()) + .flow("billing").to("bill") + .flow("shipping").to("ship") + .startActivity("bill").behaviour(new WaitState()) + .flow().to("join") + .startActivity("ship").behaviour(new WaitState()) + .flow().to("join") + .startActivity("join").behaviour(new Join()) + .flow().to("end") + .startActivity("end").behaviour(new WaitState()) + .endProcess(); ClientExecution main = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -74,37 +74,37 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + .startEvent(Event.NODE_END) .listener(processListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(processListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(processListener) .compositeNode("composite") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(compositeListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(compositeListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(compositeListener) - .node("inside").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("inside").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(insideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(insideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(insideListener) - .transition().to("outside") + .flow().to("outside") .compositeEnd() - .node("outside").behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("outside").behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(outsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(outsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(outsideListener) - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -149,37 +149,37 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.build("enter a super state") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter a super state") + .startEvent(Event.NODE_END) .listener(processListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(processListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(processListener) - .node("outside").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("outside").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(outsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(outsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(outsideListener) - .transition().to("inside") + .flow().to("inside") .compositeNode("composite") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(compositeListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(compositeListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(compositeListener) - .node("inside").behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("inside").behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(insideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(insideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(insideListener) .compositeEnd() - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -223,30 +223,30 @@ +-----------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + .startEvent(Event.NODE_END) .listener(processListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(processListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(processListener) .compositeNode("composite") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(compositeListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(compositeListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(compositeListener) - .node("inside").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("inside").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(insideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(insideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(insideListener) - .transition().to("inside") + .flow().to("inside") .compositeEnd() - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -289,37 +289,37 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + .startEvent(Event.NODE_END) .listener(processListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(processListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(processListener) .compositeNode("composite") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(compositeListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(compositeListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(compositeListener) - .transition().to("outside") - .node("inside").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + .flow().to("outside") + .startActivity("inside").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(insideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(insideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(insideListener) .compositeEnd() - .node("outside").behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("outside").behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(outsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(outsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(outsideListener) - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -369,53 +369,53 @@ +--------------------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.build("leave a super state") - .event(Event.NODE_END) + ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + .startEvent(Event.NODE_END) .listener(processListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(processListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(processListener) .compositeNode("source outside") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(sourceOutsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(sourceOutsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(sourceOutsideListener) .compositeNode("source middle") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(sourceMiddleListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(sourceMiddleListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(sourceMiddleListener) - .transition().to("destination inside") - .node("source inside").initial().behaviour(new WaitState()) - .event(Event.NODE_END) + .flow().to("destination inside") + .startActivity("source inside").initial().behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(sourceInsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(sourceInsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(sourceInsideListener) .compositeEnd() .compositeEnd() .compositeNode("destination outside") - .event(Event.NODE_END) + .startEvent(Event.NODE_END) .listener(destinationOutsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(destinationOutsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(destinationOutsideListener) - .node("destination inside").behaviour(new WaitState()) - .event(Event.NODE_END) + .startActivity("destination inside").behaviour(new WaitState()) + .startEvent(Event.NODE_END) .listener(destinationInsideListener) - .event(Event.NODE_BEGIN) + .startEvent(Event.NODE_BEGIN) .listener(destinationInsideListener) - .event(Event.TRANSITION_TAKE) + .startEvent(Event.TRANSITION_TAKE) .listener(destinationInsideListener) .compositeEnd() - .done(); + .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 09:29:38 UTC (rev 3669) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 09:52:51 UTC (rev 3670) @@ -49,9 +49,9 @@ } public void testSetAndGetVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -66,9 +66,9 @@ } public void testHasVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -79,9 +79,9 @@ } public void testSetVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -98,9 +98,9 @@ } public void testGetVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -116,9 +116,9 @@ } public void testRemoveVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -150,9 +150,9 @@ } public void testRemoveVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -167,9 +167,9 @@ } public void testGetVariableKeys() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -185,9 +185,9 @@ } public void testGetUnexistingVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -206,9 +206,9 @@ } public void testInitialiseVariablesBeforeProcessInstanceBegin() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new VariableActivity()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new VariableActivity()) + .endProcess(); // here, the process instance is created first, and only later it is begun ClientProcessInstance processInstance = processDefinition.createProcessInstance(); @@ -218,9 +218,9 @@ } public void testNullValue() { - ClientProcessDefinition processDefinition = ProcessFactory.build() - .node("a").initial().behaviour(new WaitState()) - .done(); + ClientProcessDefinition processDefinition = ProcessFactory.startProcess() + .startActivity("a").initial().behaviour(new WaitState()) + .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance();

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3669 - jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 04:29:38 -0500 (Mon, 19 Jan 2009) New Revision: 3669 Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/MessageProcessingTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/ProcessExecutionTest.java Log: reduced size of load tests Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/MessageProcessingTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/MessageProcessingTest.java 2009-01-19 09:07:42 UTC (rev 3668) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/MessageProcessingTest.java 2009-01-19 09:29:38 UTC (rev 3669) @@ -43,7 +43,7 @@ private static final Log log = Log.getLog(MessageProcessingTest.class.getName()); - static long nbrOfTestMessages = 50000; // nbrOfTestMessages must be dividable by insertGroupSize + static long nbrOfTestMessages = 10000; // nbrOfTestMessages must be dividable by insertGroupSize static long insertGroupSize = 100; static int commentsAdded = 0; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/ProcessExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/ProcessExecutionTest.java 2009-01-19 09:07:42 UTC (rev 3668) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/ProcessExecutionTest.java 2009-01-19 09:29:38 UTC (rev 3669) @@ -35,8 +35,8 @@ private static Log log = Log.getLog(ProcessExecutionTest.class.getName()); - static int processes = 50000; - static int threads = 10; + static int processes = 10000; + static int threads = 5; Throwable exception; int finished;

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3668 - jbpm3/trunk/hudson/jboss/bin.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-01-19 04:07:42 -0500 (Mon, 19 Jan 2009) New Revision: 3668 Modified: jbpm3/trunk/hudson/jboss/bin/http-spider.sh Log: check whether wget is installed Modified: jbpm3/trunk/hudson/jboss/bin/http-spider.sh =================================================================== --- jbpm3/trunk/hudson/jboss/bin/http-spider.sh 2009-01-19 07:06:19 UTC (rev 3667) +++ jbpm3/trunk/hudson/jboss/bin/http-spider.sh 2009-01-19 09:07:42 UTC (rev 3668) @@ -19,17 +19,23 @@ NUM_RETRIES=18 # equals 180 seconds before exit if [ "x$1" = "x" ]; then - echo "Usage: http.sh <hostname:port> <output_dir>" + echo "Usage: http-spider.sh <hostname:port> <output_dir>" fi if [ "x$2" = "x" ]; then - echo "Usage: http.sh <hostname:port> <output_dir>" + echo "Usage: http-spider.sh <hostname:port> <output_dir>" fi # cleanup rm $2/spider.success 2&>1 /dev/null rm $2/spider.failed 2&>1 /dev/null +which wget > /dev/null +WGET_EXISTS=$? +if [ $WGET_EXISTS -ne 0 ]; then + exit 1 +fi + COUNTER=0 while [ $COUNTER -lt $NUM_RETRIES ]; do if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then

17 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits January 2009