[jbpm-commits] JBoss JBPM SVN: r2697 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/pvm/model and 3 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-10-31 06:19:29 -0400 (Fri, 31 Oct 2008) New Revision: 2697 Removed: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ProcessFactory.java Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandExecutorTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java Log: unification api proposals Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -1,188 +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.env; - -import java.io.File; -import java.io.InputStream; -import java.net.URL; -import java.util.Set; - -import org.jbpm.pvm.internal.env.PvmEnvironment; -import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser; -import org.jbpm.pvm.internal.log.Log; -import org.jbpm.pvm.internal.stream.FileStreamSource; -import org.jbpm.pvm.internal.stream.InputStreamSource; -import org.jbpm.pvm.internal.stream.ResourceStreamSource; -import org.jbpm.pvm.internal.stream.StreamSource; -import org.jbpm.pvm.internal.stream.StringStreamSource; -import org.jbpm.pvm.internal.stream.UrlStreamSource; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; - - -/** - * an environment factory that also is the environment-factory context. - * - * <p>This environment factory will produce environments with 2 contexts: - * the environment-factory context and the block context. - * </p> - * - * <p>An environment-factory context is build from two wire definitions: the environment-factory - * wire definition and the environment wire definition. - * </p> - * - * <p>The environment-factory context itself is build from the environment-factory wire definition. - * So all objects that are created in this context remain cached for the lifetime of - * this environment-factory context object. - * </p> - * - * <p>This environment-factory context is also a environment factory. The produced environments - * contain 2 contexts: the environment-factory context itself and a new environment context, - * build from the environment wire definition. For each created environment, a new - * environment context will be created from the same environment wire definition. - * Objects in the environment context will live for as long as the environment. - * </p> - * @author Tom Baeyens - */ -public class PvmEnvironmentFactory extends EnvironmentFactory implements Context { - - private static final long serialVersionUID = 1L; - private static final Log log = Log.getLog(PvmEnvironmentFactory.class.getName()); - protected static PvmEnvironmentFactoryParser pvmEnvironmentFactoryParser = new PvmEnvironmentFactoryParser(); - - protected WireContext environmentFactoryCtxWireContext = null; - protected WireDefinition environmentCtxWireDefinition = null; - - public PvmEnvironmentFactory() { - } - - public PvmEnvironmentFactory(String resource) { - this(resource, null); - } - - public PvmEnvironmentFactory(String resource, ClassLoader classLoader) { - this(new ResourceStreamSource(resource, classLoader)); - } - - public PvmEnvironmentFactory(File file) { - this(new FileStreamSource(file)); - } - - public PvmEnvironmentFactory(URL url) { - this(new UrlStreamSource(url)); - } - - public PvmEnvironmentFactory(InputStream inputStream) { - this(new InputStreamSource(inputStream)); - } - - public static PvmEnvironmentFactory parseXmlString(String xmlString) { - return new PvmEnvironmentFactory(new StringStreamSource(xmlString)); - } - - PvmEnvironmentFactory(StreamSource streamSource) { - PvmEnvironmentFactoryParser.getInstance() - .createParse() - .setDocumentObject(this) - .setStreamSource(streamSource) - .execute() - .checkProblems("pvm environment configuration "+streamSource); - } - - public Environment openEnvironment() { - PvmEnvironment environment = new PvmEnvironment(this); - - log.debug("opening "+environment); - - // set the classloader - ClassLoader classLoader = environmentFactoryCtxWireContext.getClassLoader(); - if (classLoader!=null) { - environment.setClassLoader(classLoader); - } - - // add the environment-factory context - environment.addContext(environmentFactoryCtxWireContext); - - // add the environment block context - WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_ENVIRONMENT, environment, true); - // add the environment block context to the environment - environment.addContext(environmentContext); - - try { - // finish the creation of the environment wire context - environmentContext.create(); - - } catch (RuntimeException e) { - // On exception, pop environment - Environment.popEnvironment(); - throw e; - } - // if all went well, return the created environment - return environment; - } - - public void close() { - environmentFactoryCtxWireContext.fire(WireContext.EVENT_CLOSE, null); - } - - // environment-factory context delegation methods /////////////////////////////////// - - public Object get(String key) { - return environmentFactoryCtxWireContext.get(key); - } - - public <T> T get(Class<T> type) { - return environmentFactoryCtxWireContext.get(type); - } - - public String getName() { - return environmentFactoryCtxWireContext.getName(); - } - - public boolean has(String key) { - return environmentFactoryCtxWireContext.has(key); - } - - public Set<String> keys() { - return environmentFactoryCtxWireContext.keys(); - } - - public Object set(String key, Object value) { - return environmentFactoryCtxWireContext.set(key, value); - } - - // getters and setters ////////////////////////////////////////////////////// - - public void setEnvironmentCtxWireDefinition(WireDefinition blockWireDefinition) { - this.environmentCtxWireDefinition = blockWireDefinition; - } - public WireContext getEnvironmentFactoryCtxWireContext() { - return environmentFactoryCtxWireContext; - } - public void setEnvironmentFactoryCtxWireContext(WireContext applicationWireContext) { - this.environmentFactoryCtxWireContext = applicationWireContext; - } - public WireDefinition getEnvironmentCtxWireDefinition() { - return environmentCtxWireDefinition; - } - -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -1,97 +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.env; - -import java.util.HashSet; -import java.util.Set; - -import org.jbpm.pvm.internal.spring.SpringEnvironment; -import org.jbpm.pvm.internal.util.ReflectUtil; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -/** this environment factory will see only the singleton beans. - * - * The created {@link SpringEnvironment}s will see the prototype - * beans and it will cache them. - * - * @author Tom Baeyens - */ -public class SpringEnvironmentFactory extends EnvironmentFactory implements ApplicationContextAware { - - // TODO pull up the common behaviour between this class and the SpringEnvironmentContext - - private static final long serialVersionUID = 1L; - - ApplicationContext applicationContext; - - public SpringEnvironment openEnvironment() { - return new SpringEnvironment(this); - } - - public boolean has(String key) { - return applicationContext.isSingleton(key); - } - - public Object get(String key) { - if (has(key)) { - return applicationContext.getBean(key); - } - return null; - } - - public <T> T get(Class<T> type) { - String name = ReflectUtil.getUnqualifiedClassName(type); - name = name.substring(0, 1).toLowerCase() + name.substring(1); - return (T) get(name); - } - - public Set<String> keys() { - HashSet<String> keys = new HashSet<String>(); - for (String key : applicationContext.getBeanDefinitionNames()) { - if (has(key)) { - keys.add(key); - } - } - return keys; - } - - public ApplicationContext getApplicationContext() { - return applicationContext; - } - - public void setApplicationContext(ApplicationContext applicationContext) { - this.applicationContext = applicationContext; - } - - - public void close() { - } - - public String getName() { - return null; - } - - public Object set(String key, Object value) { - return null; - } -} Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ProcessFactory.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -1,685 +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.PvmException; -import org.jbpm.pvm.activity.Activity; -import org.jbpm.pvm.client.ClientProcessDefinition; -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; -import org.jbpm.pvm.listener.EventListener; - -/** factory for process definitions. - * - * <p>Use this factory as a <a href="http://martinfowler.com/bliki/FluentInterface.html">fl... 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 #done()} to get the constructed ProcessDefinition. - * </p> - * - * <p>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 : - * </p> - * <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 /> - * - * <p>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. - * </p> - * - * @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 build() { - return new ProcessFactory(); - } - - /** starts building a process definition */ - public static ProcessFactory build(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 PvmException("no current node"); - } - if (processDefinition.getInitial()!=null) { - throw new PvmException("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 PvmException("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.setKey(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.setKey(sourceDescriptor.getName()); - variableDefinition.setSourceDescriptor(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 node() { - return node(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) { - 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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - - if (compositeElementStack==null) { - compositeElementStack = new Stack<CompositeElementImpl>(); - } - - compositeElementStack.push(compositeElement); - node(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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - - if (compositeElementStack==null) { - throw new PvmException("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 transition() { - return transition(null); - } - - /** creates a named transition on the current node. - * This method requires a current node */ - public ProcessFactory transition(String transitionName) { - if (exceptionHandler!=null) { - exceptionHandler.setTransitionName(transitionName); - } else { - if (node==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (transition==null) { - throw new PvmException("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 event(String eventName) { - if (exceptionHandler!=null) { - throw new PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (observableElement==null) { - throw new PvmException("no current process element"); - } - if (observableElement instanceof Transition) { - throw new PvmException("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 #transition() 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 PvmException("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 PvmException("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 PvmException("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 #event(String)} or by a {@link #transition()}. - * 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 #event(String)} or by a {@link #transition()}. - * 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 #event(String)} or by a {@link #transition()}. - * 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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (eventListenerReference==null) { - throw new PvmException("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 PvmException("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 PvmException("exceptionHandler needs to be closed with exceptionHandlerEnd"); - } - if (observableElement==null) { - throw new PvmException("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 PvmException("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 done() { - resolveDestinations(); - if (processDefinition.getInitial()==null) { - throw new PvmException("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/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -30,11 +30,11 @@ import javax.naming.NameNotFoundException; import javax.naming.NamingException; +import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.log.Log; /** * Stateless session command executor. Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandReceiverMDB.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -40,9 +40,9 @@ import javax.naming.NameNotFoundException; import javax.naming.NamingException; +import org.jbpm.log.Log; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.jobexecutor.ExecuteJobCmd; -import org.jbpm.pvm.internal.log.Log; /** * Message driven command receiver. Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -26,8 +26,8 @@ import org.jbpm.PvmException; import org.jbpm.job.Timer; +import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.session.DbSession; import org.jbpm.pvm.session.TimerSession; Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ExecuteTimerCmd.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -22,10 +22,11 @@ package org.jbpm.enterprise.internal.ejb; import java.util.Date; + +import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.session.DbSession; Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/TimerEB.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -36,7 +36,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jbpm.pvm.internal.log.Log; +import org.jbpm.log.Log; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandExecutorTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandExecutorTest.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/CommandExecutorTest.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -32,7 +32,7 @@ import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome; import org.jbpm.enterprise.test.custom.InsertPhraseCmd; import org.jbpm.enterprise.test.custom.RemovePhraseCmd; -import org.jbpm.pvm.internal.log.Log; +import org.jbpm.log.Log; /** * Server-side test for the {@linkplain CommandExecutorSLSB command executor}. Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -36,6 +36,7 @@ import org.jbpm.enterprise.internal.ejb.TimerEB; import org.jbpm.enterprise.test.custom.HappyActivity; import org.jbpm.enterprise.test.custom.NoisyActivity; +import org.jbpm.log.Log; import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.cmd.Command; @@ -43,7 +44,6 @@ import org.jbpm.pvm.internal.cmd.GetVariablesCmd; import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.model.OpenProcessDefinition; Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/HappyActivity.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -23,10 +23,10 @@ import java.util.Date; +import org.jbpm.log.Log; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.internal.log.Log; /** * @author Alejandro Guizar Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java 2008-10-31 09:15:02 UTC (rev 2696) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/custom/NoisyActivity.java 2008-10-31 10:19:29 UTC (rev 2697) @@ -24,10 +24,10 @@ import java.sql.SQLException; import java.util.Date; +import org.jbpm.log.Log; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.activity.ActivityExecution; import org.jbpm.pvm.internal.job.TimerImpl; -import org.jbpm.pvm.internal.log.Log; /** * @author Alejandro Guizar