jbpm-commits August 2008

jbpm-commits@lists.jboss.org

1 participants
252 discussions

JBoss JBPM SVN: r1921 - jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor.

by do-not-reply＠jboss.org

Author: porcherg Date: 2008-08-18 07:50:23 -0400 (Mon, 18 Aug 2008) New Revision: 1921 Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java Log: add test for JBPM-1685 Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java (rev 0) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java 2008-08-18 11:50:23 UTC (rev 1921) @@ -0,0 +1,76 @@ +/* + * 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.jobexecutor; + +import org.jbpm.pvm.env.Environment; +import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.job.CommandMessage; +import org.jbpm.pvm.internal.log.Log; +import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; + + +/** + * @author Tom Baeyens + * @author Guillaume Porcher + * + * Simple command that will create an exception during execution. + * The exception will generate a stacktrace with variable length + * (controlled by the recursionInitialDepth parameter). + * + * This class is to test the persistence of exception stacktrace in jobs. + */ +public class FailRecursivelyTestCommand implements Command<Object> { + + private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(FailRecursivelyTestCommand.class.getName()); + + int recursionInitialDepth; + + public FailRecursivelyTestCommand() { + } + + private void recursiveException(int val) { + if (val <= 0) { + throw new RuntimeException("val <= 0"); + } + try { + recursiveException(val-1); + } catch (Exception e) { + throw new RuntimeException("Error in reccursive call", e); + } + } + + public static CommandMessage createMessage(int recursionInitialDepth) { + CommandMessage commandMessage = new CommandMessage(); + ObjectDescriptor commandDescriptor = new ObjectDescriptor(FailRecursivelyTestCommand.class); + commandDescriptor.addInjection("recursionInitialDepth", new IntegerDescriptor(recursionInitialDepth)); + commandMessage.setCommandDescriptor(commandDescriptor); + return commandMessage; + } + + public Object execute(Environment environment) throws Exception { + recursiveException(recursionInitialDepth); + return null; + } + +} Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailRecursivelyTestCommand.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-08-18 10:55:41 UTC (rev 1920) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-08-18 11:50:23 UTC (rev 1921) @@ -33,7 +33,6 @@ import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.client.ClientProcessInstance; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.Transaction; import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.job.JobImpl; @@ -47,6 +46,7 @@ /** * @author Tom Baeyens + * @author Guillaume Porcher */ public class JobExecutorTest extends DbTestCase { @@ -203,6 +203,39 @@ }); } + public void testExceptionInJob() { + + JobExecutor jobExecutor = getEnvironmentFactory().get(JobExecutor.class); + jobExecutor.start(); + try { + commandService.execute(new Command<Object>() { + // size of the recursion (to create a long stacktrace) + // 10 creates an exception if there is a limit of 4000 characters + int recursiveDepth = 10; + + public Object execute(Environment environment) throws Exception { + MessageSession messageSession = environment.get(MessageSession.class); + CommandMessage commandMessage = FailRecursivelyTestCommand.createMessage(recursiveDepth); + messageSession.send(commandMessage); + return null; + } + }); + + waitTillNoMoreMessages(jobExecutor); + + } finally { + jobExecutor.stop(true); + } + + commandService.execute(new Command<Object>() { + public Object execute(Environment environment) throws Exception { + PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); + List<Job> deadJobs = pvmDbSession.findDeadJobs(); + assertEquals("there should be one dead jobImpl", 1, deadJobs.size()); + return null; + } + }); + } // helper methods /////////////////////////////////////////////////////////// void insertTestMessages() {

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1920 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/client/internal and 17 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 06:55:41 -0400 (Mon, 18 Aug 2008) New Revision: 1920 Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java Removed: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml Log: Add notion of internal API Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.client; - -//$Id$ - -import java.util.Map; - -/** - * A registry that Maps namespaceURI to dialect Id - * - * @author thomas.diesler(a)jboss.com - * @since 18-Jul-2008 - */ -public class DialectRegistry -{ - public static final Object BEAN_NAME = "jBPMDialectRegistry"; - - // Maps namespaceURI to dialect Id - private Map<String,String> registry; - - public void setRegistry(Map<String, String> registry) - { - this.registry = registry; - } - - public String getDialect(String nsURI) - { - return registry.get(nsURI); - } -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,87 +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.jboss.bpm.client; - -// $Id$ - -import java.util.HashMap; -import java.util.Map; - -import javax.management.ObjectName; - -import org.jboss.bpm.model.Process; -import org.jboss.bpm.runtime.Attachments; -import org.jboss.bpm.runtime.RuntimeProcess; - -/** - * The ExecutionManager executes processes - * - * @author thomas.diesler(a)jboss.com - * @since 18-Jun-2008 - */ -public abstract class ExecutionManager -{ - // The map of active runtime processes - private Map<ObjectName, RuntimeProcess> runtimeProcesses = new HashMap<ObjectName, RuntimeProcess>(); - - // Hide public constructor - protected ExecutionManager() - { - } - - /** - * Locate the ExecutionManager - */ - public static ExecutionManager locateExecutionManager() - { - ProcessEngine engine = ProcessEngine.locateProcessEngine(); - return engine.getExecutionManager(); - } - - /** - * Start the Process and return a Future - * - * @param proc The Process to start - * @param att The Attachments in the ExecutionContext - */ - public abstract void startProcess(Process proc, Attachments att); - - /** - * Get a {@link RuntimeProcess} for a given processID - * @return null if there is no such process - */ - public RuntimeProcess getRuntimeProcess(ObjectName procID) - { - return runtimeProcesses.get(procID); - } - - protected void addRuntimeProcess(RuntimeProcess rtProc) - { - ObjectName procID = rtProc.getProcess().getID(); - runtimeProcesses.put(procID, rtProc); - } - - protected void removeRuntimeProcess(RuntimeProcess rtProc) - { - runtimeProcesses.remove(rtProc.getProcess().getID()); - } -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,87 @@ +/* + * 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.jboss.bpm.client; + +// $Id$ + +import java.util.HashMap; +import java.util.Map; + +import javax.management.ObjectName; + +import org.jboss.bpm.model.Process; +import org.jboss.bpm.runtime.Attachments; +import org.jboss.bpm.runtime.internal.RuntimeProcess; + +/** + * The ExecutionManager executes processes + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class ExecutionManager +{ + // The map of active runtime processes + private Map<ObjectName, RuntimeProcess> runtimeProcesses = new HashMap<ObjectName, RuntimeProcess>(); + + // Hide public constructor + protected ExecutionManager() + { + } + + /** + * Locate the ExecutionManager + */ + public static ExecutionManager locateExecutionManager() + { + ProcessEngine engine = ProcessEngine.locateProcessEngine(); + return engine.getExecutionManager(); + } + + /** + * Start the Process and return a Future + * + * @param proc The Process to start + * @param att The Attachments in the ExecutionContext + */ + public abstract void startProcess(Process proc, Attachments att); + + /** + * Get a {@link RuntimeProcess} for a given processID + * @return null if there is no such process + */ + public RuntimeProcess getRuntimeProcess(ObjectName procID) + { + return runtimeProcesses.get(procID); + } + + protected void addRuntimeProcess(RuntimeProcess rtProc) + { + ObjectName procID = rtProc.getProcess().getID(); + runtimeProcesses.put(procID, rtProc); + } + + protected void removeRuntimeProcess(RuntimeProcess rtProc) + { + runtimeProcesses.remove(rtProc.getProcess().getID()); + } +} Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -30,12 +30,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.Task; /** * The ProcessEngine sends mesages through the MessageManager. A {@link Message} has an ID and is targeted to a Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,74 +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.jboss.bpm.client; - -// $Id$ - -import java.util.Hashtable; - -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - -/** - * A simple factory for creating safe object names. - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-May-2006 - */ -public class ObjectNameFactory -{ - public static ObjectName create(String name) - { - try - { - return new ObjectName(name); - } - catch (MalformedObjectNameException e) - { - throw new Error("Invalid ObjectName: " + name + "; " + e); - } - } - - public static ObjectName create(String domain, String key, String value) - { - try - { - return new ObjectName(domain, key, value); - } - catch (MalformedObjectNameException e) - { - throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); - } - } - - public static ObjectName create(String domain, Hashtable<String, String> table) - { - try - { - return new ObjectName(domain, table); - } - catch (MalformedObjectNameException e) - { - throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); - } - } -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,74 @@ +/* + * 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.jboss.bpm.client; + +// $Id$ + +import java.util.Hashtable; + +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +/** + * A simple factory for creating safe object names. + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class ObjectNameFactory +{ + public static ObjectName create(String name) + { + try + { + return new ObjectName(name); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + name + "; " + e); + } + } + + public static ObjectName create(String domain, String key, String value) + { + try + { + return new ObjectName(domain, key, value); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); + } + } + + public static ObjectName create(String domain, Hashtable<String, String> table) + { + try + { + return new ObjectName(domain, table); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); + } + } +} Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -40,6 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.EngineShutdownException; +import org.jboss.bpm.client.internal.DialectRegistry; import org.jboss.bpm.model.Process; import org.jboss.bpm.runtime.Attachments; import org.w3c.dom.Document; Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.client.internal; + +//$Id$ + +import java.util.Map; + +/** + * A registry that Maps namespaceURI to dialect Id + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jul-2008 + */ +public class DialectRegistry +{ + public static final Object BEAN_NAME = "jBPMDialectRegistry"; + + // Maps namespaceURI to dialect Id + private Map<String,String> registry; + + public void setRegistry(Map<String, String> registry) + { + this.registry = registry; + } + + public String getDialect(String nsURI) + { + return registry.get(nsURI); + } +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,112 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * An activity is a generic term for work that a company or organization performs via business processes. An activity can be atomic or non-atomic (compound). The types - * of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Activity extends FlowObject, PropertySupport -{ - /** - * The ActivityType MUST be of type Task or Sub-Process. - */ - enum ActivityType - { - Task, SubProcess - } - - /** - * The Activity LoopType - */ - enum LoopType - { - None, Standard, MultiInstance - } - - /** - * The ActivityType MUST be of type Task or Sub-Process. - */ - ActivityType getActivityType(); - - /** - * One or more Performers MAY be entered. The Performer attribute defines the - * resource that will perform or will be responsible for the activity. The Performer - * entry could be in the form of a specific individual, a group, an organization role - * or position, or an organization. - */ - List<String> getPerformers(); - - /** - * The InputSets attribute defines the data requirements for input to the Activity. - * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the - * Activity to be performed (if it has first been instantiated by the appropriate signal - * arriving from an incoming Sequence Flow) - */ - List<InputSet> getInputSets(); - - /** - * The OutputSets attribute defines the data requirements for output from the - * activity. Zero or more OutputSets MAY be defined. At the completion of the - * activity, only one of the OutputSets may be produced--It is up to the - * implementation of the activity to determine which set will be produced. However, - * the IORules attribute MAY indicate a relationship between an OutputSet and an - * InputSet that started the activity. - */ - List<OutputSet> getOutputSets(); - - /** - * The IORules attribute is a collection of expressions, each of which specifies the - * required relationship between one input and one output. That is, if the activity is - * instantiated with a specified input, that activity shall complete with the specified - * output. - */ - List<Expression> getIORules(); - - /** - * The default value is 1. The value MUST NOT be less than 1. This attribute - * defines the number of Tokens that must arrive before the activity can begin. - */ - int getStartQuantity(); - - /** - * The default value is 1. The value MUST NOT be less than 1. This attribute - * defines the number of Tokens that must be generated from the activity. This - * number of Tokens will be sent down any outgoing Sequence Flow (assuming any - * Sequence Flow Conditions are satisfied). - */ - int getCompletionQuantity(); - - /** - * LoopType is an attribute and is by default None, but MAY be set to Standard or - * MultiInstance. A Task of type Receive that has its Instantiate attribute set to True MUST NOT - * have a Standard or MultiInstance LoopType. - */ - LoopType getLoopType(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The ActivityBuilder can be used to build an {@link Activity} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ActivityBuilder extends ProcessBuilder -{ - /** - * Add an {@link InputSet} - */ - ActivityBuilder addInputSet(); - - /** - * Add an {@link Property} Input - */ - ActivityBuilder addPropertyInput(String name, String value); - - /** - * Add an {@link OutputSet} - */ - ActivityBuilder addOutputSet(); - - /** - * Add an {@link Property} Output - */ - ActivityBuilder addPropertyOutput(String name, String value); - - /** - * Add an IORule {@link Expression} - */ - ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang); - - /** - * Add an activity property - */ - ActivityBuilder addProperty(String name, String value); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,48 +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.jboss.bpm.model; - -//$Id$ - - -/** - * An ArtifactInput, which is used in the definition of attributes for InputSet - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Artifact extends GraphicalElement -{ - /** - * Defines the type of an {@link Artifact} - */ - enum ArtifactType - { - DataObject, Group, Annotation - }; - - /** - * The ArtifactType MAY be set to DataObject, Group, or Annotation. - * The ArtifactType list MAY be extended to include new types. - */ - ArtifactType getArtifactType(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - - -/** - * An ArtifactInput, which is used in the definition of attributes for {@link InputSet} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ArtifactInput extends Artifact -{ - /** - * This attribute identifies an Artifact that will be used as an input to an activity. The - * identified Artifact will be part of an InputSet for an activity. - */ - Artifact getArtifactRef(); - - /** - * The default value for this attribute is True. This means that the Input is required for - * an activity to start. If set to False, then the activity MAY start within the input if it - * is available, but MAY accept the input (more than once) after the activity has - * started. An InputSet may have a some of ArtifactInputs that have this attribute set - * to True and some that are set to False. - */ - boolean isRequireForStart(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - - -/** - * An ArtifactOutput, which is used in the definition of attributes for {@link OutputSet} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ArtifactOutput extends Artifact -{ - /** - * This attribute identifies an Artifact that will be used as an output to an activity. The - * identified Artifact will be part of an OutputSet for an activity. - */ - Artifact getArtifactRef(); - - /** - * The default value for this attribute is True. This means that the Output will be - * produced when an activity has been completed. If set to False, then the activity - * MAY produce the output (more than once) before it has completed. An OutputSet - * may have a some of ArtifactOutputs that have this attribute set to True and some that - * are set to False. - */ - boolean isProduceAtCompletion(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,62 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Constants.AssignTime; - -//$Id$ - -/** - * An Assignment, which is used in the definition of attributes for {@link Process}, - * {@link Activity}, {@link Event}, {@link Gateway}, and {@link Gate}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Assignment extends SupportingElement -{ - /** - * The target for the Assignment MUST be a Property of the Process or the activity - * itself. - */ - Property getTo(); - - /** - * The Expression MUST be made up of a combination of Values, Properties, and - * Attributes, which are separated by operators such as add or multiply. The expression - * language is defined in the ExpressionLanguage attribute of the Business Process - * Diagram - */ - Expression getFrom(); - - /** - * An Assignment MAY have a AssignTime setting. If the Object is an activity (Task, - * Sub-Process, or Process), then the Assignment MUST have an AssignTime. - * A value of Start means that the assignment SHALL occur at the start of the activity. - * This can be used to assign the higher-level (global) Properties of the Process to the - * (local) Properties of the activity as an input to the activity. - * A value of End means that the assignment SHALL occur at the end of the activity. - * This can be used to assign the (local) Properties of the activity to the higher-level - * (global) Properties of the Process as an output to the activity. - */ - AssignTime getAssignTime(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model; - -//$Id$ - -import java.io.Serializable; - -import javax.management.ObjectName; - -/** - * The parrent of all BPMN elements - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface BPMNElement extends Serializable -{ - public static final String ID_DOMAIN = "jboss.bpm"; - - /** - * Get the ID of this element - */ - ObjectName getID(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Cancel event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface CancelEventDetail extends EventDetail -{ - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Compensate event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface CompensateEventDetail extends EventDetail -{ - /** - * For an End Event: - * - * If the Result is a Compensation, then the Activity that needs to be compensated MAY be supplied. - * If an Activity is not supplied, then the Event broadcast to all completed activities in the Process Instance. - * - * For an Intermediate Event within Normal Flow: If the Trigger is a Compensation, then the Activity that needs - * to be compensated MAY be supplied. If an Activity is not supplied, then the Event broadcast to all completed - * activities in the Process Instance. This “throws” the compensation. - * - * For an Intermediate Event attached to the boundary of an Activity: This Event “catches” the compensation. - * No further information is required. The Activity the Event is attached to will provide the Id necessary - * to match the compensation event with the event that “threw” the compensation or the compensation will be a - * broadcast. - */ - Activity getActivityRef(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model; - -// $Id$ - -/** - * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex - * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers - * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ComplexGateway extends Gateway -{ - /** - * If there are multiple incoming Sequence Flow, an IncomingCondition expression - * MUST be set by the modeler. This will consist of an expression that can reference - * Sequence Flow names and/or Process Properties (Data). - */ - Expression getIncommingCondition(); - - /** - * If there are multiple outgoing Sequence Flow, an OutgoingCondition expression - * MUST be set by the modeler. This will consist of an expression that can reference - * (outgoing) Sequence Flow Ids and/or Process Properties (Data). - */ - Expression getOutgoingCondition(); - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Condition.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,48 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Condition, which is used in the definition of attributes for Start Event and - * Intermediate Event - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Condition extends SupportingElement -{ - /** - * Name is an optional attribute that is text description of the Condition. If a Name is - * not entered, then a ConditionExpression MUST be entered - */ - String getName(); - - /** - * A ConditionExpression MAY be entered. In some cases the Condition itself will be - * stored and maintained in a separate application (e.g., a Rules Engine). If a ConditionExpression - * is not entered, then a Name MUST be entered - */ - Expression getConditionExpression(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Conditional event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ConditionalEventDetail extends EventDetail -{ - /** - * If the Trigger is Conditional, then a Condition MUST be entered. - */ - Condition getConditionRef(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,59 +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.jboss.bpm.model; - -//$Id$ - -/** - * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence - * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model, - * although they both affect the performance of activities within a Process. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ConnectingObject extends GraphicalElement -{ - /** - * Name is an optional attribute that is text description of the Connecting Object. - */ - String getName(); - - /** - * SourceRef is an attribute that identifies which Graphical Element the Connecting - * Object is connected from. Note: there are restrictions as to what objects Sequence - * Flow and Message Flow can connect. - */ - FlowObject getSourceRef(); - - /** - * TargetRef is an attribute that identifies which Graphical Element the Connecting - * Object is connected to. Note: there are restrictions as to what objects Sequence - * Flow and Message Flow can connect. - */ - FlowObject getTargetRef(); - - /** - * Get the required target name - */ - String getTargetName(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,70 +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.jboss.bpm.model; - -//$Id$ - - -/** - * A Process is any {@link Activity} performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Constants -{ - - public enum AssignTime - { - Start, End - } - - /** - * Defines the type of an {@link Event} - */ - public enum EventDetailType - { - Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate - } - - public enum ExpressionLanguage - { - MVEL, String, Object - } - - /** - * The GatewayType - * - */ - public enum GatewayType - { - Exclusive, Inclusive, Complex, Parallel - } - - /** - * The TaskType - */ - public enum TaskType - { - Service, Receive, Send, User, Script, Manual, Reference, None - } -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,73 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.Event; + +//$Id$ + + +/** + * A Process is any {@link Activity} performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Constants +{ + + public enum AssignTime + { + Start, End + } + + /** + * Defines the type of an {@link Event} + */ + public enum EventDetailType + { + Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate + } + + public enum ExpressionLanguage + { + MVEL, String, Object + } + + /** + * The GatewayType + * + */ + public enum GatewayType + { + Exclusive, Inclusive, Complex, Parallel + } + + /** + * The TaskType + */ + public enum TaskType + { + Service, Receive, Send, User, Script, Manual, Reference, None + } +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,54 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - - -/** - * DataObject, which extends common Artifact - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface DataObject extends Artifact -{ - /** - * Name is an attribute that is text description of the object. - */ - String getName(); - - /** - * State is an optional attribute that indicates the impact the Process has had on the Data - * Object. Multiple Data Objects with the same name MAY share the same state within one Process. - */ - String getState(); - - /** - * Modeler-defined Properties MAY be added to a Data Object. The fully delineated name of these - * properties are “<process name>.<task name>.<property name>” - * (e.g., “Add Customer.Review Credit Report.Score”). - */ - List<Property> getProperties(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -/** - * As the name implies, the End Event indicates where a Process will end. - * - * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. - * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape. - * End Event Results are Message, Error, Compensation, Link, and Multiple. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EndEvent extends Event, SingleInFlowSupport -{ - /** - * Result defines the type of result expected for an End Event. - * Of the set of EventDetailTypes only six can be applied to an - * End Event: Message, Error, Cancel, Compensation, Signal, and Terminate. - * - * If there is no EventDetail defined, then this is considered a None End Event. - * If there is more than one EventDetail defined, this is considered a Multiple EndEvent. - */ - List<EventDetail> getResult(); - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * An Entity, which is used in the definition of attributes for a {@link Participant} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Entity extends SupportingElement -{ - /** - * Name is an attribute that is text description of the Entity. - */ - String getName(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,51 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Error event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ErrorEventDetail extends EventDetail -{ - /** - * For an End Event: - * If the Result is an Error, then the ErrorCode MUST be supplied.This “throws” the - * error. - * - * For an Intermediate Event within Normal Flow: - * If the Trigger is an Error, then the ErrorCode MUST be entered. This “throws” - * the error. - * - * For an Intermediate Event attached to the boundary of an Activity: - * If the Trigger is an Error, then the ErrorCode MAY be entered. This Event - * “catches” the error. If there is no ErrorCode, then any error SHALL trigger the - * Event. If there is an ErrorCode, then only an error that matches the ErrorCode - * SHALL trigger the Event. - */ - String getErrorCode(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model; - - -//$Id$ - -/** - * An Event is something that “happens” during the course of a business process. - * - * These Events affect the flow of the Process and usually have a cause or an impact. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Event extends FlowObject -{ - /** - * Defines the type of an {@link Event} - */ - enum EventType - { - Start, End, Intermediate - }; -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.model.Signal.SignalType; - -/** - * The EventBuilder can be used to build an {@link Event} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EventBuilder extends ProcessBuilder -{ - /** - * Add an event detail to the last added {@link Event} - */ - EventBuilder addEventDetail(Constants.EventDetailType detailType); - - /** - * Add a signal ref to the last added {@link EventDetail} - */ - EventBuilder addSignalRef(SignalType signalType, String signalMessage); - - /** - * Add a message ref to the last added {@link EventDetail} - */ - EventBuilder addMessageRef(String msgName); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,52 @@ +/* + * 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.jboss.bpm.model; + +//$Id$ + +import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; + +/** + * The EventBuilder can be used to build an {@link Event} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EventBuilder extends ProcessBuilder +{ + /** + * Add an event detail to the last added {@link Event} + */ + EventBuilder addEventDetail(Constants.EventDetailType detailType); + + /** + * Add a signal ref to the last added {@link EventDetail} + */ + EventBuilder addSignalRef(SignalType signalType, String signalMessage); + + /** + * Add a message ref to the last added {@link EventDetail} + */ + EventBuilder addMessageRef(String msgName); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Constants.EventDetailType; - -//$Id$ - -/** - * The base of all supported event details. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EventDetail extends SupportingElement -{ - /** - * The EventDetailType attribute defines the type of trigger expected for an Event. The - * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate, - * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each - * have a subset of the EventDetailTypes that can be used. - * The EventDetailType list MAY be extended to include new types. - */ - EventDetailType getEventDetailType(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,57 +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.jboss.bpm.model; - - -//$Id$ - -/** - * Exclusive Gateways (Decisions) are locations within a business process where the Sequence Flow can take two or more - * alternative paths. This is basically the “fork in the road” for a process. For a given performance (or instance) of the - * process, only one of the paths can be taken (this should not be confused with forking of paths—refer to “Forking Flow”) - * - * A Decision is not an activity from the business process perspective, but is a type of Gateway that controls - * the Sequence Flow between activities. It can be thought of as a question that is asked at that point in the Process. The - * question has a defined set of alternative answers (Gates). Each Decision Gate is associated with a condition expression - * found within an outgoing Sequence Flow. When a Gate is chosen during the performance of the Process, the - * corresponding Sequence Flow is then chosen. A Token arriving at the Decision would be directed down the appropriate - * path, based on the chosen Gate. - * - * The Exclusive Decision has two or more outgoing Sequence Flow, but only one of them may be taken during the - * performance of the Process. Thus, the Exclusive Decision defines a set of alternative paths for the Token to take as it - * traverses the Flow. There are two types of Exclusive Decisions: Data-Based and Event-Based. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGateway extends Gateway -{ - enum ExclusiveType - { - Data, Event - } - - /** - * ExclusiveType is by default Data. The ExclusiveType MAY be set to Event. - */ - ExclusiveType getExclusiveType(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,55 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based - * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing - * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken - * (hence the name Data-Based). - * - * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will - * determine the Sequence Flow that will be taken. Since the behavior of this Gateway is exclusive, any other conditions that - * may actually be TRUE will be ignored--only one Gate can be chosen. One of the Gates may be “default” (or otherwise), - * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be - * chosen—along with its associated Sequence Flow. - * - * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure - * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However, - * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed - * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid - * Gate at runtime is an invalid model. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGatewayDataBased extends ExclusiveGateway -{ - /** - * A Default Gate MAY be specified - */ - Gate getDefaultGate(); - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,53 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The inclusion of Event-Based Exclusive Gateways is the result of recent developments in the handling of distributed - * systems (e.g., with pi-calculus) and was derived from the BPEL4WS pick. On the input side, their behavior is the same as - * a Data-Based Exclusive Gateway (see “Data-Based” on page 73). On the output side, the basic idea is that this Decision - * represents a branching point in the process where the alternatives are based on events that occurs at that point in the - * Process, rather than the evaluation of expressions using process data. A specific event, usually the receipt of a message, - * determines which of the paths will be taken. For example, if a company is waiting for a response from a customer, they - * will perform one set of activities if the customer responds “Yes” and another set of activities if the customer responds - * “No.” The customer’s response determines which path is taken. The identity of the Message determines which path is taken. - * That is, the “Yes” Message and the “No” message are different messages—they are not the same message with different values - * within a property of the Message. The receipt of the message can be modeled with a Task of TaskType Receive or an - * Intermediate Event with a Message Trigger. In addition to Messages, other Triggers for Intermediate Events can be used, such as Timers. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGatewayEventBased extends ExclusiveGateway -{ - /** - * Event-Based Gateways can be defined as the instantiation mechanism for the - * Process with the Instantiate attribute. This attribute MAY be set to true if the - * Gateway is the first element after the Start Event or a starting Gateway if there is - * no Start Event (i.e., there are no incoming Sequence Flow). - */ - boolean isInstantiate(); - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,55 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Constants.ExpressionLanguage; - -//$Id$ - -/** - * An Expression, which is used in the definition of attributes for {@link StartEvent}, - * {@link IntermediateEvent}, {@link Activity}, {@link ComplexGateway}, and {@link SequenceFlow} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Expression extends SupportingElement -{ - /** - * An ExpressionBody MUST be entered to provide the text of the expression, which - * will be written in the language defined by the ExpressionLanguage attribute. - */ - String getExpressionBody(); - - /** - * An ExpressionValue MAY be available if the Expression is used as a {@link Property} value. - */ - Object getExpressionValue(); - - /** - * A Language MUST be provided to identify the language of the ExpressionBody. - * The value of the ExpressionLanguage should follow the naming conventions for the - * version of the specified language. - */ - ExpressionLanguage getExpressionLanguage(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,51 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * A Flow Object is one of the set of following graphical objects: {@link Event}, {@link Activity}, and {@link Gateway}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface FlowObject extends GraphicalElement -{ - /** - * Get the unique name. - */ - String getName(); - - /** - * Get the associated Process - */ - Process getProcess(); - - /** - * One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the - * Assignment SHALL be performed as defined by the AssignTime attribute. - */ - List<Assignment> getAssignments(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gate.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,75 +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.jboss.bpm.model; - -import java.util.List; - - - -//$Id$ - -/** - * There MAY be zero or more Gates (except where noted below). Zero Gates are - * allowed if the Gateway is last object in a Process flow and there are no Start or - * End Events for the Process. If there are zero or only one incoming Sequence - * Flow, then there MUST be at least two Gates. - * - * For Exclusive Data-Based Gateways - * When two Gates are required, one of them MAY be the DefaultGate. - * - * For Exclusive Event-Based Gateways - * There MUST be two or more Gates. (Note that this type of Gateway does not act - * only as a Merge--it is always a Decision, at least.) - * - * For Inclusive Gateways - * When two Gates are required, one of them MAY be the DefaultGate. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Gate extends SupportingElement -{ - /** - * Each Gate MUST have an associated (outgoing) Sequence Flow. - * - * For Exclusive Event-Based, Complex, and Parallel Gateways: - * The Sequence Flow MUST have its Condition attribute set to None (there is not an - * evaluation of a condition expression). - * - * For Exclusive Data-Based, and Inclusive Gateways: - * The Sequence Flow MUST have its Condition attribute set to Expression and - * MUST have a valid ConditionExpression. The ConditionExpression MUST be - * unique for all the Gates within the Gateway. If there is only one Gate (i.e., the - * Gateway is acting only as a Merge), then Sequence Flow MUST have its Condition - * set to None. - * - * For DefaultGates: - * The Sequence Flow MUST have its Condition attribute set to Otherwise - */ - SequenceFlow getOutgoingSequenceFlow(); - - /** - * One or more assignment expressions MAY be made for each Gate. The - * Assignment SHALL be performed when the Gate is selected. - */ - List<Assignment> getAssignments(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,75 +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.jboss.bpm.model; - -import java.util.List; - -import org.jboss.bpm.model.Constants.GatewayType; - -//$Id$ - -/** - * Gateways are modeling elements that are used to control how Sequence Flow interact as they converge and diverge within - * a Process. If the flow does not need to be controlled, then a Gateway is not needed. The term “Gateway” implies that - * there is a gating mechanism that either allows or disallows passage through the Gateway--that is, as Tokens arrive at a - * Gateway, they can be merged together on input and/or split apart on output as the Gateway mechanisms are invoked. To - * be more descriptive, a Gateway is actually a collection of “Gates.” - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Gateway extends FlowObject, MultipleInFlowSupport -{ - /** - * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway, - * both for incoming and outgoing Sequence Flow - */ - GatewayType getGatewayType(); - - /** - * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End - * Events for the Process. If there are zero or only one incoming Sequence Flow, then there MUST be at least two Gates. - * - * For Exclusive Data-Based Gateways. - * When two Gates are required, one of them MAY be the DefaultGate. - * - * For Exclusive Event-Based Gateways. - * There MUST be two or more Gates. (Note that this type of Gateway does not act only as a Merge--it is always a Decision, at - * least.) - * - * For Inclusive Gateways. - * When two Gates are required, one of them MAY be the DefaultGate. - */ - List<Gate> getGates(); - - /** - * Get the optional default gate - * @return null if there is none - */ - Gate getDefaultGate(); - - /** - * Get the gate for the given target name - * @return null if there is none - */ - Gate getGateByTargetName(String targetName); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The GatewayBuilder can be used to build a {@link Gateway} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface GatewayBuilder extends ProcessBuilder -{ - GatewayBuilder addDefaultGate(String targetName); - - GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody); - - GatewayBuilder addGate(String targetName); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,42 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.Gateway; + + +//$Id$ + +/** + * The GatewayBuilder can be used to build a {@link Gateway} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface GatewayBuilder extends ProcessBuilder +{ + GatewayBuilder addDefaultGate(String targetName); + + GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody); + + GatewayBuilder addGate(String targetName); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.model; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface GraphicalElement extends BPMNElement -{ -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,43 +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.jboss.bpm.model; - -//$Id$ - -/** - * This Decision represents a branching point where Alternatives are based on conditional expressions contained within - * outgoing Sequence Flow. However, in this case, the True evaluation of one condition expression does not exclude the - * evaluation of other condition expressions. All Sequence Flow with a True evaluation will be traversed by a Token. In - * some sense it’s like a grouping of related independent Binary (Yes/No) Decisions--and can be modeled that way. Since - * each path is independent, all combinations of the paths may be taken, from zero to all. However, it should be - * designed so that at least one path is taken. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface InclusiveGateway extends Gateway -{ - /** - * A Default Gate MAY be specified - */ - Gate getDefaultGate(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,52 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.runtime.MutablePropertySupport; - -/** - * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface InputSet extends SupportingElement, MutablePropertySupport -{ - /** - * Zero or more ArtifactInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. An ArtifactInput is an Artifact, usually a Data - * Object. - */ - List<ArtifactInput> getArtifactInputs(); - - /** - * Zero or more PropertyInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. - */ - List<Property> getProperties(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. - * - * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate - * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, - * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface IntermediateEvent extends Event, SingleInFlowSupport, SingleOutFlowSupport -{ -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Link event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface LinkEventDetail extends EventDetail -{ - /** - * If the Trigger is a Link, then the Name MUST be entered. - */ - String getName(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Manual Task is a Task that is expected to be performed without the aid of any business process execution engine or any - * application. An example of this could be a telephone technician installing a telephone at a customer location. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ManualTask extends Task -{ -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,65 +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.jboss.bpm.model; - - - -//$Id$ - -/** - * A Message, which is used in the definition of attributes for a {@link StartEvent}, - * {@link EndEvent}, {@link IntermediateEvent}, {@link Task}, and {@link MessageFlow} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Message extends SupportingElement, PropertySupport -{ - /** - * Specifies the technology that will be used to send or receive the - * message. - */ - public enum Implementation - { - WebService, Other, Unspecified - } - - /** - * Name is an attribute that is text description of the Message. - */ - String getName(); - - /** - * This defines the source of the Message. - */ - Participant getFromRef(); - - /** - * Get the source of the source {@link FlowObject} for this message - */ - FlowObject getFrom(); - - /** - * This defines the target of the Message. - */ - Participant getToRef(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,75 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.MessageFlow; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.PropertySupport; +import org.jboss.bpm.model.internal.StartEvent; +import org.jboss.bpm.model.internal.SupportingElement; +import org.jboss.bpm.model.internal.Task; + + + +//$Id$ + +/** + * A Message, which is used in the definition of attributes for a {@link StartEvent}, + * {@link EndEvent}, {@link IntermediateEvent}, {@link Task}, and {@link MessageFlow} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Message extends SupportingElement, PropertySupport +{ + /** + * Specifies the technology that will be used to send or receive the + * message. + */ + public enum Implementation + { + WebService, Other, Unspecified + } + + /** + * Name is an attribute that is text description of the Message. + */ + String getName(); + + /** + * This defines the source of the Message. + */ + Participant getFromRef(); + + /** + * Get the source of the source {@link FlowObject} for this message + */ + FlowObject getFrom(); + + /** + * This defines the target of the Message. + */ + Participant getToRef(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,66 +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.jboss.bpm.model; - -import javax.management.ObjectName; - - -//$Id$ - -/** - * A MessageBuilder can be used to build a {@link Message} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MessageBuilder -{ - /** - * Create a {@link Message} with a given name - */ - MessageBuilder newMessage(String msgName); - - /** - * Add a message destination - */ - MessageBuilder addToRef(ObjectName toRef); - - /** - * Add a message source - */ - MessageBuilder addFromRef(ObjectName fromRef); - - /** - * Add a message property - */ - MessageBuilder addProperty(String name, Object value); - - /** - * Add a message property - */ - MessageBuilder addProperty(String name, Object value, boolean isCorrelation); - - /** - * Get the Message - */ - Message getMessage(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,67 @@ +/* + * 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.jboss.bpm.model; + +import javax.management.ObjectName; + + + +//$Id$ + +/** + * A MessageBuilder can be used to build a {@link Message} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MessageBuilder +{ + /** + * Create a {@link Message} with a given name + */ + MessageBuilder newMessage(String msgName); + + /** + * Add a message destination + */ + MessageBuilder addToRef(ObjectName toRef); + + /** + * Add a message source + */ + MessageBuilder addFromRef(ObjectName fromRef); + + /** + * Add a message property + */ + MessageBuilder addProperty(String name, Object value); + + /** + * Add a message property + */ + MessageBuilder addProperty(String name, Object value, boolean isCorrelation); + + /** + * Get the Message + */ + Message getMessage(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link MessageBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class MessageBuilderFactory -{ - /** The bean name - jBPMMessageBuilderFactory */ - public static final String BEAN_NAME = "jBPMMessageBuilderFactory"; - - // Hide the constructor - protected MessageBuilderFactory() - { - } - - /** - * Get a MessageBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static MessageBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (MessageBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link MessageBuilder}. - */ - public abstract MessageBuilder newMessageBuilder(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.model; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.util.KernelLocator; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; + +/** + * A Factory for the {@link MessageBuilder}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class MessageBuilderFactory +{ + /** The bean name - jBPMMessageBuilderFactory */ + public static final String BEAN_NAME = "jBPMMessageBuilderFactory"; + + // Hide the constructor + protected MessageBuilderFactory() + { + } + + /** + * Get a MessageBuilderFactory instance. + */ + @SuppressWarnings("deprecation") + public static MessageBuilderFactory newInstance() + { + // Make sure the engine is bootstrapped + ProcessEngine.locateProcessEngine(); + Kernel kernel = KernelLocator.getKernel(); + KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); + return (MessageBuilderFactory)entry.getTarget(); + } + + /** + * Get a {@link MessageBuilder}. + */ + public abstract MessageBuilder newMessageBuilder(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Message event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface MessageEventDetail extends EventDetail -{ - /** - * If the EventDetailType is a MessageRef, then the a Message MUST be supplied. - */ - Message getMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the - * message. A Web service is the default technology. - */ - Message.Implementation getImplementation(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,42 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to - * send and receive them. In BPMN, two separate Pools in the Diagram will represent the two entities. - * - * Message Flow MUST connect two Pools, either to the Pools themselves or to Flow Objects within the Pools. They cannot - * connect two objects within the same Pool. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MessageFlow extends ConnectingObject -{ - /** - * MessageRef is an optional attribute that identifies the Message that is being sent. - */ - Message getMessageRef(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MultipleInFlowSupport -{ - /** - * Get the list of in flows - */ - List<ConnectingObject> getInFlows(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MultipleOutFlowSupport -{ - /** - * Get the list of out flows - */ - List<ConnectingObject> getOutFlows(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,52 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.runtime.MutablePropertySupport; - -/** - * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface OutputSet extends SupportingElement, MutablePropertySupport -{ - /** - * Zero or more ArtifactOutputs MAY be defined for each OutputSet. For the - * combination of ArtifactOutputs and PropertyOutputs, there MUST be at least one - * item defined for the OutputSet. An ArtifactOutput is an {@link Artifact}, - * usually a {@link DataObject}. - */ - List<ArtifactOutput> getArtifactOutputs(); - - /** - * Zero or more PropertyInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. - */ - List<Property> getProperties(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * Parallel Gateway is required when two or more Activities need to be executed in parallel. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ParallelGateway extends Gateway -{ - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,55 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService - * - * TODO: Add javadoc links for Pool, WebService - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Participant extends SupportingElement -{ - public enum ParticipantType - { - Role, Entity - } - - /** - * Get the type of this participant - */ - ParticipantType getParticipantType(); - - /** - * If the ParticipantType = Role, then a Role MUST be identified. - */ - Role getRoleRef(); - - /** - * If the ParticipantType = Entity, then an Entity MUST be identified. - */ - Entity getEntityRef(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,159 +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.jboss.bpm.model; - -//$Id: MultipleInFlowSupport.java 1627 2008-07-14 15:16:28Z thomas.diesler(a)jboss.com $ - -import java.util.List; - -import javax.management.ObjectName; - -import org.jboss.bpm.runtime.Attachments; - -/** - * A Process is any {@link Activity} performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Process extends SupportingElement, PropertySupport -{ - /** - * Defines the type of a {@link Process} - */ - public enum ProcessType - { - None, Private, Abstract, Collaboration - }; - - /** - * Defines the status a {@link Process} can be in - */ - public enum ProcessStatus - { - None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed - }; - - /** - * Get the unique name. - */ - String getName(); - - /** - * Get the process type - */ - ProcessType getProcessType(); - - /** - * Get the process state - */ - ProcessStatus getProcessStatus(); - - /** - * Get the list of flow objects - */ - List<FlowObject> getFlowObjects(); - - /** - * Get a list of flow objects of a given type. - */ - <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz); - - /** - * Get a flow object by name. - * @return null if not found - */ - FlowObject getFlowObject(String name); - - /** - * One or more Performers MAY be entered. The Performers attribute defines the resource that will be responsible for - * the Process. The Performers entry could be in the form of a specific individual, a group, an organization role or - * position, or an organization. - */ - List<String> getPerformers(); - - /** - * One or more assignment expressions MAY be made for the object. The Assignment SHALL be performed as defined by the - * AssignTime attribute. - */ - List<Assignment> getAssignments(); - - /** - * The InputSets attribute defines the data requirements for input to the Process. Zero or more InputSets MAY be - * defined. Each Input set is sufficient to allow the Process to be performed (if it has first been instantiated by - * the appropriate signal arriving from an incoming Sequence Flow) - */ - List<InputSet> getInputSets(); - - /** - * The OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be - * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the - * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate - * a relationship between an OutputSet and an InputSet that started the Process. - */ - List<OutputSet> getOutputSets(); - - /** - * Get the list of associated {@link Message} objects. - * @return An empty list if there are none - */ - List<Message> getMessages(); - - /** - * Get an associated {@link Message} by name. - * @return null if not found - */ - Message getMessage(String msgName); - - // Not Part of BPMN ======================================================================== - - /** - * Make a deep copy of the process - */ - Process copyProcess(); - - /** - * Start the process - */ - ObjectName startProcess(); - - /** - * Start the process, with a given execution context - */ - ObjectName startProcess(Attachments att); - - /** - * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. - * The Process will be in a running state until all Tokens are consumed. - * - * This method until the process ends without timeout. - */ - void waitForEnd(); - - /** - * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. - * The Process will be in a running state until all Tokens are consumed. - * - * This method until the process ends with a given timeout. - */ - void waitForEnd(long timeout); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,166 @@ +/* + * 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.jboss.bpm.model; + +//$Id$ + +import java.util.List; + +import javax.management.ObjectName; + +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.PropertySupport; +import org.jboss.bpm.model.internal.SupportingElement; +import org.jboss.bpm.runtime.Attachments; + +/** + * A Process is any {@link Activity} performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Process extends SupportingElement, PropertySupport +{ + /** + * Defines the type of a {@link Process} + */ + public enum ProcessType + { + None, Private, Abstract, Collaboration + }; + + /** + * Defines the status a {@link Process} can be in + */ + public enum ProcessStatus + { + None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed + }; + + /** + * Get the unique name. + */ + String getName(); + + /** + * Get the process type + */ + ProcessType getProcessType(); + + /** + * Get the process state + */ + ProcessStatus getProcessStatus(); + + /** + * Get the list of flow objects + */ + List<FlowObject> getFlowObjects(); + + /** + * Get a list of flow objects of a given type. + */ + <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz); + + /** + * Get a flow object by name. + * @return null if not found + */ + FlowObject getFlowObject(String name); + + /** + * One or more Performers MAY be entered. The Performers attribute defines the resource that will be responsible for + * the Process. The Performers entry could be in the form of a specific individual, a group, an organization role or + * position, or an organization. + */ + List<String> getPerformers(); + + /** + * One or more assignment expressions MAY be made for the object. The Assignment SHALL be performed as defined by the + * AssignTime attribute. + */ + List<Assignment> getAssignments(); + + /** + * The InputSets attribute defines the data requirements for input to the Process. Zero or more InputSets MAY be + * defined. Each Input set is sufficient to allow the Process to be performed (if it has first been instantiated by + * the appropriate signal arriving from an incoming Sequence Flow) + */ + List<InputSet> getInputSets(); + + /** + * The OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be + * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the + * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate + * a relationship between an OutputSet and an InputSet that started the Process. + */ + List<OutputSet> getOutputSets(); + + /** + * Get the list of associated {@link Message} objects. + * @return An empty list if there are none + */ + List<Message> getMessages(); + + /** + * Get an associated {@link Message} by name. + * @return null if not found + */ + Message getMessage(String msgName); + + // Not Part of BPMN ======================================================================== + + /** + * Make a deep copy of the process + */ + Process copyProcess(); + + /** + * Start the process + */ + ObjectName startProcess(); + + /** + * Start the process, with a given execution context + */ + ObjectName startProcess(Attachments att); + + /** + * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. + * The Process will be in a running state until all Tokens are consumed. + * + * This method until the process ends without timeout. + */ + void waitForEnd(); + + /** + * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. + * The Process will be in a running state until all Tokens are consumed. + * + * This method until the process ends with a given timeout. + */ + void waitForEnd(long timeout); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,139 +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.jboss.bpm.model; - -import org.jboss.bpm.client.DialectHandler; -import org.jboss.bpm.model.Constants.AssignTime; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.Constants.TaskType; -import org.jboss.bpm.runtime.ExecutionHandler; -import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.SignalHandler; - -//$Id$ - -/** - * The ProcessBuilder can be used to build a {@link Process} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ProcessBuilder -{ - /** - * Add a {@link Process} with a given name - */ - ProcessBuilder addProcess(String name); - - /** - * Add all elements from another {@link Process}. - * This is typically used by a {@link DialectHandler} when processing an include. - */ - ProcessBuilder addProcessElements(Process proc); - - /** - * Get the {@link Process}. - * - * This is the final call to the ProcessBuilder after all elements have been added. - * The {@link Process} is initialized and put in state READY - */ - Process getProcess(); - - /** - * Get the {@link Process} for inclusion in another. - * - * This is the final call to the ProcessBuilder after all elements have been added. - * The {@link Process} is not initialized and put in state READY - */ - Process getProcessForInclude(); - - /** - * Add a {@link SequenceFlow} with a given name - */ - ProcessBuilder addSequenceFlow(String targetName); - - /** - * Add a {@link MessageFlow} with a given name - */ - ProcessBuilder addMessageFlow(String targetName); - - /** - * Add a {@link StartEvent} with a given name - */ - EventBuilder addStartEvent(String name); - - /** - * Add an {@link IntermediateEvent} with a given name - */ - EventBuilder addEvent(String name); - - /** - * Add an {@link EndEvent} with a given name - */ - EventBuilder addEndEvent(String name); - - /** - * Add a {@link Task} of {@link TaskType} NONE with a given name - */ - TaskBuilder addTask(String name); - - /** - * Add a {@link Task} with a given name and type - */ - TaskBuilder addTask(String name, TaskType type); - - /** - * Add an {@link ExclusiveGateway} with a given name - */ - GatewayBuilder addGateway(String name, GatewayType type); - - /** - * Add a {@link Message} with a given name. - */ - MessageBuilder addMessage(String name); - - /** - * Add a process property - */ - ProcessBuilder addProperty(String name, String value); - - /** - * Add an {@link Assignment} to the {@link Process} or the current {@link FlowObject}. - */ - ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); - - /** - * Add an {@link ExecutionHandler} with a given Class - */ - ProcessBuilder addExecutionHandler(Class<?> clazz); - - /** - * Add an {@link FlowHandler} with a given Class - */ - ProcessBuilder addFlowHandler(Class<?> clazz); - - /** - * Add an {@link SignalHandler} with a given Class - */ - ProcessBuilder addSignalHandler(Class<?> clazz); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,140 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.client.DialectHandler; +import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; +import org.jboss.bpm.runtime.ExecutionHandler; +import org.jboss.bpm.runtime.FlowHandler; +import org.jboss.bpm.runtime.SignalHandler; + + +//$Id$ + +/** + * The ProcessBuilder can be used to build a {@link Process} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessBuilder +{ + /** + * Add a {@link Process} with a given name + */ + ProcessBuilder addProcess(String name); + + /** + * Add all elements from another {@link Process}. + * This is typically used by a {@link DialectHandler} when processing an include. + */ + ProcessBuilder addProcessElements(Process proc); + + /** + * Get the {@link Process}. + * + * This is the final call to the ProcessBuilder after all elements have been added. + * The {@link Process} is initialized and put in state READY + */ + Process getProcess(); + + /** + * Get the {@link Process} for inclusion in another. + * + * This is the final call to the ProcessBuilder after all elements have been added. + * The {@link Process} is not initialized and put in state READY + */ + Process getProcessForInclude(); + + /** + * Add a SequenceFlow with a given name + */ + ProcessBuilder addSequenceFlow(String targetName); + + /** + * Add a MessageFlow with a given name + */ + ProcessBuilder addMessageFlow(String targetName); + + /** + * Add a SartEvent with a given name + */ + EventBuilder addStartEvent(String name); + + /** + * Add an IntermediateEvent with a given name + */ + EventBuilder addEvent(String name); + + /** + * Add an EndEvent with a given name + */ + EventBuilder addEndEvent(String name); + + /** + * Add a Task of {@link TaskType} NONE with a given name + */ + TaskBuilder addTask(String name); + + /** + * Add a Task with a given name and type + */ + TaskBuilder addTask(String name, TaskType type); + + /** + * Add a Gateway with a given name + */ + GatewayBuilder addGateway(String name, GatewayType type); + + /** + * Add a {@link Message} with a given name. + */ + MessageBuilder addMessage(String name); + + /** + * Add a process property + */ + ProcessBuilder addProperty(String name, String value); + + /** + * Add an Assignment to the Process or the current FlowObject. + */ + ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); + + /** + * Add an {@link ExecutionHandler} with a given Class + */ + ProcessBuilder addExecutionHandler(Class<?> clazz); + + /** + * Add an {@link FlowHandler} with a given Class + */ + ProcessBuilder addFlowHandler(Class<?> clazz); + + /** + * Add an {@link SignalHandler} with a given Class + */ + ProcessBuilder addSignalHandler(Class<?> clazz); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link ProcessBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class ProcessBuilderFactory -{ - /** The bean name - jBPMProcessBuilderFactory */ - public static final String BEAN_NAME = "jBPMProcessBuilderFactory"; - - // Hide the constructor - protected ProcessBuilderFactory() - { - } - - /** - * Get a ProcessBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static ProcessBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (ProcessBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link ProcessBuilder}. - */ - public abstract ProcessBuilder newProcessBuilder(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.model; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.util.KernelLocator; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; + +/** + * A Factory for the {@link ProcessBuilder}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class ProcessBuilderFactory +{ + /** The bean name - jBPMProcessBuilderFactory */ + public static final String BEAN_NAME = "jBPMProcessBuilderFactory"; + + // Hide the constructor + protected ProcessBuilderFactory() + { + } + + /** + * Get a ProcessBuilderFactory instance. + */ + @SuppressWarnings("deprecation") + public static ProcessBuilderFactory newInstance() + { + // Make sure the engine is bootstrapped + ProcessEngine.locateProcessEngine(); + Kernel kernel = KernelLocator.getKernel(); + KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); + return (ProcessBuilderFactory)entry.getTarget(); + } + + /** + * Get a {@link ProcessBuilder}. + */ + public abstract ProcessBuilder newProcessBuilder(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,73 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Property, which is used in the definition of attributes for a Process and common activity attributes - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Property extends SupportingElement -{ - /** - * Supported property types - */ - public enum PropertyType - { - String, Object - } - - /** - * Each Property has a Name (e.g., name=”Customer Name”). - */ - String getName(); - - /** - * Each Property has a Type (e.g., type=”String”). Properties may be defined - * hierarchically. - */ - PropertyType getPropertyType(); - - /** - * Each Property MAY have a value expression specified. - */ - Expression getExpression(); - - /** - * Get the body of the expression value. - */ - String getValue(); - - /** - * Get the body of the expression value. - */ - <T> T getValue(Class<T> T); - - /** - * If the Correlation attribute is set to True, then the Property is marked to be used for - * correlation (e.g., for incoming Messages). - */ - boolean isCorrelation(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,76 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.SupportingElement; + +//$Id$ + +/** + * A Property, which is used in the definition of attributes for a Process and common activity attributes + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Property extends SupportingElement +{ + /** + * Supported property types + */ + public enum PropertyType + { + String, Object + } + + /** + * Each Property has a Name (e.g., name=”Customer Name”). + */ + String getName(); + + /** + * Each Property has a Type (e.g., type=”String”). Properties may be defined + * hierarchically. + */ + PropertyType getPropertyType(); + + /** + * Each Property MAY have a value expression specified. + */ + Expression getExpression(); + + /** + * Get the body of the expression value. + */ + String getValue(); + + /** + * Get the body of the expression value. + */ + <T> T getValue(Class<T> T); + + /** + * If the Correlation attribute is set to True, then the Property is marked to be used for + * correlation (e.g., for incoming Messages). + */ + boolean isCorrelation(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * A PropertyBuilder can be used to build a {@link Property} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface PropertyBuilder -{ - /** - * Create a {@link Property} with a given name and value - */ - Property newProperty(String name, Object value); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link PropertyBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class PropertyBuilderFactory -{ - /** The bean name - jBPMMessageBuilderFactory */ - public static final String BEAN_NAME = "jBPMPropertyBuilderFactory"; - - // Hide the constructor - protected PropertyBuilderFactory() - { - } - - /** - * Get a MessageBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static PropertyBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (PropertyBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link PropertyBuilder}. - */ - public abstract PropertyBuilder newPropertyBuilder(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,55 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -/** - * Property support - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface PropertySupport -{ - /** - * Get a Property with a given name. - */ - Property getProperty(String name); - - /** - * Get a Property value with a given name. - */ - String getPropertyValue(String name); - - /** - * Multiple Properties MAY entered for the Message. - */ - List<Property> getProperties(); - - /** - * Get the list of property names - */ - List<String> getPropertyNames(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,58 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A Receive Task is a simple Task that is designed to wait for a message to arrive from an external participant - * (relative to the Business Process). Once the message has been received, the Task is completed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ReceiveTask extends Task -{ - /** - * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be received by the - * Task. The Message in this context is equivalent to an in-only message pattern (Web service). One or more - * corresponding incoming Message Flows MAY be shown on the diagram. However, the display of the Message Flow is not - * required. The Message is applied to all incoming Message Flow, but can arrive for only one of the incoming Message - * Flow for a single instance of the Task. - */ - Message getMessageRef(); - - /** - * Receive Tasks can be defined as the instantiation mechanism for the Process with the Instantiate attribute. This - * attribute MAY be set to true if the Task is the first activity after the Start Event or a starting Task if there is - * no Start Event (i.e., there are no incoming Sequence Flow). Multiple Tasks MAY have this attribute set to True. - */ - boolean isInstantiate(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the - * default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model; - -//$Id$ - -/** - * There may be times where a modeler may want to reference another activity that has been defined. If the two (or more) - * activities share the exact same behavior, then by one referencing the other, the attributes that define the behavior only - * have to be created once and maintained in only one location. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ReferenceTask extends Task -{ - /** - * The Task being referenced MUST be identified. - */ - Task getTaskRef(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Role, which is used in the definition of attributes for a {@link Participant} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Role extends SupportingElement -{ - /** - * Name is an attribute that is text description of the Role. - */ - String getName(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,41 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Script Task is executed by a business process engine. The modeler or implementer defines a script in a language that - * the engine can interpret. When the Task is ready to start, the engine will execute the script. When the script is completed, - * the Task will also be completed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ScriptTask extends Task -{ - /** - * The modeler MAY include a script that can be run when the Task is performed. If - * a script is not included, then the Task will act equivalent to a TaskType of None. - */ - String getScript(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,49 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - - -//$Id$ - -/** - * A Send Task. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SendTask extends Task -{ - /** - * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be sent by the Task. The Message in this context is equivalent to an - * out-only message pattern (Web service). One or more corresponding outgoing Message Flow MAY be shown on the diagram. However, the display of the Message Flow is - * not required. The Message is applied to all outgoing Message Flow and the Message will be sent down all outgoing Message Flow at the completion of a single - * instance of the Task. - */ - Message getMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,71 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Sequence Flow is used to show the order that activities will be performed in a Process. Each Flow has only one - * source and only one target. The source and target must be from the set of the following Flow Objects: Events (Start, - * Intermediate, and End), Activities (Task and Sub-Process), and Gateways. During performance (or simulation) of the - * process, a Token will leave the source Flow Object, traverse down the Sequence Flow, and enter the target Flow - * Object. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SequenceFlow extends ConnectingObject -{ - /** - * The ConditionType - */ - public enum ConditionType - { - None, Expression, Default - } - - /** - * By default, the ConditionType of a Sequence Flow is None. This means that there is no evaluation at runtime to - * determine whether or not the Sequence Flow will be used. Once a Token is ready to traverse the Sequence Flow (i.e., - * the Source is an activity that has completed), then the Token will do so. The normal, uncontrolled use of Sequence - * Flow, in a sequence of activities, will have a None ConditionType. A None ConditionType MUST NOT be used if the - * Source of the Sequence Flow is an Exclusive Data-Based or Inclusive Gateway. The ConditionType attribute MAY be set - * to Expression if the Source of the Sequence Flow is a Task, a Sub-Process, or a Gateway of type Exclusive-Data- - * Based or Inclusive. If the ConditionType attribute is set to Expression, then a condition marker SHALL be added to - * the line if the Sequence Flow is outgoing from an activity. However, a condition indicator MUST NOT be added to the - * line if the Sequence Flow is outgoing from a Gateway. An Expression ConditionType MUST NOT be used if the Source of - * the Sequence Flow is an Event-Based Exclusive Gateway, a Complex Gateway, a Parallel Gateway, a Start Event, or an - * Intermediate Event. In addition, an Expression ConditionType MUST NOT be used if the Sequence Flow is associated - * with the Default Gate of a Gateway. The ConditionType attribute MAY be set to Default only if the Source of the - * Sequence Flow is an activity or an Exclusive Data-Based Gateway. - */ - ConditionType getConditionType(); - - /** - * If the ConditionType attribute is set to Expression, then the ConditionExpression attribute MUST be defined as a - * valid expression. The expression will be evaluated at runtime. If the result of the evaluation is TRUE, then a - * Token will be generated and will traverse the Sequence--Subject to any constraints imposed by a Source that is a - * Gateway. - */ - Expression getConditionExpression(); - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,63 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A Service Task. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ServiceTask extends Task -{ - /** - * A Message for the InMessageRef attribute MUST be entered. This indicates - * that the Message will be received at the start of the Task, after the - * availability of any defined InputSets. One or more corresponding incoming - * Message Flows MAY be shown on the diagram. However, the display of the - * Message Flow is not required. The Message is applied to all incoming - * Message Flow, but can arrive for only one of the incoming Message Flow - * for a single instance of the Task. - */ - Message getInMessageRef(); - - /** - * A Message for the OutMessageRef attribute MUST be entered. The sending - * of this message marks the completion of the Task, which may cause the - * production of an OutputSet. One or more corresponding outgoing Message - * Flow MAY be shown on the diagram. However, the display of the Message - * Flow is not required. The Message is applied to all outgoing Message Flow - * and the Message will be sent down all outgoing Message Flow at the - * completion of a single instance of the Task. - */ - Message getOutMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the - * message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,100 +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.jboss.bpm.model; - -import java.io.Serializable; - -//$Id$ - -/** - * A Signal thrown by the ProcessEngine - * - * @author Thomas.Diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public class Signal implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** - * Defines the types of supported Signals - */ - public enum SignalType - { - SYSTEM_START_EVENT_ENTER, SYSTEM_START_EVENT_EXIT, SYSTEM_START_TRIGGER, - SYSTEM_EVENT_ENTER, SYSTEM_EVENT_EXIT, SYSTEM_EVENT_TRIGGER, - SYSTEM_END_EVENT_ENTER, SYSTEM_END_EVENT_EXIT, SYSTEM_END_TRIGGER, - SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT, - SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT, - SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT, - SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER, - USER_SIGNAL - } - - private SignalType type; - private String message; - private String fromRef; - - /** Create the signal for a given process */ - public Signal(String fromRef, SignalType type) - { - this.fromRef = fromRef; - this.type = type; - if (fromRef == null) - throw new IllegalArgumentException("Signal fromRef cannot be null"); - if (type == null) - throw new IllegalArgumentException("SignalType cannot be null"); - } - - /** Create the signal for a given process */ - public Signal(String fromRef, SignalType type, String message) - { - this(fromRef, type); - this.message = message; - } - - public String getFromRef() - { - return fromRef; - } - - public SignalType getSignalType() - { - return type; - } - - public String getMessage() - { - return message; - } - - public String toString() - { - StringBuilder string = new StringBuilder(type + "[" + fromRef); - if (message != null) - { - string.append(":" + message); - } - string.append("]"); - return string.toString(); - } -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,100 @@ +/* + * 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.jboss.bpm.model; + +import java.io.Serializable; + +//$Id$ + +/** + * A Signal thrown by the ProcessEngine + * + * @author Thomas.Diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public class Signal implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** + * Defines the types of supported Signals + */ + public enum SignalType + { + SYSTEM_START_EVENT_ENTER, SYSTEM_START_EVENT_EXIT, SYSTEM_START_TRIGGER, + SYSTEM_EVENT_ENTER, SYSTEM_EVENT_EXIT, SYSTEM_EVENT_TRIGGER, + SYSTEM_END_EVENT_ENTER, SYSTEM_END_EVENT_EXIT, SYSTEM_END_TRIGGER, + SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT, + SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT, + SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT, + SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER, + USER_SIGNAL + } + + private SignalType type; + private String message; + private String fromRef; + + /** Create the signal for a given process */ + public Signal(String fromRef, SignalType type) + { + this.fromRef = fromRef; + this.type = type; + if (fromRef == null) + throw new IllegalArgumentException("Signal fromRef cannot be null"); + if (type == null) + throw new IllegalArgumentException("SignalType cannot be null"); + } + + /** Create the signal for a given process */ + public Signal(String fromRef, SignalType type, String message) + { + this(fromRef, type); + this.message = message; + } + + public String getFromRef() + { + return fromRef; + } + + public SignalType getSignalType() + { + return type; + } + + public String getMessage() + { + return message; + } + + public String toString() + { + StringBuilder string = new StringBuilder(type + "[" + fromRef); + if (message != null) + { + string.append(":" + message); + } + string.append("]"); + return string.toString(); + } +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Signal event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface SignalEventDetail extends EventDetail -{ - /** - * If the Trigger is a Signal, then a Signal Shall be entered. - */ - Signal getSignalRef(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SingleInFlowSupport -{ - /** - * Get the out flow - */ - ConnectingObject getInFlow(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model; - - -//$Id$ - -/** - * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SingleOutFlowSupport -{ - /** - * Get the out flow - */ - SequenceFlow getOutFlow(); -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts - * the Flow of the Process, and thus, will not have any incoming Sequence Flow. A Start Event can have a Trigger that - * indicates how the Process starts: Message, Timer, Rule, Link, or Multiple. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface StartEvent extends Event, SingleOutFlowSupport -{ - /** - * Trigger is an attribute that defines the type of trigger expected for a Start Event. Of the set of - * EventDetailTypes, only four (4) can be applied to a Start Event: Message, Timer, Conditional, and Signal. If there - * is no EventDetail defined, then this is considered a None Start Event and the Event will not have an internal - * marker. If there is more than one EventDetail defined, this is considered a Multiple Start Event - * and the Event will have the pentagon internal marker. - */ - List<EventDetail> getTrigger(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model; - - -//$Id$ - -/** - * A Sub-Process is Process that is included within another Process. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SubProcess extends Activity, SingleInFlowSupport, SingleOutFlowSupport -{ -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.model; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SupportingElement extends BPMNElement -{ -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,49 +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.jboss.bpm.model; - - - -//$Id$ - -/** - * A Task is an Atomic Activity that is included within a Process. - * - * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to - * perform the Task when it is executed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport -{ - /** - * TaskType is an attribute that has a default of None, but MAY be set to Send, - * Receive, User, Script, Manual, Reference, or Service. The TaskType will be - * impacted by the Message Flow to and/or from the Task, if Message Flow are - * used. A TaskType of Receive MUST NOT have an outgoing Message Flow. A - * TaskType of Send MUST NOT have an incoming Message Flow. A TaskType of - * Script or Manual MUST NOT have an incoming or an outgoing Message Flow. - * The TaskType list MAY be extended to include new types. - */ - Constants.TaskType getTaskType(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - - -/** - * The TaskBuilder can be used to build a {@link Task} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface TaskBuilder extends ActivityBuilder -{ - TaskBuilder addMessageRef(String msgName); - - TaskBuilder addExecutionHandler(Class<?> clazz); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.ActivityBuilder; +import org.jboss.bpm.model.internal.Task; + +//$Id$ + + +/** + * The TaskBuilder can be used to build a {@link Task} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface TaskBuilder extends ActivityBuilder +{ + TaskBuilder addMessageRef(String msgName); + + TaskBuilder addExecutionHandler(Class<?> clazz); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Terminate event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TerminateEventDetail extends EventDetail -{ - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,37 +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.jboss.bpm.model; - -//$Id$ - - -/** - * The TimeDateExpression supporting element is a sub-type of the Expression Element (Expression on page 273) and uses all - * the attributes of the {@link Expression} Element. - * - * @author Thomas.Diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TimeDateExpression extends Expression -{ - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Timer event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TimerEventDetail extends EventDetail -{ - /** - * If the Trigger is a Timer, then a TimeDate MAY be entered. If a TimeDate is not - * entered, then a TimeCycle MUST be entered - */ - TimeDateExpression getTimeDate(); - - /** - * If the Trigger is a Timer, then a TimeCycle MAY be entered. If a TimeCycle is - * not entered, then a TimeDate MUST be entered - */ - TimeDateExpression getTimeCycle(); - -} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,63 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A User Task is a typical “workflow” task where a human performer performs the Task with the assistance of a software - * application and is scheduled through a task list manager of some sort. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface UserTask extends Task -{ - /** - * A Message for the InMessageRef attribute MUST be entered. This indicates - * that the Message will be received at the start of the Task, after the - * availability of any defined InputSets. One or more corresponding incoming - * Message Flows MAY be shown on the diagram. However, the display of the - * Message Flow is not required. The Message is applied to all incoming - * Message Flow, but can arrive for only one of the incoming Message Flow - * for a single instance of the Task. - */ - Message getInMessageRef(); - - /** - * A Message for the OutMessageRef attribute MUST be entered. The sending - * of this message marks the completion of the Task, which may cause the - * production of an OutputSet. One or more corresponding outgoing Message - * Flow MAY be shown on the diagram. However, the display of the Message - * Flow is not required. The Message is applied to all outgoing Message Flow - * and the Message will be sent down all outgoing Message Flow at the - * completion of a single instance of the Task. - */ - Message getOutMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal) Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,114 +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.jboss.bpm.model.internal; - -import java.util.List; - -import org.jboss.bpm.model.Process; - -//$Id$ - -/** - * An activity is a generic term for work that a company or organization performs via business processes. An activity can be atomic or non-atomic (compound). The types - * of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Activity extends FlowObject, PropertySupport -{ - /** - * The ActivityType MUST be of type Task or Sub-Process. - */ - enum ActivityType - { - Task, SubProcess - } - - /** - * The Activity LoopType - */ - enum LoopType - { - None, Standard, MultiInstance - } - - /** - * The ActivityType MUST be of type Task or Sub-Process. - */ - ActivityType getActivityType(); - - /** - * One or more Performers MAY be entered. The Performer attribute defines the - * resource that will perform or will be responsible for the activity. The Performer - * entry could be in the form of a specific individual, a group, an organization role - * or position, or an organization. - */ - List<String> getPerformers(); - - /** - * The InputSets attribute defines the data requirements for input to the Activity. - * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the - * Activity to be performed (if it has first been instantiated by the appropriate signal - * arriving from an incoming Sequence Flow) - */ - List<InputSet> getInputSets(); - - /** - * The OutputSets attribute defines the data requirements for output from the - * activity. Zero or more OutputSets MAY be defined. At the completion of the - * activity, only one of the OutputSets may be produced--It is up to the - * implementation of the activity to determine which set will be produced. However, - * the IORules attribute MAY indicate a relationship between an OutputSet and an - * InputSet that started the activity. - */ - List<OutputSet> getOutputSets(); - - /** - * The IORules attribute is a collection of expressions, each of which specifies the - * required relationship between one input and one output. That is, if the activity is - * instantiated with a specified input, that activity shall complete with the specified - * output. - */ - List<Expression> getIORules(); - - /** - * The default value is 1. The value MUST NOT be less than 1. This attribute - * defines the number of Tokens that must arrive before the activity can begin. - */ - int getStartQuantity(); - - /** - * The default value is 1. The value MUST NOT be less than 1. This attribute - * defines the number of Tokens that must be generated from the activity. This - * number of Tokens will be sent down any outgoing Sequence Flow (assuming any - * Sequence Flow Conditions are satisfied). - */ - int getCompletionQuantity(); - - /** - * LoopType is an attribute and is by default None, but MAY be set to Standard or - * MultiInstance. A Task of type Receive that has its Instantiate attribute set to True MUST NOT - * have a Standard or MultiInstance LoopType. - */ - LoopType getLoopType(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,114 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Process; + +//$Id$ + +/** + * An activity is a generic term for work that a company or organization performs via business processes. An activity can be atomic or non-atomic (compound). The types + * of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Activity extends FlowObject, PropertySupport +{ + /** + * The ActivityType MUST be of type Task or Sub-Process. + */ + enum ActivityType + { + Task, SubProcess + } + + /** + * The Activity LoopType + */ + enum LoopType + { + None, Standard, MultiInstance + } + + /** + * The ActivityType MUST be of type Task or Sub-Process. + */ + ActivityType getActivityType(); + + /** + * One or more Performers MAY be entered. The Performer attribute defines the + * resource that will perform or will be responsible for the activity. The Performer + * entry could be in the form of a specific individual, a group, an organization role + * or position, or an organization. + */ + List<String> getPerformers(); + + /** + * The InputSets attribute defines the data requirements for input to the Activity. + * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the + * Activity to be performed (if it has first been instantiated by the appropriate signal + * arriving from an incoming Sequence Flow) + */ + List<InputSet> getInputSets(); + + /** + * The OutputSets attribute defines the data requirements for output from the + * activity. Zero or more OutputSets MAY be defined. At the completion of the + * activity, only one of the OutputSets may be produced--It is up to the + * implementation of the activity to determine which set will be produced. However, + * the IORules attribute MAY indicate a relationship between an OutputSet and an + * InputSet that started the activity. + */ + List<OutputSet> getOutputSets(); + + /** + * The IORules attribute is a collection of expressions, each of which specifies the + * required relationship between one input and one output. That is, if the activity is + * instantiated with a specified input, that activity shall complete with the specified + * output. + */ + List<Expression> getIORules(); + + /** + * The default value is 1. The value MUST NOT be less than 1. This attribute + * defines the number of Tokens that must arrive before the activity can begin. + */ + int getStartQuantity(); + + /** + * The default value is 1. The value MUST NOT be less than 1. This attribute + * defines the number of Tokens that must be generated from the activity. This + * number of Tokens will be sent down any outgoing Sequence Flow (assuming any + * Sequence Flow Conditions are satisfied). + */ + int getCompletionQuantity(); + + /** + * LoopType is an attribute and is by default None, but MAY be set to Standard or + * MultiInstance. A Task of type Receive that has its Instantiate attribute set to True MUST NOT + * have a Standard or MultiInstance LoopType. + */ + LoopType getLoopType(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,68 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Constants; -import org.jboss.bpm.model.ProcessBuilder; -import org.jboss.bpm.model.Property; - - -//$Id$ - -/** - * The ActivityBuilder can be used to build an {@link Activity} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ActivityBuilder extends ProcessBuilder -{ - /** - * Add an {@link InputSet} - */ - ActivityBuilder addInputSet(); - - /** - * Add an {@link Property} Input - */ - ActivityBuilder addPropertyInput(String name, String value); - - /** - * Add an {@link OutputSet} - */ - ActivityBuilder addOutputSet(); - - /** - * Add an {@link Property} Output - */ - ActivityBuilder addPropertyOutput(String name, String value); - - /** - * Add an IORule {@link Expression} - */ - ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang); - - /** - * Add an activity property - */ - ActivityBuilder addProperty(String name, String value); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,68 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Constants; +import org.jboss.bpm.model.ProcessBuilder; +import org.jboss.bpm.model.Property; + + +//$Id$ + +/** + * The ActivityBuilder can be used to build an {@link Activity} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ActivityBuilder extends ProcessBuilder +{ + /** + * Add an {@link InputSet} + */ + ActivityBuilder addInputSet(); + + /** + * Add an {@link Property} Input + */ + ActivityBuilder addPropertyInput(String name, String value); + + /** + * Add an {@link OutputSet} + */ + ActivityBuilder addOutputSet(); + + /** + * Add an {@link Property} Output + */ + ActivityBuilder addPropertyOutput(String name, String value); + + /** + * Add an IORule {@link Expression} + */ + ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang); + + /** + * Add an activity property + */ + ActivityBuilder addProperty(String name, String value); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,48 +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.jboss.bpm.model.internal; - -//$Id$ - - -/** - * An ArtifactInput, which is used in the definition of attributes for InputSet - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Artifact extends GraphicalElement -{ - /** - * Defines the type of an {@link Artifact} - */ - enum ArtifactType - { - DataObject, Group, Annotation - }; - - /** - * The ArtifactType MAY be set to DataObject, Group, or Annotation. - * The ArtifactType list MAY be extended to include new types. - */ - ArtifactType getArtifactType(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,48 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * An ArtifactInput, which is used in the definition of attributes for InputSet + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Artifact extends GraphicalElement +{ + /** + * Defines the type of an {@link Artifact} + */ + enum ArtifactType + { + DataObject, Group, Annotation + }; + + /** + * The ArtifactType MAY be set to DataObject, Group, or Annotation. + * The ArtifactType list MAY be extended to include new types. + */ + ArtifactType getArtifactType(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model.internal; - -//$Id$ - - -/** - * An ArtifactInput, which is used in the definition of attributes for {@link InputSet} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ArtifactInput extends Artifact -{ - /** - * This attribute identifies an Artifact that will be used as an input to an activity. The - * identified Artifact will be part of an InputSet for an activity. - */ - Artifact getArtifactRef(); - - /** - * The default value for this attribute is True. This means that the Input is required for - * an activity to start. If set to False, then the activity MAY start within the input if it - * is available, but MAY accept the input (more than once) after the activity has - * started. An InputSet may have a some of ArtifactInputs that have this attribute set - * to True and some that are set to False. - */ - boolean isRequireForStart(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * An ArtifactInput, which is used in the definition of attributes for {@link InputSet} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ArtifactInput extends Artifact +{ + /** + * This attribute identifies an Artifact that will be used as an input to an activity. The + * identified Artifact will be part of an InputSet for an activity. + */ + Artifact getArtifactRef(); + + /** + * The default value for this attribute is True. This means that the Input is required for + * an activity to start. If set to False, then the activity MAY start within the input if it + * is available, but MAY accept the input (more than once) after the activity has + * started. An InputSet may have a some of ArtifactInputs that have this attribute set + * to True and some that are set to False. + */ + boolean isRequireForStart(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model.internal; - -//$Id$ - - -/** - * An ArtifactOutput, which is used in the definition of attributes for {@link OutputSet} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ArtifactOutput extends Artifact -{ - /** - * This attribute identifies an Artifact that will be used as an output to an activity. The - * identified Artifact will be part of an OutputSet for an activity. - */ - Artifact getArtifactRef(); - - /** - * The default value for this attribute is True. This means that the Output will be - * produced when an activity has been completed. If set to False, then the activity - * MAY produce the output (more than once) before it has completed. An OutputSet - * may have a some of ArtifactOutputs that have this attribute set to True and some that - * are set to False. - */ - boolean isProduceAtCompletion(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * An ArtifactOutput, which is used in the definition of attributes for {@link OutputSet} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ArtifactOutput extends Artifact +{ + /** + * This attribute identifies an Artifact that will be used as an output to an activity. The + * identified Artifact will be part of an OutputSet for an activity. + */ + Artifact getArtifactRef(); + + /** + * The default value for this attribute is True. This means that the Output will be + * produced when an activity has been completed. If set to False, then the activity + * MAY produce the output (more than once) before it has completed. An OutputSet + * may have a some of ArtifactOutputs that have this attribute set to True and some that + * are set to False. + */ + boolean isProduceAtCompletion(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.Constants.AssignTime; - -//$Id$ - -/** - * An Assignment, which is used in the definition of attributes for {@link Process}, - * {@link Activity}, {@link Event}, {@link Gateway}, and {@link Gate}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Assignment extends SupportingElement -{ - /** - * The target for the Assignment MUST be a Property of the Process or the activity - * itself. - */ - Property getTo(); - - /** - * The Expression MUST be made up of a combination of Values, Properties, and - * Attributes, which are separated by operators such as add or multiply. The expression - * language is defined in the ExpressionLanguage attribute of the Business Process - * Diagram - */ - Expression getFrom(); - - /** - * An Assignment MAY have a AssignTime setting. If the Object is an activity (Task, - * Sub-Process, or Process), then the Assignment MUST have an AssignTime. - * A value of Start means that the assignment SHALL occur at the start of the activity. - * This can be used to assign the higher-level (global) Properties of the Process to the - * (local) Properties of the activity as an input to the activity. - * A value of End means that the assignment SHALL occur at the end of the activity. - * This can be used to assign the (local) Properties of the activity to the higher-level - * (global) Properties of the Process as an output to the activity. - */ - AssignTime getAssignTime(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Process; +import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.Constants.AssignTime; + +//$Id$ + +/** + * An Assignment, which is used in the definition of attributes for {@link Process}, + * {@link Activity}, {@link Event}, {@link Gateway}, and {@link Gate}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Assignment extends SupportingElement +{ + /** + * The target for the Assignment MUST be a Property of the Process or the activity + * itself. + */ + Property getTo(); + + /** + * The Expression MUST be made up of a combination of Values, Properties, and + * Attributes, which are separated by operators such as add or multiply. The expression + * language is defined in the ExpressionLanguage attribute of the Business Process + * Diagram + */ + Expression getFrom(); + + /** + * An Assignment MAY have a AssignTime setting. If the Object is an activity (Task, + * Sub-Process, or Process), then the Assignment MUST have an AssignTime. + * A value of Start means that the assignment SHALL occur at the start of the activity. + * This can be used to assign the higher-level (global) Properties of the Process to the + * (local) Properties of the activity as an input to the activity. + * A value of End means that the assignment SHALL occur at the end of the activity. + * This can be used to assign the (local) Properties of the activity to the higher-level + * (global) Properties of the Process as an output to the activity. + */ + AssignTime getAssignTime(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model.internal; - -//$Id$ - -import java.io.Serializable; - -import javax.management.ObjectName; - -/** - * The parrent of all BPMN elements - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface BPMNElement extends Serializable -{ - public static final String ID_DOMAIN = "jboss.bpm"; - - /** - * Get the ID of this element - */ - ObjectName getID(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.io.Serializable; + +import javax.management.ObjectName; + +/** + * The parrent of all BPMN elements + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface BPMNElement extends Serializable +{ + public static final String ID_DOMAIN = "jboss.bpm"; + + /** + * Get the ID of this element + */ + ObjectName getID(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Cancel event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface CancelEventDetail extends EventDetail -{ - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Cancel event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface CancelEventDetail extends EventDetail +{ + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Compensate event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface CompensateEventDetail extends EventDetail -{ - /** - * For an End Event: - * - * If the Result is a Compensation, then the Activity that needs to be compensated MAY be supplied. - * If an Activity is not supplied, then the Event broadcast to all completed activities in the Process Instance. - * - * For an Intermediate Event within Normal Flow: If the Trigger is a Compensation, then the Activity that needs - * to be compensated MAY be supplied. If an Activity is not supplied, then the Event broadcast to all completed - * activities in the Process Instance. This “throws” the compensation. - * - * For an Intermediate Event attached to the boundary of an Activity: This Event “catches” the compensation. - * No further information is required. The Activity the Event is attached to will provide the Id necessary - * to match the compensation event with the event that “threw” the compensation or the compensation will be a - * broadcast. - */ - Activity getActivityRef(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Compensate event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface CompensateEventDetail extends EventDetail +{ + /** + * For an End Event: + * + * If the Result is a Compensation, then the Activity that needs to be compensated MAY be supplied. + * If an Activity is not supplied, then the Event broadcast to all completed activities in the Process Instance. + * + * For an Intermediate Event within Normal Flow: If the Trigger is a Compensation, then the Activity that needs + * to be compensated MAY be supplied. If an Activity is not supplied, then the Event broadcast to all completed + * activities in the Process Instance. This “throws” the compensation. + * + * For an Intermediate Event attached to the boundary of an Activity: This Event “catches” the compensation. + * No further information is required. The Activity the Event is attached to will provide the Id necessary + * to match the compensation event with the event that “threw” the compensation or the compensation will be a + * broadcast. + */ + Activity getActivityRef(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model.internal; - -// $Id$ - -/** - * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex - * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers - * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ComplexGateway extends Gateway -{ - /** - * If there are multiple incoming Sequence Flow, an IncomingCondition expression - * MUST be set by the modeler. This will consist of an expression that can reference - * Sequence Flow names and/or Process Properties (Data). - */ - Expression getIncommingCondition(); - - /** - * If there are multiple outgoing Sequence Flow, an OutgoingCondition expression - * MUST be set by the modeler. This will consist of an expression that can reference - * (outgoing) Sequence Flow Ids and/or Process Properties (Data). - */ - Expression getOutgoingCondition(); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +// $Id$ + +/** + * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex + * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers + * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ComplexGateway extends Gateway +{ + /** + * If there are multiple incoming Sequence Flow, an IncomingCondition expression + * MUST be set by the modeler. This will consist of an expression that can reference + * Sequence Flow names and/or Process Properties (Data). + */ + Expression getIncommingCondition(); + + /** + * If there are multiple outgoing Sequence Flow, an OutgoingCondition expression + * MUST be set by the modeler. This will consist of an expression that can reference + * (outgoing) Sequence Flow Ids and/or Process Properties (Data). + */ + Expression getOutgoingCondition(); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,48 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * A Condition, which is used in the definition of attributes for Start Event and - * Intermediate Event - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Condition extends SupportingElement -{ - /** - * Name is an optional attribute that is text description of the Condition. If a Name is - * not entered, then a ConditionExpression MUST be entered - */ - String getName(); - - /** - * A ConditionExpression MAY be entered. In some cases the Condition itself will be - * stored and maintained in a separate application (e.g., a Rules Engine). If a ConditionExpression - * is not entered, then a Name MUST be entered - */ - Expression getConditionExpression(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,48 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Condition, which is used in the definition of attributes for Start Event and + * Intermediate Event + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Condition extends SupportingElement +{ + /** + * Name is an optional attribute that is text description of the Condition. If a Name is + * not entered, then a ConditionExpression MUST be entered + */ + String getName(); + + /** + * A ConditionExpression MAY be entered. In some cases the Condition itself will be + * stored and maintained in a separate application (e.g., a Rules Engine). If a ConditionExpression + * is not entered, then a Name MUST be entered + */ + Expression getConditionExpression(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Conditional event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ConditionalEventDetail extends EventDetail -{ - /** - * If the Trigger is Conditional, then a Condition MUST be entered. - */ - Condition getConditionRef(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Conditional event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ConditionalEventDetail extends EventDetail +{ + /** + * If the Trigger is Conditional, then a Condition MUST be entered. + */ + Condition getConditionRef(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,59 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence - * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model, - * although they both affect the performance of activities within a Process. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ConnectingObject extends GraphicalElement -{ - /** - * Name is an optional attribute that is text description of the Connecting Object. - */ - String getName(); - - /** - * SourceRef is an attribute that identifies which Graphical Element the Connecting - * Object is connected from. Note: there are restrictions as to what objects Sequence - * Flow and Message Flow can connect. - */ - FlowObject getSourceRef(); - - /** - * TargetRef is an attribute that identifies which Graphical Element the Connecting - * Object is connected to. Note: there are restrictions as to what objects Sequence - * Flow and Message Flow can connect. - */ - FlowObject getTargetRef(); - - /** - * Get the required target name - */ - String getTargetName(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,59 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence + * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model, + * although they both affect the performance of activities within a Process. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ConnectingObject extends GraphicalElement +{ + /** + * Name is an optional attribute that is text description of the Connecting Object. + */ + String getName(); + + /** + * SourceRef is an attribute that identifies which Graphical Element the Connecting + * Object is connected from. Note: there are restrictions as to what objects Sequence + * Flow and Message Flow can connect. + */ + FlowObject getSourceRef(); + + /** + * TargetRef is an attribute that identifies which Graphical Element the Connecting + * Object is connected to. Note: there are restrictions as to what objects Sequence + * Flow and Message Flow can connect. + */ + FlowObject getTargetRef(); + + /** + * Get the required target name + */ + String getTargetName(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,56 +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.jboss.bpm.model.internal; - -import java.util.List; - -import org.jboss.bpm.model.Property; - -//$Id$ - - -/** - * DataObject, which extends common Artifact - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface DataObject extends Artifact -{ - /** - * Name is an attribute that is text description of the object. - */ - String getName(); - - /** - * State is an optional attribute that indicates the impact the Process has had on the Data - * Object. Multiple Data Objects with the same name MAY share the same state within one Process. - */ - String getState(); - - /** - * Modeler-defined Properties MAY be added to a Data Object. The fully delineated name of these - * properties are “<process name>.<task name>.<property name>” - * (e.g., “Add Customer.Review Credit Report.Score”). - */ - List<Property> getProperties(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,56 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Property; + +//$Id$ + + +/** + * DataObject, which extends common Artifact + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface DataObject extends Artifact +{ + /** + * Name is an attribute that is text description of the object. + */ + String getName(); + + /** + * State is an optional attribute that indicates the impact the Process has had on the Data + * Object. Multiple Data Objects with the same name MAY share the same state within one Process. + */ + String getState(); + + /** + * Modeler-defined Properties MAY be added to a Data Object. The fully delineated name of these + * properties are “<process name>.<task name>.<property name>” + * (e.g., “Add Customer.Review Credit Report.Score”). + */ + List<Property> getProperties(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model.internal; - -//$Id$ - -import java.util.List; - -/** - * As the name implies, the End Event indicates where a Process will end. - * - * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. - * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape. - * End Event Results are Message, Error, Compensation, Link, and Multiple. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EndEvent extends Event, SingleInFlowSupport -{ - /** - * Result defines the type of result expected for an End Event. - * Of the set of EventDetailTypes only six can be applied to an - * End Event: Message, Error, Cancel, Compensation, Signal, and Terminate. - * - * If there is no EventDetail defined, then this is considered a None End Event. - * If there is more than one EventDetail defined, this is considered a Multiple EndEvent. - */ - List<EventDetail> getResult(); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +/** + * As the name implies, the End Event indicates where a Process will end. + * + * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. + * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape. + * End Event Results are Message, Error, Compensation, Link, and Multiple. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EndEvent extends Event, SingleInFlowSupport +{ + /** + * Result defines the type of result expected for an End Event. + * Of the set of EventDetailTypes only six can be applied to an + * End Event: Message, Error, Cancel, Compensation, Signal, and Terminate. + * + * If there is no EventDetail defined, then this is considered a None End Event. + * If there is more than one EventDetail defined, this is considered a Multiple EndEvent. + */ + List<EventDetail> getResult(); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * An Entity, which is used in the definition of attributes for a {@link Participant} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Entity extends SupportingElement -{ - /** - * Name is an attribute that is text description of the Entity. - */ - String getName(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * An Entity, which is used in the definition of attributes for a {@link Participant} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Entity extends SupportingElement +{ + /** + * Name is an attribute that is text description of the Entity. + */ + String getName(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,51 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Error event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ErrorEventDetail extends EventDetail -{ - /** - * For an End Event: - * If the Result is an Error, then the ErrorCode MUST be supplied.This “throws” the - * error. - * - * For an Intermediate Event within Normal Flow: - * If the Trigger is an Error, then the ErrorCode MUST be entered. This “throws” - * the error. - * - * For an Intermediate Event attached to the boundary of an Activity: - * If the Trigger is an Error, then the ErrorCode MAY be entered. This Event - * “catches” the error. If there is no ErrorCode, then any error SHALL trigger the - * Event. If there is an ErrorCode, then only an error that matches the ErrorCode - * SHALL trigger the Event. - */ - String getErrorCode(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,51 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Error event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ErrorEventDetail extends EventDetail +{ + /** + * For an End Event: + * If the Result is an Error, then the ErrorCode MUST be supplied.This “throws” the + * error. + * + * For an Intermediate Event within Normal Flow: + * If the Trigger is an Error, then the ErrorCode MUST be entered. This “throws” + * the error. + * + * For an Intermediate Event attached to the boundary of an Activity: + * If the Trigger is an Error, then the ErrorCode MAY be entered. This Event + * “catches” the error. If there is no ErrorCode, then any error SHALL trigger the + * Event. If there is an ErrorCode, then only an error that matches the ErrorCode + * SHALL trigger the Event. + */ + String getErrorCode(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model.internal; - - -//$Id$ - -/** - * An Event is something that “happens” during the course of a business process. - * - * These Events affect the flow of the Process and usually have a cause or an impact. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Event extends FlowObject -{ - /** - * Defines the type of an {@link Event} - */ - enum EventType - { - Start, End, Intermediate - }; -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * An Event is something that “happens” during the course of a business process. + * + * These Events affect the flow of the Process and usually have a cause or an impact. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Event extends FlowObject +{ + /** + * Defines the type of an {@link Event} + */ + enum EventType + { + Start, End, Intermediate + }; +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Constants.EventDetailType; - -//$Id$ - -/** - * The base of all supported event details. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EventDetail extends SupportingElement -{ - /** - * The EventDetailType attribute defines the type of trigger expected for an Event. The - * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate, - * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each - * have a subset of the EventDetailTypes that can be used. - * The EventDetailType list MAY be extended to include new types. - */ - EventDetailType getEventDetailType(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Constants.EventDetailType; + +//$Id$ + +/** + * The base of all supported event details. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EventDetail extends SupportingElement +{ + /** + * The EventDetailType attribute defines the type of trigger expected for an Event. The + * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate, + * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each + * have a subset of the EventDetailTypes that can be used. + * The EventDetailType list MAY be extended to include new types. + */ + EventDetailType getEventDetailType(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,57 +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.jboss.bpm.model.internal; - - -//$Id$ - -/** - * Exclusive Gateways (Decisions) are locations within a business process where the Sequence Flow can take two or more - * alternative paths. This is basically the “fork in the road” for a process. For a given performance (or instance) of the - * process, only one of the paths can be taken (this should not be confused with forking of paths—refer to “Forking Flow”) - * - * A Decision is not an activity from the business process perspective, but is a type of Gateway that controls - * the Sequence Flow between activities. It can be thought of as a question that is asked at that point in the Process. The - * question has a defined set of alternative answers (Gates). Each Decision Gate is associated with a condition expression - * found within an outgoing Sequence Flow. When a Gate is chosen during the performance of the Process, the - * corresponding Sequence Flow is then chosen. A Token arriving at the Decision would be directed down the appropriate - * path, based on the chosen Gate. - * - * The Exclusive Decision has two or more outgoing Sequence Flow, but only one of them may be taken during the - * performance of the Process. Thus, the Exclusive Decision defines a set of alternative paths for the Token to take as it - * traverses the Flow. There are two types of Exclusive Decisions: Data-Based and Event-Based. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGateway extends Gateway -{ - enum ExclusiveType - { - Data, Event - } - - /** - * ExclusiveType is by default Data. The ExclusiveType MAY be set to Event. - */ - ExclusiveType getExclusiveType(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,57 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * Exclusive Gateways (Decisions) are locations within a business process where the Sequence Flow can take two or more + * alternative paths. This is basically the “fork in the road” for a process. For a given performance (or instance) of the + * process, only one of the paths can be taken (this should not be confused with forking of paths—refer to “Forking Flow”) + * + * A Decision is not an activity from the business process perspective, but is a type of Gateway that controls + * the Sequence Flow between activities. It can be thought of as a question that is asked at that point in the Process. The + * question has a defined set of alternative answers (Gates). Each Decision Gate is associated with a condition expression + * found within an outgoing Sequence Flow. When a Gate is chosen during the performance of the Process, the + * corresponding Sequence Flow is then chosen. A Token arriving at the Decision would be directed down the appropriate + * path, based on the chosen Gate. + * + * The Exclusive Decision has two or more outgoing Sequence Flow, but only one of them may be taken during the + * performance of the Process. Thus, the Exclusive Decision defines a set of alternative paths for the Token to take as it + * traverses the Flow. There are two types of Exclusive Decisions: Data-Based and Event-Based. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExclusiveGateway extends Gateway +{ + enum ExclusiveType + { + Data, Event + } + + /** + * ExclusiveType is by default Data. The ExclusiveType MAY be set to Event. + */ + ExclusiveType getExclusiveType(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,55 +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.jboss.bpm.model.internal; - - -//$Id$ - -/** - * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based - * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing - * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken - * (hence the name Data-Based). - * - * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will - * determine the Sequence Flow that will be taken. Since the behavior of this Gateway is exclusive, any other conditions that - * may actually be TRUE will be ignored--only one Gate can be chosen. One of the Gates may be “default” (or otherwise), - * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be - * chosen—along with its associated Sequence Flow. - * - * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure - * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However, - * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed - * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid - * Gate at runtime is an invalid model. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGatewayDataBased extends ExclusiveGateway -{ - /** - * A Default Gate MAY be specified - */ - Gate getDefaultGate(); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,55 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based + * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing + * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken + * (hence the name Data-Based). + * + * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will + * determine the Sequence Flow that will be taken. Since the behavior of this Gateway is exclusive, any other conditions that + * may actually be TRUE will be ignored--only one Gate can be chosen. One of the Gates may be “default” (or otherwise), + * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be + * chosen—along with its associated Sequence Flow. + * + * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure + * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However, + * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed + * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid + * Gate at runtime is an invalid model. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExclusiveGatewayDataBased extends ExclusiveGateway +{ + /** + * A Default Gate MAY be specified + */ + Gate getDefaultGate(); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,53 +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.jboss.bpm.model.internal; - - -//$Id$ - -/** - * The inclusion of Event-Based Exclusive Gateways is the result of recent developments in the handling of distributed - * systems (e.g., with pi-calculus) and was derived from the BPEL4WS pick. On the input side, their behavior is the same as - * a Data-Based Exclusive Gateway (see “Data-Based” on page 73). On the output side, the basic idea is that this Decision - * represents a branching point in the process where the alternatives are based on events that occurs at that point in the - * Process, rather than the evaluation of expressions using process data. A specific event, usually the receipt of a message, - * determines which of the paths will be taken. For example, if a company is waiting for a response from a customer, they - * will perform one set of activities if the customer responds “Yes” and another set of activities if the customer responds - * “No.” The customer’s response determines which path is taken. The identity of the Message determines which path is taken. - * That is, the “Yes” Message and the “No” message are different messages—they are not the same message with different values - * within a property of the Message. The receipt of the message can be modeled with a Task of TaskType Receive or an - * Intermediate Event with a Message Trigger. In addition to Messages, other Triggers for Intermediate Events can be used, such as Timers. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGatewayEventBased extends ExclusiveGateway -{ - /** - * Event-Based Gateways can be defined as the instantiation mechanism for the - * Process with the Instantiate attribute. This attribute MAY be set to true if the - * Gateway is the first element after the Start Event or a starting Gateway if there is - * no Start Event (i.e., there are no incoming Sequence Flow). - */ - boolean isInstantiate(); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * The inclusion of Event-Based Exclusive Gateways is the result of recent developments in the handling of distributed + * systems (e.g., with pi-calculus) and was derived from the BPEL4WS pick. On the input side, their behavior is the same as + * a Data-Based Exclusive Gateway (see “Data-Based” on page 73). On the output side, the basic idea is that this Decision + * represents a branching point in the process where the alternatives are based on events that occurs at that point in the + * Process, rather than the evaluation of expressions using process data. A specific event, usually the receipt of a message, + * determines which of the paths will be taken. For example, if a company is waiting for a response from a customer, they + * will perform one set of activities if the customer responds “Yes” and another set of activities if the customer responds + * “No.” The customer’s response determines which path is taken. The identity of the Message determines which path is taken. + * That is, the “Yes” Message and the “No” message are different messages—they are not the same message with different values + * within a property of the Message. The receipt of the message can be modeled with a Task of TaskType Receive or an + * Intermediate Event with a Message Trigger. In addition to Messages, other Triggers for Intermediate Events can be used, such as Timers. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExclusiveGatewayEventBased extends ExclusiveGateway +{ + /** + * Event-Based Gateways can be defined as the instantiation mechanism for the + * Process with the Instantiate attribute. This attribute MAY be set to true if the + * Gateway is the first element after the Start Event or a starting Gateway if there is + * no Start Event (i.e., there are no incoming Sequence Flow). + */ + boolean isInstantiate(); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,56 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.Constants.ExpressionLanguage; - -//$Id$ - -/** - * An Expression, which is used in the definition of attributes for {@link StartEvent}, - * {@link IntermediateEvent}, {@link Activity}, {@link ComplexGateway}, and {@link SequenceFlow} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Expression extends SupportingElement -{ - /** - * An ExpressionBody MUST be entered to provide the text of the expression, which - * will be written in the language defined by the ExpressionLanguage attribute. - */ - String getExpressionBody(); - - /** - * An ExpressionValue MAY be available if the Expression is used as a {@link Property} value. - */ - Object getExpressionValue(); - - /** - * A Language MUST be provided to identify the language of the ExpressionBody. - * The value of the ExpressionLanguage should follow the naming conventions for the - * version of the specified language. - */ - ExpressionLanguage getExpressionLanguage(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,56 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.Constants.ExpressionLanguage; + +//$Id$ + +/** + * An Expression, which is used in the definition of attributes for {@link StartEvent}, + * {@link IntermediateEvent}, {@link Activity}, {@link ComplexGateway}, and {@link SequenceFlow} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Expression extends SupportingElement +{ + /** + * An ExpressionBody MUST be entered to provide the text of the expression, which + * will be written in the language defined by the ExpressionLanguage attribute. + */ + String getExpressionBody(); + + /** + * An ExpressionValue MAY be available if the Expression is used as a {@link Property} value. + */ + Object getExpressionValue(); + + /** + * A Language MUST be provided to identify the language of the ExpressionBody. + * The value of the ExpressionLanguage should follow the naming conventions for the + * version of the specified language. + */ + ExpressionLanguage getExpressionLanguage(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,53 +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.jboss.bpm.model.internal; - -import java.util.List; - -import org.jboss.bpm.model.Process; - -//$Id$ - -/** - * A Flow Object is one of the set of following graphical objects: {@link Event}, {@link Activity}, and {@link Gateway}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface FlowObject extends GraphicalElement -{ - /** - * Get the unique name. - */ - String getName(); - - /** - * Get the associated Process - */ - Process getProcess(); - - /** - * One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the - * Assignment SHALL be performed as defined by the AssignTime attribute. - */ - List<Assignment> getAssignments(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Process; + +//$Id$ + +/** + * A Flow Object is one of the set of following graphical objects: {@link Event}, {@link Activity}, and {@link Gateway}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface FlowObject extends GraphicalElement +{ + /** + * Get the unique name. + */ + String getName(); + + /** + * Get the associated Process + */ + Process getProcess(); + + /** + * One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the + * Assignment SHALL be performed as defined by the AssignTime attribute. + */ + List<Assignment> getAssignments(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,75 +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.jboss.bpm.model.internal; - -import java.util.List; - - - -//$Id$ - -/** - * There MAY be zero or more Gates (except where noted below). Zero Gates are - * allowed if the Gateway is last object in a Process flow and there are no Start or - * End Events for the Process. If there are zero or only one incoming Sequence - * Flow, then there MUST be at least two Gates. - * - * For Exclusive Data-Based Gateways - * When two Gates are required, one of them MAY be the DefaultGate. - * - * For Exclusive Event-Based Gateways - * There MUST be two or more Gates. (Note that this type of Gateway does not act - * only as a Merge--it is always a Decision, at least.) - * - * For Inclusive Gateways - * When two Gates are required, one of them MAY be the DefaultGate. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Gate extends SupportingElement -{ - /** - * Each Gate MUST have an associated (outgoing) Sequence Flow. - * - * For Exclusive Event-Based, Complex, and Parallel Gateways: - * The Sequence Flow MUST have its Condition attribute set to None (there is not an - * evaluation of a condition expression). - * - * For Exclusive Data-Based, and Inclusive Gateways: - * The Sequence Flow MUST have its Condition attribute set to Expression and - * MUST have a valid ConditionExpression. The ConditionExpression MUST be - * unique for all the Gates within the Gateway. If there is only one Gate (i.e., the - * Gateway is acting only as a Merge), then Sequence Flow MUST have its Condition - * set to None. - * - * For DefaultGates: - * The Sequence Flow MUST have its Condition attribute set to Otherwise - */ - SequenceFlow getOutgoingSequenceFlow(); - - /** - * One or more assignment expressions MAY be made for each Gate. The - * Assignment SHALL be performed when the Gate is selected. - */ - List<Assignment> getAssignments(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,75 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + + + +//$Id$ + +/** + * There MAY be zero or more Gates (except where noted below). Zero Gates are + * allowed if the Gateway is last object in a Process flow and there are no Start or + * End Events for the Process. If there are zero or only one incoming Sequence + * Flow, then there MUST be at least two Gates. + * + * For Exclusive Data-Based Gateways + * When two Gates are required, one of them MAY be the DefaultGate. + * + * For Exclusive Event-Based Gateways + * There MUST be two or more Gates. (Note that this type of Gateway does not act + * only as a Merge--it is always a Decision, at least.) + * + * For Inclusive Gateways + * When two Gates are required, one of them MAY be the DefaultGate. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Gate extends SupportingElement +{ + /** + * Each Gate MUST have an associated (outgoing) Sequence Flow. + * + * For Exclusive Event-Based, Complex, and Parallel Gateways: + * The Sequence Flow MUST have its Condition attribute set to None (there is not an + * evaluation of a condition expression). + * + * For Exclusive Data-Based, and Inclusive Gateways: + * The Sequence Flow MUST have its Condition attribute set to Expression and + * MUST have a valid ConditionExpression. The ConditionExpression MUST be + * unique for all the Gates within the Gateway. If there is only one Gate (i.e., the + * Gateway is acting only as a Merge), then Sequence Flow MUST have its Condition + * set to None. + * + * For DefaultGates: + * The Sequence Flow MUST have its Condition attribute set to Otherwise + */ + SequenceFlow getOutgoingSequenceFlow(); + + /** + * One or more assignment expressions MAY be made for each Gate. The + * Assignment SHALL be performed when the Gate is selected. + */ + List<Assignment> getAssignments(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,75 +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.jboss.bpm.model.internal; - -import java.util.List; - -import org.jboss.bpm.model.Constants.GatewayType; - -//$Id$ - -/** - * Gateways are modeling elements that are used to control how Sequence Flow interact as they converge and diverge within - * a Process. If the flow does not need to be controlled, then a Gateway is not needed. The term “Gateway” implies that - * there is a gating mechanism that either allows or disallows passage through the Gateway--that is, as Tokens arrive at a - * Gateway, they can be merged together on input and/or split apart on output as the Gateway mechanisms are invoked. To - * be more descriptive, a Gateway is actually a collection of “Gates.” - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Gateway extends FlowObject, MultipleInFlowSupport -{ - /** - * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway, - * both for incoming and outgoing Sequence Flow - */ - GatewayType getGatewayType(); - - /** - * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End - * Events for the Process. If there are zero or only one incoming Sequence Flow, then there MUST be at least two Gates. - * - * For Exclusive Data-Based Gateways. - * When two Gates are required, one of them MAY be the DefaultGate. - * - * For Exclusive Event-Based Gateways. - * There MUST be two or more Gates. (Note that this type of Gateway does not act only as a Merge--it is always a Decision, at - * least.) - * - * For Inclusive Gateways. - * When two Gates are required, one of them MAY be the DefaultGate. - */ - List<Gate> getGates(); - - /** - * Get the optional default gate - * @return null if there is none - */ - Gate getDefaultGate(); - - /** - * Get the gate for the given target name - * @return null if there is none - */ - Gate getGateByTargetName(String targetName); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,75 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Constants.GatewayType; + +//$Id$ + +/** + * Gateways are modeling elements that are used to control how Sequence Flow interact as they converge and diverge within + * a Process. If the flow does not need to be controlled, then a Gateway is not needed. The term “Gateway” implies that + * there is a gating mechanism that either allows or disallows passage through the Gateway--that is, as Tokens arrive at a + * Gateway, they can be merged together on input and/or split apart on output as the Gateway mechanisms are invoked. To + * be more descriptive, a Gateway is actually a collection of “Gates.” + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Gateway extends FlowObject, MultipleInFlowSupport +{ + /** + * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway, + * both for incoming and outgoing Sequence Flow + */ + GatewayType getGatewayType(); + + /** + * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End + * Events for the Process. If there are zero or only one incoming Sequence Flow, then there MUST be at least two Gates. + * + * For Exclusive Data-Based Gateways. + * When two Gates are required, one of them MAY be the DefaultGate. + * + * For Exclusive Event-Based Gateways. + * There MUST be two or more Gates. (Note that this type of Gateway does not act only as a Merge--it is always a Decision, at + * least.) + * + * For Inclusive Gateways. + * When two Gates are required, one of them MAY be the DefaultGate. + */ + List<Gate> getGates(); + + /** + * Get the optional default gate + * @return null if there is none + */ + Gate getDefaultGate(); + + /** + * Get the gate for the given target name + * @return null if there is none + */ + Gate getGateByTargetName(String targetName); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.model.internal; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface GraphicalElement extends BPMNElement -{ -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.model.internal; + +//$Id$ + +/** + * A graphical BPMN element + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface GraphicalElement extends BPMNElement +{ +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,43 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * This Decision represents a branching point where Alternatives are based on conditional expressions contained within - * outgoing Sequence Flow. However, in this case, the True evaluation of one condition expression does not exclude the - * evaluation of other condition expressions. All Sequence Flow with a True evaluation will be traversed by a Token. In - * some sense it’s like a grouping of related independent Binary (Yes/No) Decisions--and can be modeled that way. Since - * each path is independent, all combinations of the paths may be taken, from zero to all. However, it should be - * designed so that at least one path is taken. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface InclusiveGateway extends Gateway -{ - /** - * A Default Gate MAY be specified - */ - Gate getDefaultGate(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,43 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * This Decision represents a branching point where Alternatives are based on conditional expressions contained within + * outgoing Sequence Flow. However, in this case, the True evaluation of one condition expression does not exclude the + * evaluation of other condition expressions. All Sequence Flow with a True evaluation will be traversed by a Token. In + * some sense it’s like a grouping of related independent Binary (Yes/No) Decisions--and can be modeled that way. Since + * each path is independent, all combinations of the paths may be taken, from zero to all. However, it should be + * designed so that at least one path is taken. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface InclusiveGateway extends Gateway +{ + /** + * A Default Gate MAY be specified + */ + Gate getDefaultGate(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,53 +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.jboss.bpm.model.internal; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.internal.MutablePropertySupport; - -/** - * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface InputSet extends SupportingElement, MutablePropertySupport -{ - /** - * Zero or more ArtifactInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. An ArtifactInput is an Artifact, usually a Data - * Object. - */ - List<ArtifactInput> getArtifactInputs(); - - /** - * Zero or more PropertyInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. - */ - List<Property> getProperties(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; + +/** + * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface InputSet extends SupportingElement, MutablePropertySupport +{ + /** + * Zero or more ArtifactInputs MAY be defined for each InputSet. For the + * combination of ArtifactInputs and PropertyInputs, there MUST be at least one + * item defined for the InputSet. An ArtifactInput is an Artifact, usually a Data + * Object. + */ + List<ArtifactInput> getArtifactInputs(); + + /** + * Zero or more PropertyInputs MAY be defined for each InputSet. For the + * combination of ArtifactInputs and PropertyInputs, there MUST be at least one + * item defined for the InputSet. + */ + List<Property> getProperties(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Process; - -//$Id$ - -/** - * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. - * - * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate - * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, - * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface IntermediateEvent extends Event, SingleInFlowSupport, SingleOutFlowSupport -{ -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Process; + +//$Id$ + +/** + * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. + * + * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate + * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, + * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface IntermediateEvent extends Event, SingleInFlowSupport, SingleOutFlowSupport +{ +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Link event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface LinkEventDetail extends EventDetail -{ - /** - * If the Trigger is a Link, then the Name MUST be entered. - */ - String getName(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Link event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface LinkEventDetail extends EventDetail +{ + /** + * If the Trigger is a Link, then the Name MUST be entered. + */ + String getName(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * A Manual Task is a Task that is expected to be performed without the aid of any business process execution engine or any - * application. An example of this could be a telephone technician installing a telephone at a customer location. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ManualTask extends Task -{ -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Manual Task is a Task that is expected to be performed without the aid of any business process execution engine or any + * application. An example of this could be a telephone technician installing a telephone at a customer location. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ManualTask extends Task +{ +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; - -//$Id$ - -/** - * The Message event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface MessageEventDetail extends EventDetail -{ - /** - * If the EventDetailType is a MessageRef, then the a Message MUST be supplied. - */ - Message getMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the - * message. A Web service is the default technology. - */ - Message.Implementation getImplementation(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,46 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; + +//$Id$ + +/** + * The Message event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface MessageEventDetail extends EventDetail +{ + /** + * If the EventDetailType is a MessageRef, then the a Message MUST be supplied. + */ + Message getMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the + * message. A Web service is the default technology. + */ + Message.Implementation getImplementation(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,44 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; - -//$Id$ - -/** - * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to - * send and receive them. In BPMN, two separate Pools in the Diagram will represent the two entities. - * - * Message Flow MUST connect two Pools, either to the Pools themselves or to Flow Objects within the Pools. They cannot - * connect two objects within the same Pool. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MessageFlow extends ConnectingObject -{ - /** - * MessageRef is an optional attribute that identifies the Message that is being sent. - */ - Message getMessageRef(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; + +//$Id$ + +/** + * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to + * send and receive them. In BPMN, two separate Pools in the Diagram will represent the two entities. + * + * Message Flow MUST connect two Pools, either to the Pools themselves or to Flow Objects within the Pools. They cannot + * connect two objects within the same Pool. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MessageFlow extends ConnectingObject +{ + /** + * MessageRef is an optional attribute that identifies the Message that is being sent. + */ + Message getMessageRef(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model.internal; - -import java.util.List; - -//$Id$ - -/** - * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MultipleInFlowSupport -{ - /** - * Get the list of in flows - */ - List<ConnectingObject> getInFlows(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +//$Id$ + +/** + * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MultipleInFlowSupport +{ + /** + * Get the list of in flows + */ + List<ConnectingObject> getInFlows(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model.internal; - -import java.util.List; - -//$Id$ - -/** - * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MultipleOutFlowSupport -{ - /** - * Get the list of out flows - */ - List<ConnectingObject> getOutFlows(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +//$Id$ + +/** + * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MultipleOutFlowSupport +{ + /** + * Get the list of out flows + */ + List<ConnectingObject> getOutFlows(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,53 +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.jboss.bpm.model.internal; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.internal.MutablePropertySupport; - -/** - * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface OutputSet extends SupportingElement, MutablePropertySupport -{ - /** - * Zero or more ArtifactOutputs MAY be defined for each OutputSet. For the - * combination of ArtifactOutputs and PropertyOutputs, there MUST be at least one - * item defined for the OutputSet. An ArtifactOutput is an {@link Artifact}, - * usually a {@link DataObject}. - */ - List<ArtifactOutput> getArtifactOutputs(); - - /** - * Zero or more PropertyInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. - */ - List<Property> getProperties(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; + +/** + * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface OutputSet extends SupportingElement, MutablePropertySupport +{ + /** + * Zero or more ArtifactOutputs MAY be defined for each OutputSet. For the + * combination of ArtifactOutputs and PropertyOutputs, there MUST be at least one + * item defined for the OutputSet. An ArtifactOutput is an {@link Artifact}, + * usually a {@link DataObject}. + */ + List<ArtifactOutput> getArtifactOutputs(); + + /** + * Zero or more PropertyInputs MAY be defined for each InputSet. For the + * combination of ArtifactInputs and PropertyInputs, there MUST be at least one + * item defined for the InputSet. + */ + List<Property> getProperties(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * Parallel Gateway is required when two or more Activities need to be executed in parallel. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ParallelGateway extends Gateway -{ - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * Parallel Gateway is required when two or more Activities need to be executed in parallel. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ParallelGateway extends Gateway +{ + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,57 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; - -//$Id$ - -/** - * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService - * - * TODO: Add javadoc links for Pool, WebService - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Participant extends SupportingElement -{ - public enum ParticipantType - { - Role, Entity - } - - /** - * Get the type of this participant - */ - ParticipantType getParticipantType(); - - /** - * If the ParticipantType = Role, then a Role MUST be identified. - */ - Role getRoleRef(); - - /** - * If the ParticipantType = Entity, then an Entity MUST be identified. - */ - Entity getEntityRef(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,57 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; + +//$Id$ + +/** + * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService + * + * TODO: Add javadoc links for Pool, WebService + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Participant extends SupportingElement +{ + public enum ParticipantType + { + Role, Entity + } + + /** + * Get the type of this participant + */ + ParticipantType getParticipantType(); + + /** + * If the ParticipantType = Role, then a Role MUST be identified. + */ + Role getRoleRef(); + + /** + * If the ParticipantType = Entity, then an Entity MUST be identified. + */ + Entity getEntityRef(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Property; - -//$Id$ - -/** - * A PropertyBuilder can be used to build a {@link Property} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface PropertyBuilder -{ - /** - * Create a {@link Property} with a given name and value - */ - Property newProperty(String name, Object value); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Property; + +//$Id$ + +/** + * A PropertyBuilder can be used to build a {@link Property} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface PropertyBuilder +{ + /** + * Create a {@link Property} with a given name and value + */ + Property newProperty(String name, Object value); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model.internal; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link PropertyBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class PropertyBuilderFactory -{ - /** The bean name - jBPMMessageBuilderFactory */ - public static final String BEAN_NAME = "jBPMPropertyBuilderFactory"; - - // Hide the constructor - protected PropertyBuilderFactory() - { - } - - /** - * Get a MessageBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static PropertyBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (PropertyBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link PropertyBuilder}. - */ - public abstract PropertyBuilder newPropertyBuilder(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.model.internal; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.util.KernelLocator; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; + +/** + * A Factory for the {@link PropertyBuilder}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class PropertyBuilderFactory +{ + /** The bean name - jBPMMessageBuilderFactory */ + public static final String BEAN_NAME = "jBPMPropertyBuilderFactory"; + + // Hide the constructor + protected PropertyBuilderFactory() + { + } + + /** + * Get a MessageBuilderFactory instance. + */ + @SuppressWarnings("deprecation") + public static PropertyBuilderFactory newInstance() + { + // Make sure the engine is bootstrapped + ProcessEngine.locateProcessEngine(); + Kernel kernel = KernelLocator.getKernel(); + KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); + return (PropertyBuilderFactory)entry.getTarget(); + } + + /** + * Get a {@link PropertyBuilder}. + */ + public abstract PropertyBuilder newPropertyBuilder(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,57 +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.jboss.bpm.model.internal; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.model.Property; - -/** - * Property support - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface PropertySupport -{ - /** - * Get a Property with a given name. - */ - Property getProperty(String name); - - /** - * Get a Property value with a given name. - */ - String getPropertyValue(String name); - - /** - * Multiple Properties MAY entered for the Message. - */ - List<Property> getProperties(); - - /** - * Get the list of property names - */ - List<String> getPropertyNames(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,57 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +import org.jboss.bpm.model.Property; + +/** + * Property support + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface PropertySupport +{ + /** + * Get a Property with a given name. + */ + Property getProperty(String name); + + /** + * Get a Property value with a given name. + */ + String getPropertyValue(String name); + + /** + * Multiple Properties MAY entered for the Message. + */ + List<Property> getProperties(); + + /** + * Get the list of property names + */ + List<String> getPropertyNames(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,59 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A Receive Task is a simple Task that is designed to wait for a message to arrive from an external participant - * (relative to the Business Process). Once the message has been received, the Task is completed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ReceiveTask extends Task -{ - /** - * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be received by the - * Task. The Message in this context is equivalent to an in-only message pattern (Web service). One or more - * corresponding incoming Message Flows MAY be shown on the diagram. However, the display of the Message Flow is not - * required. The Message is applied to all incoming Message Flow, but can arrive for only one of the incoming Message - * Flow for a single instance of the Task. - */ - Message getMessageRef(); - - /** - * Receive Tasks can be defined as the instantiation mechanism for the Process with the Instantiate attribute. This - * attribute MAY be set to true if the Task is the first activity after the Start Event or a starting Task if there is - * no Start Event (i.e., there are no incoming Sequence Flow). Multiple Tasks MAY have this attribute set to True. - */ - boolean isInstantiate(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the - * default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,59 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + +//$Id$ + +/** + * A Receive Task is a simple Task that is designed to wait for a message to arrive from an external participant + * (relative to the Business Process). Once the message has been received, the Task is completed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ReceiveTask extends Task +{ + /** + * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be received by the + * Task. The Message in this context is equivalent to an in-only message pattern (Web service). One or more + * corresponding incoming Message Flows MAY be shown on the diagram. However, the display of the Message Flow is not + * required. The Message is applied to all incoming Message Flow, but can arrive for only one of the incoming Message + * Flow for a single instance of the Task. + */ + Message getMessageRef(); + + /** + * Receive Tasks can be defined as the instantiation mechanism for the Process with the Instantiate attribute. This + * attribute MAY be set to true if the Task is the first activity after the Start Event or a starting Task if there is + * no Start Event (i.e., there are no incoming Sequence Flow). Multiple Tasks MAY have this attribute set to True. + */ + boolean isInstantiate(); + + /** + * This attribute specifies the technology that will be used to send or receive the message. A Web service is the + * default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,40 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * There may be times where a modeler may want to reference another activity that has been defined. If the two (or more) - * activities share the exact same behavior, then by one referencing the other, the attributes that define the behavior only - * have to be created once and maintained in only one location. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ReferenceTask extends Task -{ - /** - * The Task being referenced MUST be identified. - */ - Task getTaskRef(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * There may be times where a modeler may want to reference another activity that has been defined. If the two (or more) + * activities share the exact same behavior, then by one referencing the other, the attributes that define the behavior only + * have to be created once and maintained in only one location. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ReferenceTask extends Task +{ + /** + * The Task being referenced MUST be identified. + */ + Task getTaskRef(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * A Role, which is used in the definition of attributes for a {@link Participant} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Role extends SupportingElement -{ - /** - * Name is an attribute that is text description of the Role. - */ - String getName(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Role, which is used in the definition of attributes for a {@link Participant} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Role extends SupportingElement +{ + /** + * Name is an attribute that is text description of the Role. + */ + String getName(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,41 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * A Script Task is executed by a business process engine. The modeler or implementer defines a script in a language that - * the engine can interpret. When the Task is ready to start, the engine will execute the script. When the script is completed, - * the Task will also be completed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ScriptTask extends Task -{ - /** - * The modeler MAY include a script that can be run when the Task is performed. If - * a script is not included, then the Task will act equivalent to a TaskType of None. - */ - String getScript(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Script Task is executed by a business process engine. The modeler or implementer defines a script in a language that + * the engine can interpret. When the Task is ready to start, the engine will execute the script. When the script is completed, + * the Task will also be completed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ScriptTask extends Task +{ + /** + * The modeler MAY include a script that can be run when the Task is performed. If + * a script is not included, then the Task will act equivalent to a TaskType of None. + */ + String getScript(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,50 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Message.Implementation; - - -//$Id$ - -/** - * A Send Task. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SendTask extends Task -{ - /** - * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be sent by the Task. The Message in this context is equivalent to an - * out-only message pattern (Web service). One or more corresponding outgoing Message Flow MAY be shown on the diagram. However, the display of the Message Flow is - * not required. The Message is applied to all outgoing Message Flow and the Message will be sent down all outgoing Message Flow at the completion of a single - * instance of the Task. - */ - Message getMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + + +//$Id$ + +/** + * A Send Task. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SendTask extends Task +{ + /** + * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be sent by the Task. The Message in this context is equivalent to an + * out-only message pattern (Web service). One or more corresponding outgoing Message Flow MAY be shown on the diagram. However, the display of the Message Flow is + * not required. The Message is applied to all outgoing Message Flow and the Message will be sent down all outgoing Message Flow at the completion of a single + * instance of the Task. + */ + Message getMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,71 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * A Sequence Flow is used to show the order that activities will be performed in a Process. Each Flow has only one - * source and only one target. The source and target must be from the set of the following Flow Objects: Events (Start, - * Intermediate, and End), Activities (Task and Sub-Process), and Gateways. During performance (or simulation) of the - * process, a Token will leave the source Flow Object, traverse down the Sequence Flow, and enter the target Flow - * Object. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SequenceFlow extends ConnectingObject -{ - /** - * The ConditionType - */ - public enum ConditionType - { - None, Expression, Default - } - - /** - * By default, the ConditionType of a Sequence Flow is None. This means that there is no evaluation at runtime to - * determine whether or not the Sequence Flow will be used. Once a Token is ready to traverse the Sequence Flow (i.e., - * the Source is an activity that has completed), then the Token will do so. The normal, uncontrolled use of Sequence - * Flow, in a sequence of activities, will have a None ConditionType. A None ConditionType MUST NOT be used if the - * Source of the Sequence Flow is an Exclusive Data-Based or Inclusive Gateway. The ConditionType attribute MAY be set - * to Expression if the Source of the Sequence Flow is a Task, a Sub-Process, or a Gateway of type Exclusive-Data- - * Based or Inclusive. If the ConditionType attribute is set to Expression, then a condition marker SHALL be added to - * the line if the Sequence Flow is outgoing from an activity. However, a condition indicator MUST NOT be added to the - * line if the Sequence Flow is outgoing from a Gateway. An Expression ConditionType MUST NOT be used if the Source of - * the Sequence Flow is an Event-Based Exclusive Gateway, a Complex Gateway, a Parallel Gateway, a Start Event, or an - * Intermediate Event. In addition, an Expression ConditionType MUST NOT be used if the Sequence Flow is associated - * with the Default Gate of a Gateway. The ConditionType attribute MAY be set to Default only if the Source of the - * Sequence Flow is an activity or an Exclusive Data-Based Gateway. - */ - ConditionType getConditionType(); - - /** - * If the ConditionType attribute is set to Expression, then the ConditionExpression attribute MUST be defined as a - * valid expression. The expression will be evaluated at runtime. If the result of the evaluation is TRUE, then a - * Token will be generated and will traverse the Sequence--Subject to any constraints imposed by a Source that is a - * Gateway. - */ - Expression getConditionExpression(); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,71 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Sequence Flow is used to show the order that activities will be performed in a Process. Each Flow has only one + * source and only one target. The source and target must be from the set of the following Flow Objects: Events (Start, + * Intermediate, and End), Activities (Task and Sub-Process), and Gateways. During performance (or simulation) of the + * process, a Token will leave the source Flow Object, traverse down the Sequence Flow, and enter the target Flow + * Object. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SequenceFlow extends ConnectingObject +{ + /** + * The ConditionType + */ + public enum ConditionType + { + None, Expression, Default + } + + /** + * By default, the ConditionType of a Sequence Flow is None. This means that there is no evaluation at runtime to + * determine whether or not the Sequence Flow will be used. Once a Token is ready to traverse the Sequence Flow (i.e., + * the Source is an activity that has completed), then the Token will do so. The normal, uncontrolled use of Sequence + * Flow, in a sequence of activities, will have a None ConditionType. A None ConditionType MUST NOT be used if the + * Source of the Sequence Flow is an Exclusive Data-Based or Inclusive Gateway. The ConditionType attribute MAY be set + * to Expression if the Source of the Sequence Flow is a Task, a Sub-Process, or a Gateway of type Exclusive-Data- + * Based or Inclusive. If the ConditionType attribute is set to Expression, then a condition marker SHALL be added to + * the line if the Sequence Flow is outgoing from an activity. However, a condition indicator MUST NOT be added to the + * line if the Sequence Flow is outgoing from a Gateway. An Expression ConditionType MUST NOT be used if the Source of + * the Sequence Flow is an Event-Based Exclusive Gateway, a Complex Gateway, a Parallel Gateway, a Start Event, or an + * Intermediate Event. In addition, an Expression ConditionType MUST NOT be used if the Sequence Flow is associated + * with the Default Gate of a Gateway. The ConditionType attribute MAY be set to Default only if the Source of the + * Sequence Flow is an activity or an Exclusive Data-Based Gateway. + */ + ConditionType getConditionType(); + + /** + * If the ConditionType attribute is set to Expression, then the ConditionExpression attribute MUST be defined as a + * valid expression. The expression will be evaluated at runtime. If the result of the evaluation is TRUE, then a + * Token will be generated and will traverse the Sequence--Subject to any constraints imposed by a Source that is a + * Gateway. + */ + Expression getConditionExpression(); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A Service Task. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ServiceTask extends Task -{ - /** - * A Message for the InMessageRef attribute MUST be entered. This indicates - * that the Message will be received at the start of the Task, after the - * availability of any defined InputSets. One or more corresponding incoming - * Message Flows MAY be shown on the diagram. However, the display of the - * Message Flow is not required. The Message is applied to all incoming - * Message Flow, but can arrive for only one of the incoming Message Flow - * for a single instance of the Task. - */ - Message getInMessageRef(); - - /** - * A Message for the OutMessageRef attribute MUST be entered. The sending - * of this message marks the completion of the Task, which may cause the - * production of an OutputSet. One or more corresponding outgoing Message - * Flow MAY be shown on the diagram. However, the display of the Message - * Flow is not required. The Message is applied to all outgoing Message Flow - * and the Message will be sent down all outgoing Message Flow at the - * completion of a single instance of the Task. - */ - Message getOutMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the - * message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + +//$Id$ + +/** + * A Service Task. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ServiceTask extends Task +{ + /** + * A Message for the InMessageRef attribute MUST be entered. This indicates + * that the Message will be received at the start of the Task, after the + * availability of any defined InputSets. One or more corresponding incoming + * Message Flows MAY be shown on the diagram. However, the display of the + * Message Flow is not required. The Message is applied to all incoming + * Message Flow, but can arrive for only one of the incoming Message Flow + * for a single instance of the Task. + */ + Message getInMessageRef(); + + /** + * A Message for the OutMessageRef attribute MUST be entered. The sending + * of this message marks the completion of the Task, which may cause the + * production of an OutputSet. One or more corresponding outgoing Message + * Flow MAY be shown on the diagram. However, the display of the Message + * Flow is not required. The Message is applied to all outgoing Message Flow + * and the Message will be sent down all outgoing Message Flow at the + * completion of a single instance of the Task. + */ + Message getOutMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the + * message. A Web service is the default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,41 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Signal; - -//$Id$ - -/** - * The Signal event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface SignalEventDetail extends EventDetail -{ - /** - * If the Trigger is a Signal, then a Signal Shall be entered. - */ - Signal getSignalRef(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Signal; + +//$Id$ + +/** + * The Signal event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface SignalEventDetail extends EventDetail +{ + /** + * If the Trigger is a Signal, then a Signal Shall be entered. + */ + Signal getSignalRef(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,38 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SingleInFlowSupport -{ - /** - * Get the out flow - */ - ConnectingObject getInFlow(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SingleInFlowSupport +{ + /** + * Get the out flow + */ + ConnectingObject getInFlow(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.model.internal; - - -//$Id$ - -/** - * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SingleOutFlowSupport -{ - /** - * Get the out flow - */ - SequenceFlow getOutFlow(); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SingleOutFlowSupport +{ + /** + * Get the out flow + */ + SequenceFlow getOutFlow(); +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.model.internal; - -import java.util.List; - -//$Id$ - -/** - * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts - * the Flow of the Process, and thus, will not have any incoming Sequence Flow. A Start Event can have a Trigger that - * indicates how the Process starts: Message, Timer, Rule, Link, or Multiple. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface StartEvent extends Event, SingleOutFlowSupport -{ - /** - * Trigger is an attribute that defines the type of trigger expected for a Start Event. Of the set of - * EventDetailTypes, only four (4) can be applied to a Start Event: Message, Timer, Conditional, and Signal. If there - * is no EventDetail defined, then this is considered a None Start Event and the Event will not have an internal - * marker. If there is more than one EventDetail defined, this is considered a Multiple Start Event - * and the Event will have the pentagon internal marker. - */ - List<EventDetail> getTrigger(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,46 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +//$Id$ + +/** + * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts + * the Flow of the Process, and thus, will not have any incoming Sequence Flow. A Start Event can have a Trigger that + * indicates how the Process starts: Message, Timer, Rule, Link, or Multiple. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface StartEvent extends Event, SingleOutFlowSupport +{ + /** + * Trigger is an attribute that defines the type of trigger expected for a Start Event. Of the set of + * EventDetailTypes, only four (4) can be applied to a Start Event: Message, Timer, Conditional, and Signal. If there + * is no EventDetail defined, then this is considered a None Start Event and the Event will not have an internal + * marker. If there is more than one EventDetail defined, this is considered a Multiple Start Event + * and the Event will have the pentagon internal marker. + */ + List<EventDetail> getTrigger(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model.internal; - - -//$Id$ - -/** - * A Sub-Process is Process that is included within another Process. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SubProcess extends Activity, SingleInFlowSupport, SingleOutFlowSupport -{ -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * A Sub-Process is Process that is included within another Process. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SubProcess extends Activity, SingleInFlowSupport, SingleOutFlowSupport +{ +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.model.internal; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SupportingElement extends BPMNElement -{ -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.model.internal; + +//$Id$ + +/** + * A graphical BPMN element + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SupportingElement extends BPMNElement +{ +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,51 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Constants; - - - -//$Id$ - -/** - * A Task is an Atomic Activity that is included within a Process. - * - * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to - * perform the Task when it is executed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport -{ - /** - * TaskType is an attribute that has a default of None, but MAY be set to Send, - * Receive, User, Script, Manual, Reference, or Service. The TaskType will be - * impacted by the Message Flow to and/or from the Task, if Message Flow are - * used. A TaskType of Receive MUST NOT have an outgoing Message Flow. A - * TaskType of Send MUST NOT have an incoming Message Flow. A TaskType of - * Script or Manual MUST NOT have an incoming or an outgoing Message Flow. - * The TaskType list MAY be extended to include new types. - */ - Constants.TaskType getTaskType(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,51 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Constants; + + + +//$Id$ + +/** + * A Task is an Atomic Activity that is included within a Process. + * + * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to + * perform the Task when it is executed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport +{ + /** + * TaskType is an attribute that has a default of None, but MAY be set to Send, + * Receive, User, Script, Manual, Reference, or Service. The TaskType will be + * impacted by the Message Flow to and/or from the Task, if Message Flow are + * used. A TaskType of Receive MUST NOT have an outgoing Message Flow. A + * TaskType of Send MUST NOT have an incoming Message Flow. A TaskType of + * Script or Manual MUST NOT have an incoming or an outgoing Message Flow. + * The TaskType list MAY be extended to include new types. + */ + Constants.TaskType getTaskType(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Terminate event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TerminateEventDetail extends EventDetail -{ - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Terminate event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface TerminateEventDetail extends EventDetail +{ + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,37 +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.jboss.bpm.model.internal; - -//$Id$ - - -/** - * The TimeDateExpression supporting element is a sub-type of the Expression Element (Expression on page 273) and uses all - * the attributes of the {@link Expression} Element. - * - * @author Thomas.Diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TimeDateExpression extends Expression -{ - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,37 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * The TimeDateExpression supporting element is a sub-type of the Expression Element (Expression on page 273) and uses all + * the attributes of the {@link Expression} Element. + * + * @author Thomas.Diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface TimeDateExpression extends Expression +{ + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.model.internal; - -//$Id$ - -/** - * The Timer event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TimerEventDetail extends EventDetail -{ - /** - * If the Trigger is a Timer, then a TimeDate MAY be entered. If a TimeDate is not - * entered, then a TimeCycle MUST be entered - */ - TimeDateExpression getTimeDate(); - - /** - * If the Trigger is a Timer, then a TimeCycle MAY be entered. If a TimeCycle is - * not entered, then a TimeDate MUST be entered - */ - TimeDateExpression getTimeCycle(); - -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,46 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Timer event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface TimerEventDetail extends EventDetail +{ + /** + * If the Trigger is a Timer, then a TimeDate MAY be entered. If a TimeDate is not + * entered, then a TimeCycle MUST be entered + */ + TimeDateExpression getTimeDate(); + + /** + * If the Trigger is a Timer, then a TimeCycle MAY be entered. If a TimeCycle is + * not entered, then a TimeDate MUST be entered + */ + TimeDateExpression getTimeCycle(); + +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,64 +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.jboss.bpm.model.internal; - -import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A User Task is a typical “workflow” task where a human performer performs the Task with the assistance of a software - * application and is scheduled through a task list manager of some sort. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface UserTask extends Task -{ - /** - * A Message for the InMessageRef attribute MUST be entered. This indicates - * that the Message will be received at the start of the Task, after the - * availability of any defined InputSets. One or more corresponding incoming - * Message Flows MAY be shown on the diagram. However, the display of the - * Message Flow is not required. The Message is applied to all incoming - * Message Flow, but can arrive for only one of the incoming Message Flow - * for a single instance of the Task. - */ - Message getInMessageRef(); - - /** - * A Message for the OutMessageRef attribute MUST be entered. The sending - * of this message marks the completion of the Task, which may cause the - * production of an OutputSet. One or more corresponding outgoing Message - * Flow MAY be shown on the diagram. However, the display of the Message - * Flow is not required. The Message is applied to all outgoing Message Flow - * and the Message will be sent down all outgoing Message Flow at the - * completion of a single instance of the Task. - */ - Message getOutMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + +//$Id$ + +/** + * A User Task is a typical “workflow” task where a human performer performs the Task with the assistance of a software + * application and is scheduled through a task list manager of some sort. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface UserTask extends Task +{ + /** + * A Message for the InMessageRef attribute MUST be entered. This indicates + * that the Message will be received at the start of the Task, after the + * availability of any defined InputSets. One or more corresponding incoming + * Message Flows MAY be shown on the diagram. However, the display of the + * Message Flow is not required. The Message is applied to all incoming + * Message Flow, but can arrive for only one of the incoming Message Flow + * for a single instance of the Task. + */ + Message getInMessageRef(); + + /** + * A Message for the OutMessageRef attribute MUST be entered. The sending + * of this message marks the completion of the Task, which may cause the + * production of an OutputSet. One or more corresponding outgoing Message + * Flow MAY be shown on the diagram. However, the display of the Message + * Flow is not required. The Message is applied to all outgoing Message Flow + * and the Message will be sent down all outgoing Message Flow at the + * completion of a single instance of the Task. + */ + Message getOutMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,142 +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.jboss.bpm.runtime; - -//$Id$ - -import java.util.Collection; - -/** - * An interface for general Attachments - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Attachments -{ - /** Get attachment keys */ - Collection<Key> getAttachmentKeys(); - - /** Add arbitrary attachment */ - <T> T addAttachment(Class<T> clazz, Object value); - - /** Add arbitrary attachment with name */ - <T> T addAttachment(Class<T> clazz, String name, Object value); - - /** Add arbitrary attachment with name */ - Object addAttachment(String name, Object value); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> clazz); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> clazz, String name); - - /** Get an arbitrary attachment */ - Object getAttachment(String name); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> clazz); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> clazz, String name); - - /** Remove arbitrary attachments */ - Object removeAttachment(String name); - - /** - * A key for attachements - */ - public static class Key - { - private Class<?> clazz; - private String name; - - /** - * Construct the key with optional class and name - */ - public Key(Class<?> clazz, String name) - { - this.clazz = clazz; - this.name = name; - } - - /** - * Get the class part for this key - * - * @return maybe null - */ - public Class<?> getClassPart() - { - return clazz; - } - - /** - * Get the name part for this key - * - * @return maybe null - */ - public String getNamePart() - { - return name; - } - - /** - * Two keys are equal if their {@link #toString()} is equal - */ - public boolean equals(Object obj) - { - if (!(obj instanceof Key)) - return false; - if (obj == this) - return true; - return obj.toString().equals(toString()); - } - - /** - * Two keys have the same hashCode if their {@link #toString()} is equal - */ - public int hashCode() - { - return toString().hashCode(); - } - - /** - * Returns the String repesentation of this Key. - * <pre> - * "[" + clazz + "," + name + "]" - * </pre> - */ - public String toString() - { - StringBuilder str = new StringBuilder("["); - if (clazz != null) - str.append(clazz.getName()); - if (clazz != null && name != null) - str.append(","); - if (name != null) - str.append(name); - str.append("]"); - return str.toString(); - } - } -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,142 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import java.util.Collection; + +/** + * An interface for general Attachments + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Attachments +{ + /** Get attachment keys */ + Collection<Key> getAttachmentKeys(); + + /** Add arbitrary attachment */ + <T> T addAttachment(Class<T> clazz, Object value); + + /** Add arbitrary attachment with name */ + <T> T addAttachment(Class<T> clazz, String name, Object value); + + /** Add arbitrary attachment with name */ + Object addAttachment(String name, Object value); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> clazz); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> clazz, String name); + + /** Get an arbitrary attachment */ + Object getAttachment(String name); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> clazz); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> clazz, String name); + + /** Remove arbitrary attachments */ + Object removeAttachment(String name); + + /** + * A key for attachements + */ + public static class Key + { + private Class<?> clazz; + private String name; + + /** + * Construct the key with optional class and name + */ + public Key(Class<?> clazz, String name) + { + this.clazz = clazz; + this.name = name; + } + + /** + * Get the class part for this key + * + * @return maybe null + */ + public Class<?> getClassPart() + { + return clazz; + } + + /** + * Get the name part for this key + * + * @return maybe null + */ + public String getNamePart() + { + return name; + } + + /** + * Two keys are equal if their {@link #toString()} is equal + */ + public boolean equals(Object obj) + { + if (!(obj instanceof Key)) + return false; + if (obj == this) + return true; + return obj.toString().equals(toString()); + } + + /** + * Two keys have the same hashCode if their {@link #toString()} is equal + */ + public int hashCode() + { + return toString().hashCode(); + } + + /** + * Returns the String repesentation of this Key. + * <pre> + * "[" + clazz + "," + name + "]" + * </pre> + */ + public String toString() + { + StringBuilder str = new StringBuilder("["); + if (clazz != null) + str.append(clazz.getName()); + if (clazz != null && name != null) + str.append(","); + if (name != null) + str.append(name); + str.append("]"); + return str.toString(); + } + } +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,119 +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.jboss.bpm.runtime; - -//$Id$ - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -/** - * Basic attachments. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class BasicAttachments implements Attachments -{ - private Map<Key, Object> attachments = new HashMap<Key, Object>(); - - /** Construct the execution context with no attachments */ - public BasicAttachments() - { - - } - - /** Construct the execution context with given attachments */ - public BasicAttachments(Attachments att) - { - if (att != null) - { - for (Key key : att.getAttachmentKeys()) - { - Object value = att.getAttachment(key.getClassPart(), key.getNamePart()); - this.attachments.put(key, value); - } - } - } - - public Collection<Key> getAttachmentKeys() - { - return attachments.keySet(); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(Class<T> clazz) - { - return (T)attachments.get(new Key(clazz, null)); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(Class<T> clazz, String name) - { - return (T)attachments.get(new Key(clazz, name)); - } - - public Object getAttachment(String name) - { - return attachments.get(new Key(null, name)); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(Class<T> clazz, Object obj) - { - return (T)attachments.put(new Key(clazz, null), obj); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(Class<T> clazz, String name, Object obj) - { - return (T)attachments.put(new Key(clazz, name), obj); - } - - public Object addAttachment(String name, Object obj) - { - return attachments.put(new Key(null, name), obj); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(Class<T> clazz) - { - return (T)attachments.remove(new Key(clazz, null)); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(Class<T> clazz, String name) - { - return (T)attachments.remove(new Key(clazz, name)); - } - - public Object removeAttachment(String name) - { - return attachments.remove(new Key(null, name)); - } - - public String toString() - { - return attachments.toString(); - } -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,120 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + + +/** + * Basic attachments. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class BasicAttachments implements Attachments +{ + private Map<Key, Object> attachments = new HashMap<Key, Object>(); + + /** Construct the execution context with no attachments */ + public BasicAttachments() + { + + } + + /** Construct the execution context with given attachments */ + public BasicAttachments(Attachments att) + { + if (att != null) + { + for (Key key : att.getAttachmentKeys()) + { + Object value = att.getAttachment(key.getClassPart(), key.getNamePart()); + this.attachments.put(key, value); + } + } + } + + public Collection<Key> getAttachmentKeys() + { + return attachments.keySet(); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(Class<T> clazz) + { + return (T)attachments.get(new Key(clazz, null)); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(Class<T> clazz, String name) + { + return (T)attachments.get(new Key(clazz, name)); + } + + public Object getAttachment(String name) + { + return attachments.get(new Key(null, name)); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(Class<T> clazz, Object obj) + { + return (T)attachments.put(new Key(clazz, null), obj); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(Class<T> clazz, String name, Object obj) + { + return (T)attachments.put(new Key(clazz, name), obj); + } + + public Object addAttachment(String name, Object obj) + { + return attachments.put(new Key(null, name), obj); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(Class<T> clazz) + { + return (T)attachments.remove(new Key(clazz, null)); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(Class<T> clazz, String name) + { + return (T)attachments.remove(new Key(clazz, name)); + } + + public Object removeAttachment(String name) + { + return attachments.remove(new Key(null, name)); + } + + public String toString() + { + return attachments.toString(); + } +} Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,35 +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.jboss.bpm.runtime; - -//$Id$ - - -/** - * An execution context that can take attachments. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface ExecutionContext extends Attachments -{ -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.runtime; + + +//$Id$ + + +/** + * An execution context that can take attachments. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface ExecutionContext extends Attachments +{ +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,43 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.bpm.model.FlowObject; - -/** - * The {@link ProcessEngine} invokes the ExecutionHandler on a - * {@link FlowObject} to execute user provided business logic. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExecutionHandler extends Handler -{ - /** - * Execute the associated business logic. - */ - void execute(Token token); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.runtime.internal.Handler; + +/** + * The {@link ProcessEngine} invokes the ExecutionHandler on a + * {@link FlowObject} to execute user provided business logic. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExecutionHandler extends Handler +{ + /** + * Execute the associated business logic. + */ + void execute(Token token); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.bpm.model.FlowObject; - -/** - * The {@link ProcessEngine} invokes the FlowHandler on an {@link HandlerSupport} - * {@link FlowObject} to move the {@link Token} to the next {@link FlowObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface FlowHandler extends Handler -{ - /** - * Execute the FlowHandler. - * - * The FlowHandler typically invoves one of the {@link TokenExecutor} - * methods to move the {@link Token} to the next {@link FlowObject}. - */ - void execute(TokenExecutor tokenExecutor, Token token); - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,48 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.runtime.internal.Handler; +import org.jboss.bpm.runtime.internal.HandlerSupport; + +/** + * The {@link ProcessEngine} invokes the FlowHandler on an {@link HandlerSupport} + * {@link FlowObject} to move the {@link Token} to the next {@link FlowObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface FlowHandler extends Handler +{ + /** + * Execute the FlowHandler. + * + * The FlowHandler typically invoves one of the {@link TokenExecutor} + * methods to move the {@link Token} to the next {@link FlowObject}. + */ + void execute(TokenExecutor tokenExecutor, Token token); + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.runtime; - -import java.io.Serializable; - -import org.jboss.bpm.model.FlowObject; - -//$Id$ - -/** - * The generic base for handlers that can be associated with a {@link FlowObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Handler extends Serializable -{ - -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,43 +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.jboss.bpm.runtime; - - -//$Id$ - -/** - * A combined interface for execution aspects - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface HandlerSupport -{ - /** Get the associated ExecutionHandler */ - ExecutionHandler getExecutionHandler(); - - /** Get the associated SignalHandler */ - SignalHandler getSignalHandler(); - - /** Get the associated FlowHandler */ - FlowHandler getFlowHandler(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,41 +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.jboss.bpm.runtime; - -import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.PropertySupport; - -//$Id$ - -/** - * Mutable property support - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface MutablePropertySupport extends PropertySupport -{ - /** - * Add a property - */ - void addProperty(Property prop); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,46 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.model.Process; - -/** - * A RuntimeProcess add runtime behaviour to the {@link Process} To protect the engine from maligious user code it - * does not extend {@link Process} directly. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface RuntimeProcess -{ - /** - * Get the associated {@link Process} - */ - Process getProcess(); - - /** - * Get the {@link TokenExecutor} for this {@link Process} - */ - TokenExecutor getTokenExecutor(); -} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,48 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Signal; - -/** - * The {@link ProcessEngine} invokes the SignalHandler on an {@link HandlerSupport} - * {@link FlowObject} to send {@link Signal}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SignalHandler extends Handler -{ - /** - * Get signal for enter - */ - void throwEnterSignal(); - - /** - * Get signal for exit - */ - void throwExitSignal(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.runtime.internal.Handler; +import org.jboss.bpm.runtime.internal.HandlerSupport; + +/** + * The {@link ProcessEngine} invokes the SignalHandler on an {@link HandlerSupport} + * {@link FlowObject} to send {@link Signal}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SignalHandler extends Handler +{ + /** + * Get signal for enter + */ + void throwEnterSignal(); + + /** + * Get signal for exit + */ + void throwExitSignal(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,93 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; - -/** - * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. - * - * By tracking how the Token traverses the Flow Objects, gets diverted through alternative paths, and gets split into parallel paths, the normal Sequence Flow should be - * completely definable. - * - * A Token will have a unique identity that can be used to separate multiple Tokens that may exist because of concurrent process instances or the splitting of the Token - * for parallel processing within a single process instance. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Token -{ - public enum TokenStatus - { - Created, Started, Stoped, Destroyed, Suspended - } - - /** - * Get the token status - */ - TokenStatus getTokenStatus(); - - /** - * Get the unique token identity - */ - String getTokenID(); - - /** - * Get the associated {@link ExecutionContext} - */ - ExecutionContext getExecutionContext(); - - /** - * Get the current {@link SequenceFlow} - */ - SequenceFlow getFlow(); - - /** - * Get the active {@link InputSet} - * @return null if the {@link Activity} does not define one - */ - InputSet getInputSet(); - - /** - * Get the active {@link OutputSet} - * @return null if the {@link Activity} does not define one - */ - OutputSet getOutputSet(); - - /** - * Create a schallow copy of this Token. - * - * The content in the {@link ExecutionContext} will be copied by reference. - */ - Token copyToken(); - - /** - * Merge this Token with another token. - */ - void mergeToken(Token token); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,93 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; + +/** + * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. + * + * By tracking how the Token traverses the Flow Objects, gets diverted through alternative paths, and gets split into parallel paths, the normal Sequence Flow should be + * completely definable. + * + * A Token will have a unique identity that can be used to separate multiple Tokens that may exist because of concurrent process instances or the splitting of the Token + * for parallel processing within a single process instance. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Token +{ + public enum TokenStatus + { + Created, Started, Stoped, Destroyed, Suspended + } + + /** + * Get the token status + */ + TokenStatus getTokenStatus(); + + /** + * Get the unique token identity + */ + String getTokenID(); + + /** + * Get the associated {@link ExecutionContext} + */ + ExecutionContext getExecutionContext(); + + /** + * Get the current {@link SequenceFlow} + */ + SequenceFlow getFlow(); + + /** + * Get the active {@link InputSet} + * @return null if the {@link Activity} does not define one + */ + InputSet getInputSet(); + + /** + * Get the active {@link OutputSet} + * @return null if the {@link Activity} does not define one + */ + OutputSet getOutputSet(); + + /** + * Create a schallow copy of this Token. + * + * The content in the {@link ExecutionContext} will be copied by reference. + */ + Token copyToken(); + + /** + * Merge this Token with another token. + */ + void mergeToken(Token token); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -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.jboss.bpm.runtime; - -//$Id$ - -import java.util.Set; - -import org.jboss.bpm.model.SequenceFlow; - -/** - * The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s - * along the {@link SequenceFlow}s in the {@link Process}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface TokenExecutor -{ - /** - * Get the set of active tokens - */ - Set<Token> getRunnableTokens(); - - /** - * True if there are active tokens - */ - boolean hasRunnableTokens(); - - /** - * Create a {@link Token} with an initial flow - */ - void create(Token token, SequenceFlow flow); - - /** - * Start a {@link Token} - */ - void start(Token token); - - /** - * Stop a {@link Token} - */ - void stop(Token token); - - /** - * Destroy a {@link Token} - */ - void destroy(Token token); - - /** - * Suspend a {@link Token} - */ - String suspend(Token token); - - /** - * Activate a {@link Token} - */ - Token activate(String tokenID); - - /** - * Move a given {@link Token} along a given flow. - */ - void move(Token token, SequenceFlow flow); -} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,83 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import java.util.Set; + +import org.jboss.bpm.model.internal.SequenceFlow; + +/** + * The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s + * along the {@link SequenceFlow}s in the {@link Process}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface TokenExecutor +{ + /** + * Get the set of active tokens + */ + Set<Token> getRunnableTokens(); + + /** + * True if there are active tokens + */ + boolean hasRunnableTokens(); + + /** + * Create a {@link Token} with an initial flow + */ + void create(Token token, SequenceFlow flow); + + /** + * Start a {@link Token} + */ + void start(Token token); + + /** + * Stop a {@link Token} + */ + void stop(Token token); + + /** + * Destroy a {@link Token} + */ + void destroy(Token token); + + /** + * Suspend a {@link Token} + */ + String suspend(Token token); + + /** + * Activate a {@link Token} + */ + Token activate(String tokenID); + + /** + * Move a given {@link Token} along a given flow. + */ + void move(Token token, SequenceFlow flow); +} Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal) Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,39 +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.jboss.bpm.runtime.internal; - -import java.io.Serializable; - -import org.jboss.bpm.model.internal.FlowObject; - -//$Id$ - -/** - * The generic base for handlers that can be associated with a {@link FlowObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Handler extends Serializable -{ - -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.runtime.internal; + +import java.io.Serializable; + +import org.jboss.bpm.model.internal.FlowObject; + +//$Id$ + +/** + * The generic base for handlers that can be associated with a {@link FlowObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Handler extends Serializable +{ + +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,47 +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.jboss.bpm.runtime.internal; - -import org.jboss.bpm.runtime.ExecutionHandler; -import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.SignalHandler; - - -//$Id$ - -/** - * A combined interface for execution aspects - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface HandlerSupport -{ - /** Get the associated ExecutionHandler */ - ExecutionHandler getExecutionHandler(); - - /** Get the associated SignalHandler */ - SignalHandler getSignalHandler(); - - /** Get the associated FlowHandler */ - FlowHandler getFlowHandler(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,47 @@ +/* + * 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.jboss.bpm.runtime.internal; + +import org.jboss.bpm.runtime.ExecutionHandler; +import org.jboss.bpm.runtime.FlowHandler; +import org.jboss.bpm.runtime.SignalHandler; + + +//$Id$ + +/** + * A combined interface for execution aspects + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface HandlerSupport +{ + /** Get the associated ExecutionHandler */ + ExecutionHandler getExecutionHandler(); + + /** Get the associated SignalHandler */ + SignalHandler getSignalHandler(); + + /** Get the associated FlowHandler */ + FlowHandler getFlowHandler(); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,41 +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.jboss.bpm.runtime.internal; - -import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.internal.PropertySupport; - -//$Id$ - -/** - * Mutable property support - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface MutablePropertySupport extends PropertySupport -{ - /** - * Add a property - */ - void addProperty(Property prop); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.runtime.internal; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.PropertySupport; + +//$Id$ + +/** + * Mutable property support + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface MutablePropertySupport extends PropertySupport +{ + /** + * Add a property + */ + void addProperty(Property prop); +} \ No newline at end of file Deleted: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -1,47 +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.jboss.bpm.runtime.internal; - -//$Id$ - -import org.jboss.bpm.model.Process; -import org.jboss.bpm.runtime.TokenExecutor; - -/** - * A RuntimeProcess add runtime behaviour to the {@link Process} To protect the engine from maligious user code it - * does not extend {@link Process} directly. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface RuntimeProcess -{ - /** - * Get the associated {@link Process} - */ - Process getProcess(); - - /** - * Get the {@link TokenExecutor} for this {@link Process} - */ - TokenExecutor getTokenExecutor(); -} \ No newline at end of file Copied: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java (from rev 1919, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java) =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -0,0 +1,47 @@ +/* + * 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.jboss.bpm.runtime.internal; + +//$Id$ + +import org.jboss.bpm.model.Process; +import org.jboss.bpm.runtime.TokenExecutor; + +/** + * A RuntimeProcess add runtime behaviour to the {@link Process} To protect the engine from maligious user code it + * does not extend {@link Process} directly. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface RuntimeProcess +{ + /** + * Get the associated {@link Process} + */ + Process getProcess(); + + /** + * Get the {@link TokenExecutor} for this {@link Process} + */ + TokenExecutor getTokenExecutor(); +} \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -49,10 +49,10 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.client.internal.EmbeddedBeansDeployer; -import org.jboss.bpm.model.BPMNElement; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.internal.BPMNElement; public abstract class AbstractAPITestCase extends TestCase { Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -58,41 +58,41 @@ import org.jboss.bpm.dialect.api10.model.JAXBStartEvent; import org.jboss.bpm.dialect.api10.model.JAXBTask; import org.jboss.bpm.dialect.api10.model.ObjectFactory; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.ComplexGateway; -import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.Constants; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.ExclusiveGateway; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.InclusiveGateway; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.IntermediateEvent; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageEventDetail; -import org.jboss.bpm.model.MessageFlow; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.ParallelGateway; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.ReceiveTask; -import org.jboss.bpm.model.SendTask; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SignalEventDetail; -import org.jboss.bpm.model.StartEvent; -import org.jboss.bpm.model.Task; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.ComplexGateway; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.ExclusiveGateway; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.InclusiveGateway; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.MessageEventDetail; +import org.jboss.bpm.model.internal.MessageFlow; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.ParallelGateway; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.ReceiveTask; +import org.jboss.bpm.model.internal.SendTask; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SignalEventDetail; +import org.jboss.bpm.model.internal.StartEvent; +import org.jboss.bpm.model.internal.Task; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.HandlerSupport; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.bpm.runtime.internal.HandlerSupport; /** * A JAXB marshaller for a Process Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -82,8 +82,8 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.SequenceFlow.ConditionType; -import org.jboss.bpm.runtime.Handler; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; +import org.jboss.bpm.runtime.internal.Handler; /** * A JAXB unmarshaller for a Process Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -27,12 +27,12 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; /** * An Assignment, which is used in the definition of attributes for {@link Process}, Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; /** * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -26,7 +26,7 @@ import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.ReceiveTask; +import org.jboss.bpm.model.internal.ReceiveTask; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -33,8 +33,8 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.ReceiveTask; import org.jboss.bpm.model.TaskBuilder; +import org.jboss.bpm.model.internal.ReceiveTask; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-18 10:55:41 UTC (rev 1920) @@ -33,7 +33,7 @@ <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry> Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-18 10:55:41 UTC (rev 1920) @@ -31,7 +31,7 @@ <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry> Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -29,26 +29,26 @@ import org.jboss.bpm.client.ExecutionManager; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Constants.AssignTime; import org.jboss.bpm.model.Process.ProcessStatus; import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.Expression; import org.jboss.bpm.model.internal.ExpressionEvaluator; import org.jboss.bpm.model.internal.ProcessImpl; import org.jboss.bpm.model.internal.RuntimeProcessImpl; import org.jboss.bpm.model.internal.SequenceFlowImpl; +import org.jboss.bpm.model.internal.StartEvent; import org.jboss.bpm.model.internal.TokenExecutorImpl; import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.ExecutionContext; -import org.jboss.bpm.runtime.RuntimeProcess; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.internal.DelegatingToken; import org.jboss.bpm.runtime.internal.MutableToken; +import org.jboss.bpm.runtime.internal.RuntimeProcess; import org.jboss.bpm.runtime.internal.TokenImpl; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -26,7 +26,6 @@ import java.util.Map; import org.jboss.bpm.client.DialectHandler; -import org.jboss.bpm.client.DialectRegistry; import org.jboss.bpm.client.ProcessManager; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -25,19 +25,19 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Process.ProcessStatus; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; import org.jboss.bpm.model.internal.FlowObjectImpl; import org.jboss.bpm.model.internal.ProcessImpl; -import org.jboss.bpm.runtime.HandlerSupport; -import org.jboss.bpm.runtime.RuntimeProcess; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.Token.TokenStatus; import org.jboss.bpm.runtime.internal.DelegatingToken; +import org.jboss.bpm.runtime.internal.HandlerSupport; import org.jboss.bpm.runtime.internal.MutableToken; +import org.jboss.bpm.runtime.internal.RuntimeProcess; /** * The RunnableToken implements the logic to move the token from one FlowObject to the next. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.ActivityBuilder; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.ActivityBuilder; /** * The ActivityBuilder can be used to build an {@link Activity} dynamically. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -29,18 +29,18 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.ExecutionContext; -import org.jboss.bpm.runtime.MutablePropertySupport; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; import org.jboss.bpm.runtime.internal.MutableToken; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.Expression; /** * An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -26,12 +26,12 @@ import javax.management.ObjectName; import org.jboss.bpm.client.ObjectNameFactory; -import org.jboss.bpm.model.BPMNElement; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.internal.BPMNElement; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.Task; import org.jboss.util.id.UID; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -24,9 +24,9 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.ComplexGateway; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.internal.ComplexGateway; +import org.jboss.bpm.model.internal.Expression; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -30,13 +30,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.MessageEventDetail; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.MessageEventDetail; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Entity; +import org.jboss.bpm.model.internal.Entity; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -24,15 +24,15 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.Event; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.IntermediateEvent; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.StartEvent; /** * The EventBuilder can be used to build an {@link Event} dynamically. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.EventDetail; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; /** * The base of all supported event details. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Event; +import org.jboss.bpm.model.internal.Event; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.ExclusiveGatewayDataBased; +import org.jboss.bpm.model.internal.ExclusiveGatewayDataBased; /** * A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -28,14 +28,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.ExclusiveGateway; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.ExclusiveGateway; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.internal.Expression; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.Attachments.Key; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.internal.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; /** * A Flow is a graphical line connecting two objects in a BPD. There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -27,18 +27,18 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NameNotUniqueException; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.MultipleInFlowSupport; -import org.jboss.bpm.model.MultipleOutFlowSupport; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SingleInFlowSupport; -import org.jboss.bpm.model.SingleOutFlowSupport; import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.MultipleInFlowSupport; +import org.jboss.bpm.model.internal.MultipleOutFlowSupport; +import org.jboss.bpm.model.internal.SingleInFlowSupport; +import org.jboss.bpm.model.internal.SingleOutFlowSupport; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -26,12 +26,12 @@ import java.util.List; import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; /** * A {@link Gate} associated with a {@link Gateway}. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,11 +23,11 @@ //$Id$ -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; /** * The GatewayBuilder can be used to build a {@link Gateway} dynamically. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -30,12 +30,12 @@ import java.util.Map; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.GraphicalElement; +import org.jboss.bpm.model.internal.GraphicalElement; /** * Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.runtime.Handler; +import org.jboss.bpm.runtime.internal.Handler; /** * Base implementation of all handlers Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.HandlerSupport; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.bpm.runtime.internal.HandlerSupport; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -30,14 +30,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.GraphicalElement; -import org.jboss.bpm.model.InclusiveGateway; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.GraphicalElement; +import org.jboss.bpm.model.internal.InclusiveGateway; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; -import org.jboss.bpm.model.ArtifactInput; -import org.jboss.bpm.model.InputSet; import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.model.internal.ArtifactInput; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; /** * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -28,11 +28,11 @@ import java.util.List; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.IntermediateEvent; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Event; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageEventDetail; import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.MessageEventDetail; /** * The message event detail Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -25,7 +25,7 @@ import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageFlow; +import org.jboss.bpm.model.internal.MessageFlow; /** * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to send and receive them. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -27,11 +27,11 @@ import javax.management.ObjectName; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -27,13 +27,13 @@ import org.jboss.bpm.client.MessageManager; import org.jboss.bpm.client.ObjectNameFactory; -import org.jboss.bpm.model.Entity; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.MessageBuilderFactory; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.Entity; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Participant; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.MultipleInFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.MultipleInFlowSupport; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.MultipleOutFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.MultipleOutFlowSupport; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; -import org.jboss.bpm.model.ArtifactOutput; -import org.jboss.bpm.model.OutputSet; import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.model.internal.ArtifactOutput; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; /** * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -28,11 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.ParallelGateway; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.ParallelGateway; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.internal.TokenImpl; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Entity; -import org.jboss.bpm.model.Participant; -import org.jboss.bpm.model.Role; +import org.jboss.bpm.model.internal.Entity; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.Role; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -25,8 +25,6 @@ import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; @@ -38,6 +36,8 @@ import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Constants.TaskType; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gateway; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; import org.jboss.bpm.runtime.SignalHandler; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -41,17 +41,17 @@ import org.jboss.bpm.ProcessTimeoutException; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.internal.ProcessManagerImpl; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.InputSet; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.OutputSet; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.StartEvent; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.StartEvent; import org.jboss.bpm.runtime.Attachments; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; /** * A Process is any Activity performed within a company or organization. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.PropertyBuilder; -import org.jboss.bpm.model.PropertyBuilderFactory; +import org.jboss.bpm.model.internal.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilderFactory; /** * A Factory for the {@link PropertyBuilder}. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilder; /** * A PropertyBuilder can be used to build a {@link Property} dynamically. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.Expression; /** * A Property, which is used in the definition of attributes for a Process and common activity attributes Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -32,9 +32,9 @@ import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.ReceiveTask; import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; +import org.jboss.bpm.model.internal.ReceiveTask; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Role; +import org.jboss.bpm.model.internal.Role; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -25,7 +25,7 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.runtime.TokenExecutor; -import org.jboss.bpm.runtime.RuntimeProcess; +import org.jboss.bpm.runtime.internal.RuntimeProcess; /** * A RuntimeProcess add runtime behaviour to the {@link Process} Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -27,9 +27,9 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SendTask; import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; +import org.jboss.bpm.model.internal.SendTask; import org.jboss.bpm.runtime.Token; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.SequenceFlow; /** * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -24,8 +24,8 @@ //$Id$ import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SignalEventDetail; import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.internal.SignalEventDetail; /** * The Signal event detail Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,10 +21,10 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.SingleInFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SingleInFlowSupport; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -21,10 +21,10 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.SingleOutFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SingleOutFlowSupport; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -32,17 +32,17 @@ import org.jboss.bpm.client.ExecutionManager; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SignalEventDetail; -import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Process.ProcessStatus; -import org.jboss.bpm.runtime.RuntimeProcess; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SignalEventDetail; +import org.jboss.bpm.model.internal.StartEvent; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.bpm.runtime.internal.RuntimeProcess; import org.jboss.bpm.runtime.internal.TokenImpl; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -25,7 +25,7 @@ import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SubProcess; +import org.jboss.bpm.model.internal.SubProcess; import org.jboss.bpm.runtime.SignalHandler; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.SupportingElement; +import org.jboss.bpm.model.internal.SupportingElement; /** * Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Task; import org.jboss.bpm.model.TaskBuilder; +import org.jboss.bpm.model.internal.Task; /** * The TaskBuilder can be used to dynamically build {@link Task}. Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,8 +23,8 @@ import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Task; import org.jboss.bpm.model.Constants.TaskType; +import org.jboss.bpm.model.internal.Task; import org.jboss.bpm.runtime.SignalHandler; //$Id$ Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -34,16 +34,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.internal.RunnableToken; -import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Process.ProcessStatus; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.RuntimeProcess; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.Token.TokenStatus; import org.jboss.bpm.runtime.internal.MutableToken; +import org.jboss.bpm.runtime.internal.RuntimeProcess; /** * The {@link FlowHandler} invokes the TokenExecutor to schedule Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.FlowObject; import org.jboss.bpm.runtime.ExecutionContext; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,11 +23,11 @@ //$Id$ -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.Token; /** Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,10 +23,10 @@ // $Id$ -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.PropertyBuilder; -import org.jboss.bpm.model.PropertyBuilderFactory; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilderFactory; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-18 10:55:41 UTC (rev 1920) @@ -23,10 +23,10 @@ // $Id$ -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.PropertyBuilder; -import org.jboss.bpm.model.PropertyBuilderFactory; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilderFactory; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-18 10:55:41 UTC (rev 1920) @@ -35,7 +35,7 @@ <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-18 10:55:41 UTC (rev 1920) @@ -39,7 +39,7 @@ <bean name="jBPMDialectHandlerXPDL21" class="org.jboss.bpm.dialect.xpdl21.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1919 - in jbossbpm/spec/branches/tdiesler/modules: api/src/main/java/org/jboss/bpm/client/internal and 17 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 06:40:03 -0400 (Mon, 18 Aug 2008) New Revision: 1919 Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java Removed: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Condition.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Entity.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Event.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Expression.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gate.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Participant.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Role.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Task.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/resources/jbpm-beans.xml jbossbpm/spec/branches/tdiesler/modules/dialects/stp/src/test/resources/jbpm-beans.xml jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/jbpm-beans.xml Log: Move API stuff to internal Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.client; - -//$Id$ - -import java.util.Map; - -/** - * A registry that Maps namespaceURI to dialect Id - * - * @author thomas.diesler(a)jboss.com - * @since 18-Jul-2008 - */ -public class DialectRegistry -{ - public static final Object BEAN_NAME = "jBPMDialectRegistry"; - - // Maps namespaceURI to dialect Id - private Map<String,String> registry; - - public void setRegistry(Map<String, String> registry) - { - this.registry = registry; - } - - public String getDialect(String nsURI) - { - return registry.get(nsURI); - } -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,87 +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.jboss.bpm.client; - -// $Id$ - -import java.util.HashMap; -import java.util.Map; - -import javax.management.ObjectName; - -import org.jboss.bpm.model.Process; -import org.jboss.bpm.runtime.Attachments; -import org.jboss.bpm.runtime.RuntimeProcess; - -/** - * The ExecutionManager executes processes - * - * @author thomas.diesler(a)jboss.com - * @since 18-Jun-2008 - */ -public abstract class ExecutionManager -{ - // The map of active runtime processes - private Map<ObjectName, RuntimeProcess> runtimeProcesses = new HashMap<ObjectName, RuntimeProcess>(); - - // Hide public constructor - protected ExecutionManager() - { - } - - /** - * Locate the ExecutionManager - */ - public static ExecutionManager locateExecutionManager() - { - ProcessEngine engine = ProcessEngine.locateProcessEngine(); - return engine.getExecutionManager(); - } - - /** - * Start the Process and return a Future - * - * @param proc The Process to start - * @param att The Attachments in the ExecutionContext - */ - public abstract void startProcess(Process proc, Attachments att); - - /** - * Get a {@link RuntimeProcess} for a given processID - * @return null if there is no such process - */ - public RuntimeProcess getRuntimeProcess(ObjectName procID) - { - return runtimeProcesses.get(procID); - } - - protected void addRuntimeProcess(RuntimeProcess rtProc) - { - ObjectName procID = rtProc.getProcess().getID(); - runtimeProcesses.put(procID, rtProc); - } - - protected void removeRuntimeProcess(RuntimeProcess rtProc) - { - runtimeProcesses.remove(rtProc.getProcess().getID()); - } -} Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,87 @@ +/* + * 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.jboss.bpm.client; + +// $Id$ + +import java.util.HashMap; +import java.util.Map; + +import javax.management.ObjectName; + +import org.jboss.bpm.model.Process; +import org.jboss.bpm.runtime.Attachments; +import org.jboss.bpm.runtime.internal.RuntimeProcess; + +/** + * The ExecutionManager executes processes + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class ExecutionManager +{ + // The map of active runtime processes + private Map<ObjectName, RuntimeProcess> runtimeProcesses = new HashMap<ObjectName, RuntimeProcess>(); + + // Hide public constructor + protected ExecutionManager() + { + } + + /** + * Locate the ExecutionManager + */ + public static ExecutionManager locateExecutionManager() + { + ProcessEngine engine = ProcessEngine.locateProcessEngine(); + return engine.getExecutionManager(); + } + + /** + * Start the Process and return a Future + * + * @param proc The Process to start + * @param att The Attachments in the ExecutionContext + */ + public abstract void startProcess(Process proc, Attachments att); + + /** + * Get a {@link RuntimeProcess} for a given processID + * @return null if there is no such process + */ + public RuntimeProcess getRuntimeProcess(ObjectName procID) + { + return runtimeProcesses.get(procID); + } + + protected void addRuntimeProcess(RuntimeProcess rtProc) + { + ObjectName procID = rtProc.getProcess().getID(); + runtimeProcesses.put(procID, rtProc); + } + + protected void removeRuntimeProcess(RuntimeProcess rtProc) + { + runtimeProcesses.remove(rtProc.getProcess().getID()); + } +} Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/MessageManager.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -30,12 +30,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.Task; /** * The ProcessEngine sends mesages through the MessageManager. A {@link Message} has an ID and is targeted to a Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,74 +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.jboss.bpm.client; - -// $Id$ - -import java.util.Hashtable; - -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - -/** - * A simple factory for creating safe object names. - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-May-2006 - */ -public class ObjectNameFactory -{ - public static ObjectName create(String name) - { - try - { - return new ObjectName(name); - } - catch (MalformedObjectNameException e) - { - throw new Error("Invalid ObjectName: " + name + "; " + e); - } - } - - public static ObjectName create(String domain, String key, String value) - { - try - { - return new ObjectName(domain, key, value); - } - catch (MalformedObjectNameException e) - { - throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); - } - } - - public static ObjectName create(String domain, Hashtable<String, String> table) - { - try - { - return new ObjectName(domain, table); - } - catch (MalformedObjectNameException e) - { - throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); - } - } -} Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ObjectNameFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,74 @@ +/* + * 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.jboss.bpm.client; + +// $Id$ + +import java.util.Hashtable; + +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +/** + * A simple factory for creating safe object names. + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class ObjectNameFactory +{ + public static ObjectName create(String name) + { + try + { + return new ObjectName(name); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + name + "; " + e); + } + } + + public static ObjectName create(String domain, String key, String value) + { + try + { + return new ObjectName(domain, key, value); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); + } + } + + public static ObjectName create(String domain, Hashtable<String, String> table) + { + try + { + return new ObjectName(domain, table); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); + } + } +} Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -40,6 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.EngineShutdownException; +import org.jboss.bpm.client.internal.DialectRegistry; import org.jboss.bpm.model.Process; import org.jboss.bpm.runtime.Attachments; import org.w3c.dom.Document; Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/client/internal/DialectRegistry.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.client.internal; + +//$Id$ + +import java.util.Map; + +/** + * A registry that Maps namespaceURI to dialect Id + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jul-2008 + */ +public class DialectRegistry +{ + public static final Object BEAN_NAME = "jBPMDialectRegistry"; + + // Maps namespaceURI to dialect Id + private Map<String,String> registry; + + public void setRegistry(Map<String, String> registry) + { + this.registry = registry; + } + + public String getDialect(String nsURI) + { + return registry.get(nsURI); + } +} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,112 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * An activity is a generic term for work that a company or organization performs via business processes. An activity can be atomic or non-atomic (compound). The types - * of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Activity extends FlowObject, PropertySupport -{ - /** - * The ActivityType MUST be of type Task or Sub-Process. - */ - enum ActivityType - { - Task, SubProcess - } - - /** - * The Activity LoopType - */ - enum LoopType - { - None, Standard, MultiInstance - } - - /** - * The ActivityType MUST be of type Task or Sub-Process. - */ - ActivityType getActivityType(); - - /** - * One or more Performers MAY be entered. The Performer attribute defines the - * resource that will perform or will be responsible for the activity. The Performer - * entry could be in the form of a specific individual, a group, an organization role - * or position, or an organization. - */ - List<String> getPerformers(); - - /** - * The InputSets attribute defines the data requirements for input to the Activity. - * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the - * Activity to be performed (if it has first been instantiated by the appropriate signal - * arriving from an incoming Sequence Flow) - */ - List<InputSet> getInputSets(); - - /** - * The OutputSets attribute defines the data requirements for output from the - * activity. Zero or more OutputSets MAY be defined. At the completion of the - * activity, only one of the OutputSets may be produced--It is up to the - * implementation of the activity to determine which set will be produced. However, - * the IORules attribute MAY indicate a relationship between an OutputSet and an - * InputSet that started the activity. - */ - List<OutputSet> getOutputSets(); - - /** - * The IORules attribute is a collection of expressions, each of which specifies the - * required relationship between one input and one output. That is, if the activity is - * instantiated with a specified input, that activity shall complete with the specified - * output. - */ - List<Expression> getIORules(); - - /** - * The default value is 1. The value MUST NOT be less than 1. This attribute - * defines the number of Tokens that must arrive before the activity can begin. - */ - int getStartQuantity(); - - /** - * The default value is 1. The value MUST NOT be less than 1. This attribute - * defines the number of Tokens that must be generated from the activity. This - * number of Tokens will be sent down any outgoing Sequence Flow (assuming any - * Sequence Flow Conditions are satisfied). - */ - int getCompletionQuantity(); - - /** - * LoopType is an attribute and is by default None, but MAY be set to Standard or - * MultiInstance. A Task of type Receive that has its Instantiate attribute set to True MUST NOT - * have a Standard or MultiInstance LoopType. - */ - LoopType getLoopType(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,64 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The ActivityBuilder can be used to build an {@link Activity} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ActivityBuilder extends ProcessBuilder -{ - /** - * Add an {@link InputSet} - */ - ActivityBuilder addInputSet(); - - /** - * Add an {@link Property} Input - */ - ActivityBuilder addPropertyInput(String name, String value); - - /** - * Add an {@link OutputSet} - */ - ActivityBuilder addOutputSet(); - - /** - * Add an {@link Property} Output - */ - ActivityBuilder addPropertyOutput(String name, String value); - - /** - * Add an IORule {@link Expression} - */ - ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang); - - /** - * Add an activity property - */ - ActivityBuilder addProperty(String name, String value); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,48 +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.jboss.bpm.model; - -//$Id$ - - -/** - * An ArtifactInput, which is used in the definition of attributes for InputSet - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Artifact extends GraphicalElement -{ - /** - * Defines the type of an {@link Artifact} - */ - enum ArtifactType - { - DataObject, Group, Annotation - }; - - /** - * The ArtifactType MAY be set to DataObject, Group, or Annotation. - * The ArtifactType list MAY be extended to include new types. - */ - ArtifactType getArtifactType(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - - -/** - * An ArtifactInput, which is used in the definition of attributes for {@link InputSet} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ArtifactInput extends Artifact -{ - /** - * This attribute identifies an Artifact that will be used as an input to an activity. The - * identified Artifact will be part of an InputSet for an activity. - */ - Artifact getArtifactRef(); - - /** - * The default value for this attribute is True. This means that the Input is required for - * an activity to start. If set to False, then the activity MAY start within the input if it - * is available, but MAY accept the input (more than once) after the activity has - * started. An InputSet may have a some of ArtifactInputs that have this attribute set - * to True and some that are set to False. - */ - boolean isRequireForStart(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - - -/** - * An ArtifactOutput, which is used in the definition of attributes for {@link OutputSet} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ArtifactOutput extends Artifact -{ - /** - * This attribute identifies an Artifact that will be used as an output to an activity. The - * identified Artifact will be part of an OutputSet for an activity. - */ - Artifact getArtifactRef(); - - /** - * The default value for this attribute is True. This means that the Output will be - * produced when an activity has been completed. If set to False, then the activity - * MAY produce the output (more than once) before it has completed. An OutputSet - * may have a some of ArtifactOutputs that have this attribute set to True and some that - * are set to False. - */ - boolean isProduceAtCompletion(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,62 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Constants.AssignTime; - -//$Id$ - -/** - * An Assignment, which is used in the definition of attributes for {@link Process}, - * {@link Activity}, {@link Event}, {@link Gateway}, and {@link Gate}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Assignment extends SupportingElement -{ - /** - * The target for the Assignment MUST be a Property of the Process or the activity - * itself. - */ - Property getTo(); - - /** - * The Expression MUST be made up of a combination of Values, Properties, and - * Attributes, which are separated by operators such as add or multiply. The expression - * language is defined in the ExpressionLanguage attribute of the Business Process - * Diagram - */ - Expression getFrom(); - - /** - * An Assignment MAY have a AssignTime setting. If the Object is an activity (Task, - * Sub-Process, or Process), then the Assignment MUST have an AssignTime. - * A value of Start means that the assignment SHALL occur at the start of the activity. - * This can be used to assign the higher-level (global) Properties of the Process to the - * (local) Properties of the activity as an input to the activity. - * A value of End means that the assignment SHALL occur at the end of the activity. - * This can be used to assign the (local) Properties of the activity to the higher-level - * (global) Properties of the Process as an output to the activity. - */ - AssignTime getAssignTime(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,44 +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.jboss.bpm.model; - -//$Id$ - -import java.io.Serializable; - -import javax.management.ObjectName; - -/** - * The parrent of all BPMN elements - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface BPMNElement extends Serializable -{ - public static final String ID_DOMAIN = "jboss.bpm"; - - /** - * Get the ID of this element - */ - ObjectName getID(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Cancel event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface CancelEventDetail extends EventDetail -{ - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Compensate event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface CompensateEventDetail extends EventDetail -{ - /** - * For an End Event: - * - * If the Result is a Compensation, then the Activity that needs to be compensated MAY be supplied. - * If an Activity is not supplied, then the Event broadcast to all completed activities in the Process Instance. - * - * For an Intermediate Event within Normal Flow: If the Trigger is a Compensation, then the Activity that needs - * to be compensated MAY be supplied. If an Activity is not supplied, then the Event broadcast to all completed - * activities in the Process Instance. This “throws” the compensation. - * - * For an Intermediate Event attached to the boundary of an Activity: This Event “catches” the compensation. - * No further information is required. The Activity the Event is attached to will provide the Id necessary - * to match the compensation event with the event that “threw” the compensation or the compensation will be a - * broadcast. - */ - Activity getActivityRef(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.model; - -// $Id$ - -/** - * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex - * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers - * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ComplexGateway extends Gateway -{ - /** - * If there are multiple incoming Sequence Flow, an IncomingCondition expression - * MUST be set by the modeler. This will consist of an expression that can reference - * Sequence Flow names and/or Process Properties (Data). - */ - Expression getIncommingCondition(); - - /** - * If there are multiple outgoing Sequence Flow, an OutgoingCondition expression - * MUST be set by the modeler. This will consist of an expression that can reference - * (outgoing) Sequence Flow Ids and/or Process Properties (Data). - */ - Expression getOutgoingCondition(); - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Condition.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Condition.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Condition.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,48 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Condition, which is used in the definition of attributes for Start Event and - * Intermediate Event - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Condition extends SupportingElement -{ - /** - * Name is an optional attribute that is text description of the Condition. If a Name is - * not entered, then a ConditionExpression MUST be entered - */ - String getName(); - - /** - * A ConditionExpression MAY be entered. In some cases the Condition itself will be - * stored and maintained in a separate application (e.g., a Rules Engine). If a ConditionExpression - * is not entered, then a Name MUST be entered - */ - Expression getConditionExpression(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,39 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Conditional event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ConditionalEventDetail extends EventDetail -{ - /** - * If the Trigger is Conditional, then a Condition MUST be entered. - */ - Condition getConditionRef(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,59 +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.jboss.bpm.model; - -//$Id$ - -/** - * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence - * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model, - * although they both affect the performance of activities within a Process. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ConnectingObject extends GraphicalElement -{ - /** - * Name is an optional attribute that is text description of the Connecting Object. - */ - String getName(); - - /** - * SourceRef is an attribute that identifies which Graphical Element the Connecting - * Object is connected from. Note: there are restrictions as to what objects Sequence - * Flow and Message Flow can connect. - */ - FlowObject getSourceRef(); - - /** - * TargetRef is an attribute that identifies which Graphical Element the Connecting - * Object is connected to. Note: there are restrictions as to what objects Sequence - * Flow and Message Flow can connect. - */ - FlowObject getTargetRef(); - - /** - * Get the required target name - */ - String getTargetName(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,70 +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.jboss.bpm.model; - -//$Id$ - - -/** - * A Process is any {@link Activity} performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Constants -{ - - public enum AssignTime - { - Start, End - } - - /** - * Defines the type of an {@link Event} - */ - public enum EventDetailType - { - Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate - } - - public enum ExpressionLanguage - { - MVEL, String, Object - } - - /** - * The GatewayType - * - */ - public enum GatewayType - { - Exclusive, Inclusive, Complex, Parallel - } - - /** - * The TaskType - */ - public enum TaskType - { - Service, Receive, Send, User, Script, Manual, Reference, None - } -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,73 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.Event; + +//$Id$ + + +/** + * A Process is any {@link Activity} performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Constants +{ + + public enum AssignTime + { + Start, End + } + + /** + * Defines the type of an {@link Event} + */ + public enum EventDetailType + { + Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate + } + + public enum ExpressionLanguage + { + MVEL, String, Object + } + + /** + * The GatewayType + * + */ + public enum GatewayType + { + Exclusive, Inclusive, Complex, Parallel + } + + /** + * The TaskType + */ + public enum TaskType + { + Service, Receive, Send, User, Script, Manual, Reference, None + } +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,54 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - - -/** - * DataObject, which extends common Artifact - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface DataObject extends Artifact -{ - /** - * Name is an attribute that is text description of the object. - */ - String getName(); - - /** - * State is an optional attribute that indicates the impact the Process has had on the Data - * Object. Multiple Data Objects with the same name MAY share the same state within one Process. - */ - String getState(); - - /** - * Modeler-defined Properties MAY be added to a Data Object. The fully delineated name of these - * properties are “<process name>.<task name>.<property name>” - * (e.g., “Add Customer.Review Credit Report.Score”). - */ - List<Property> getProperties(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -/** - * As the name implies, the End Event indicates where a Process will end. - * - * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. - * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape. - * End Event Results are Message, Error, Compensation, Link, and Multiple. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EndEvent extends Event, SingleInFlowSupport -{ - /** - * Result defines the type of result expected for an End Event. - * Of the set of EventDetailTypes only six can be applied to an - * End Event: Message, Error, Cancel, Compensation, Signal, and Terminate. - * - * If there is no EventDetail defined, then this is considered a None End Event. - * If there is more than one EventDetail defined, this is considered a Multiple EndEvent. - */ - List<EventDetail> getResult(); - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Entity.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Entity.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * An Entity, which is used in the definition of attributes for a {@link Participant} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Entity extends SupportingElement -{ - /** - * Name is an attribute that is text description of the Entity. - */ - String getName(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,51 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Error event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface ErrorEventDetail extends EventDetail -{ - /** - * For an End Event: - * If the Result is an Error, then the ErrorCode MUST be supplied.This “throws” the - * error. - * - * For an Intermediate Event within Normal Flow: - * If the Trigger is an Error, then the ErrorCode MUST be entered. This “throws” - * the error. - * - * For an Intermediate Event attached to the boundary of an Activity: - * If the Trigger is an Error, then the ErrorCode MAY be entered. This Event - * “catches” the error. If there is no ErrorCode, then any error SHALL trigger the - * Event. If there is an ErrorCode, then only an error that matches the ErrorCode - * SHALL trigger the Event. - */ - String getErrorCode(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Event.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Event.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,44 +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.jboss.bpm.model; - - -//$Id$ - -/** - * An Event is something that “happens” during the course of a business process. - * - * These Events affect the flow of the Process and usually have a cause or an impact. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Event extends FlowObject -{ - /** - * Defines the type of an {@link Event} - */ - enum EventType - { - Start, End, Intermediate - }; -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,50 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.model.Signal.SignalType; - -/** - * The EventBuilder can be used to build an {@link Event} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EventBuilder extends ProcessBuilder -{ - /** - * Add an event detail to the last added {@link Event} - */ - EventBuilder addEventDetail(Constants.EventDetailType detailType); - - /** - * Add a signal ref to the last added {@link EventDetail} - */ - EventBuilder addSignalRef(SignalType signalType, String signalMessage); - - /** - * Add a message ref to the last added {@link EventDetail} - */ - EventBuilder addMessageRef(String msgName); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,52 @@ +/* + * 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.jboss.bpm.model; + +//$Id$ + +import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; + +/** + * The EventBuilder can be used to build an {@link Event} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EventBuilder extends ProcessBuilder +{ + /** + * Add an event detail to the last added {@link Event} + */ + EventBuilder addEventDetail(Constants.EventDetailType detailType); + + /** + * Add a signal ref to the last added {@link EventDetail} + */ + EventBuilder addSignalRef(SignalType signalType, String signalMessage); + + /** + * Add a message ref to the last added {@link EventDetail} + */ + EventBuilder addMessageRef(String msgName); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,44 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Constants.EventDetailType; - -//$Id$ - -/** - * The base of all supported event details. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface EventDetail extends SupportingElement -{ - /** - * The EventDetailType attribute defines the type of trigger expected for an Event. The - * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate, - * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each - * have a subset of the EventDetailTypes that can be used. - * The EventDetailType list MAY be extended to include new types. - */ - EventDetailType getEventDetailType(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,57 +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.jboss.bpm.model; - - -//$Id$ - -/** - * Exclusive Gateways (Decisions) are locations within a business process where the Sequence Flow can take two or more - * alternative paths. This is basically the “fork in the road” for a process. For a given performance (or instance) of the - * process, only one of the paths can be taken (this should not be confused with forking of paths—refer to “Forking Flow”) - * - * A Decision is not an activity from the business process perspective, but is a type of Gateway that controls - * the Sequence Flow between activities. It can be thought of as a question that is asked at that point in the Process. The - * question has a defined set of alternative answers (Gates). Each Decision Gate is associated with a condition expression - * found within an outgoing Sequence Flow. When a Gate is chosen during the performance of the Process, the - * corresponding Sequence Flow is then chosen. A Token arriving at the Decision would be directed down the appropriate - * path, based on the chosen Gate. - * - * The Exclusive Decision has two or more outgoing Sequence Flow, but only one of them may be taken during the - * performance of the Process. Thus, the Exclusive Decision defines a set of alternative paths for the Token to take as it - * traverses the Flow. There are two types of Exclusive Decisions: Data-Based and Event-Based. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGateway extends Gateway -{ - enum ExclusiveType - { - Data, Event - } - - /** - * ExclusiveType is by default Data. The ExclusiveType MAY be set to Event. - */ - ExclusiveType getExclusiveType(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,55 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based - * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing - * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken - * (hence the name Data-Based). - * - * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will - * determine the Sequence Flow that will be taken. Since the behavior of this Gateway is exclusive, any other conditions that - * may actually be TRUE will be ignored--only one Gate can be chosen. One of the Gates may be “default” (or otherwise), - * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be - * chosen—along with its associated Sequence Flow. - * - * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure - * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However, - * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed - * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid - * Gate at runtime is an invalid model. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGatewayDataBased extends ExclusiveGateway -{ - /** - * A Default Gate MAY be specified - */ - Gate getDefaultGate(); - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,53 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The inclusion of Event-Based Exclusive Gateways is the result of recent developments in the handling of distributed - * systems (e.g., with pi-calculus) and was derived from the BPEL4WS pick. On the input side, their behavior is the same as - * a Data-Based Exclusive Gateway (see “Data-Based” on page 73). On the output side, the basic idea is that this Decision - * represents a branching point in the process where the alternatives are based on events that occurs at that point in the - * Process, rather than the evaluation of expressions using process data. A specific event, usually the receipt of a message, - * determines which of the paths will be taken. For example, if a company is waiting for a response from a customer, they - * will perform one set of activities if the customer responds “Yes” and another set of activities if the customer responds - * “No.” The customer’s response determines which path is taken. The identity of the Message determines which path is taken. - * That is, the “Yes” Message and the “No” message are different messages—they are not the same message with different values - * within a property of the Message. The receipt of the message can be modeled with a Task of TaskType Receive or an - * Intermediate Event with a Message Trigger. In addition to Messages, other Triggers for Intermediate Events can be used, such as Timers. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExclusiveGatewayEventBased extends ExclusiveGateway -{ - /** - * Event-Based Gateways can be defined as the instantiation mechanism for the - * Process with the Instantiate attribute. This attribute MAY be set to true if the - * Gateway is the first element after the Start Event or a starting Gateway if there is - * no Start Event (i.e., there are no incoming Sequence Flow). - */ - boolean isInstantiate(); - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Expression.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,55 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Constants.ExpressionLanguage; - -//$Id$ - -/** - * An Expression, which is used in the definition of attributes for {@link StartEvent}, - * {@link IntermediateEvent}, {@link Activity}, {@link ComplexGateway}, and {@link SequenceFlow} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Expression extends SupportingElement -{ - /** - * An ExpressionBody MUST be entered to provide the text of the expression, which - * will be written in the language defined by the ExpressionLanguage attribute. - */ - String getExpressionBody(); - - /** - * An ExpressionValue MAY be available if the Expression is used as a {@link Property} value. - */ - Object getExpressionValue(); - - /** - * A Language MUST be provided to identify the language of the ExpressionBody. - * The value of the ExpressionLanguage should follow the naming conventions for the - * version of the specified language. - */ - ExpressionLanguage getExpressionLanguage(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,51 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * A Flow Object is one of the set of following graphical objects: {@link Event}, {@link Activity}, and {@link Gateway}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface FlowObject extends GraphicalElement -{ - /** - * Get the unique name. - */ - String getName(); - - /** - * Get the associated Process - */ - Process getProcess(); - - /** - * One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the - * Assignment SHALL be performed as defined by the AssignTime attribute. - */ - List<Assignment> getAssignments(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gate.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gate.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gate.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,75 +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.jboss.bpm.model; - -import java.util.List; - - - -//$Id$ - -/** - * There MAY be zero or more Gates (except where noted below). Zero Gates are - * allowed if the Gateway is last object in a Process flow and there are no Start or - * End Events for the Process. If there are zero or only one incoming Sequence - * Flow, then there MUST be at least two Gates. - * - * For Exclusive Data-Based Gateways - * When two Gates are required, one of them MAY be the DefaultGate. - * - * For Exclusive Event-Based Gateways - * There MUST be two or more Gates. (Note that this type of Gateway does not act - * only as a Merge--it is always a Decision, at least.) - * - * For Inclusive Gateways - * When two Gates are required, one of them MAY be the DefaultGate. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Gate extends SupportingElement -{ - /** - * Each Gate MUST have an associated (outgoing) Sequence Flow. - * - * For Exclusive Event-Based, Complex, and Parallel Gateways: - * The Sequence Flow MUST have its Condition attribute set to None (there is not an - * evaluation of a condition expression). - * - * For Exclusive Data-Based, and Inclusive Gateways: - * The Sequence Flow MUST have its Condition attribute set to Expression and - * MUST have a valid ConditionExpression. The ConditionExpression MUST be - * unique for all the Gates within the Gateway. If there is only one Gate (i.e., the - * Gateway is acting only as a Merge), then Sequence Flow MUST have its Condition - * set to None. - * - * For DefaultGates: - * The Sequence Flow MUST have its Condition attribute set to Otherwise - */ - SequenceFlow getOutgoingSequenceFlow(); - - /** - * One or more assignment expressions MAY be made for each Gate. The - * Assignment SHALL be performed when the Gate is selected. - */ - List<Assignment> getAssignments(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,75 +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.jboss.bpm.model; - -import java.util.List; - -import org.jboss.bpm.model.Constants.GatewayType; - -//$Id$ - -/** - * Gateways are modeling elements that are used to control how Sequence Flow interact as they converge and diverge within - * a Process. If the flow does not need to be controlled, then a Gateway is not needed. The term “Gateway” implies that - * there is a gating mechanism that either allows or disallows passage through the Gateway--that is, as Tokens arrive at a - * Gateway, they can be merged together on input and/or split apart on output as the Gateway mechanisms are invoked. To - * be more descriptive, a Gateway is actually a collection of “Gates.” - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Gateway extends FlowObject, MultipleInFlowSupport -{ - /** - * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway, - * both for incoming and outgoing Sequence Flow - */ - GatewayType getGatewayType(); - - /** - * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End - * Events for the Process. If there are zero or only one incoming Sequence Flow, then there MUST be at least two Gates. - * - * For Exclusive Data-Based Gateways. - * When two Gates are required, one of them MAY be the DefaultGate. - * - * For Exclusive Event-Based Gateways. - * There MUST be two or more Gates. (Note that this type of Gateway does not act only as a Merge--it is always a Decision, at - * least.) - * - * For Inclusive Gateways. - * When two Gates are required, one of them MAY be the DefaultGate. - */ - List<Gate> getGates(); - - /** - * Get the optional default gate - * @return null if there is none - */ - Gate getDefaultGate(); - - /** - * Get the gate for the given target name - * @return null if there is none - */ - Gate getGateByTargetName(String targetName); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,40 +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.jboss.bpm.model; - - -//$Id$ - -/** - * The GatewayBuilder can be used to build a {@link Gateway} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface GatewayBuilder extends ProcessBuilder -{ - GatewayBuilder addDefaultGate(String targetName); - - GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody); - - GatewayBuilder addGate(String targetName); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,42 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.Gateway; + + +//$Id$ + +/** + * The GatewayBuilder can be used to build a {@link Gateway} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface GatewayBuilder extends ProcessBuilder +{ + GatewayBuilder addDefaultGate(String targetName); + + GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody); + + GatewayBuilder addGate(String targetName); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.model; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface GraphicalElement extends BPMNElement -{ -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,43 +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.jboss.bpm.model; - -//$Id$ - -/** - * This Decision represents a branching point where Alternatives are based on conditional expressions contained within - * outgoing Sequence Flow. However, in this case, the True evaluation of one condition expression does not exclude the - * evaluation of other condition expressions. All Sequence Flow with a True evaluation will be traversed by a Token. In - * some sense it’s like a grouping of related independent Binary (Yes/No) Decisions--and can be modeled that way. Since - * each path is independent, all combinations of the paths may be taken, from zero to all. However, it should be - * designed so that at least one path is taken. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface InclusiveGateway extends Gateway -{ - /** - * A Default Gate MAY be specified - */ - Gate getDefaultGate(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,52 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.runtime.MutablePropertySupport; - -/** - * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface InputSet extends SupportingElement, MutablePropertySupport -{ - /** - * Zero or more ArtifactInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. An ArtifactInput is an Artifact, usually a Data - * Object. - */ - List<ArtifactInput> getArtifactInputs(); - - /** - * Zero or more PropertyInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. - */ - List<Property> getProperties(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. - * - * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate - * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, - * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface IntermediateEvent extends Event, SingleInFlowSupport, SingleOutFlowSupport -{ -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Link event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface LinkEventDetail extends EventDetail -{ - /** - * If the Trigger is a Link, then the Name MUST be entered. - */ - String getName(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Manual Task is a Task that is expected to be performed without the aid of any business process execution engine or any - * application. An example of this could be a telephone technician installing a telephone at a customer location. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ManualTask extends Task -{ -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,65 +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.jboss.bpm.model; - - - -//$Id$ - -/** - * A Message, which is used in the definition of attributes for a {@link StartEvent}, - * {@link EndEvent}, {@link IntermediateEvent}, {@link Task}, and {@link MessageFlow} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Message extends SupportingElement, PropertySupport -{ - /** - * Specifies the technology that will be used to send or receive the - * message. - */ - public enum Implementation - { - WebService, Other, Unspecified - } - - /** - * Name is an attribute that is text description of the Message. - */ - String getName(); - - /** - * This defines the source of the Message. - */ - Participant getFromRef(); - - /** - * Get the source of the source {@link FlowObject} for this message - */ - FlowObject getFrom(); - - /** - * This defines the target of the Message. - */ - Participant getToRef(); -} Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Message.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,75 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.MessageFlow; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.PropertySupport; +import org.jboss.bpm.model.internal.StartEvent; +import org.jboss.bpm.model.internal.SupportingElement; +import org.jboss.bpm.model.internal.Task; + + + +//$Id$ + +/** + * A Message, which is used in the definition of attributes for a {@link StartEvent}, + * {@link EndEvent}, {@link IntermediateEvent}, {@link Task}, and {@link MessageFlow} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Message extends SupportingElement, PropertySupport +{ + /** + * Specifies the technology that will be used to send or receive the + * message. + */ + public enum Implementation + { + WebService, Other, Unspecified + } + + /** + * Name is an attribute that is text description of the Message. + */ + String getName(); + + /** + * This defines the source of the Message. + */ + Participant getFromRef(); + + /** + * Get the source of the source {@link FlowObject} for this message + */ + FlowObject getFrom(); + + /** + * This defines the target of the Message. + */ + Participant getToRef(); +} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,66 +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.jboss.bpm.model; - -import javax.management.ObjectName; - - -//$Id$ - -/** - * A MessageBuilder can be used to build a {@link Message} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MessageBuilder -{ - /** - * Create a {@link Message} with a given name - */ - MessageBuilder newMessage(String msgName); - - /** - * Add a message destination - */ - MessageBuilder addToRef(ObjectName toRef); - - /** - * Add a message source - */ - MessageBuilder addFromRef(ObjectName fromRef); - - /** - * Add a message property - */ - MessageBuilder addProperty(String name, Object value); - - /** - * Add a message property - */ - MessageBuilder addProperty(String name, Object value, boolean isCorrelation); - - /** - * Get the Message - */ - Message getMessage(); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,67 @@ +/* + * 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.jboss.bpm.model; + +import javax.management.ObjectName; + + + +//$Id$ + +/** + * A MessageBuilder can be used to build a {@link Message} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MessageBuilder +{ + /** + * Create a {@link Message} with a given name + */ + MessageBuilder newMessage(String msgName); + + /** + * Add a message destination + */ + MessageBuilder addToRef(ObjectName toRef); + + /** + * Add a message source + */ + MessageBuilder addFromRef(ObjectName fromRef); + + /** + * Add a message property + */ + MessageBuilder addProperty(String name, Object value); + + /** + * Add a message property + */ + MessageBuilder addProperty(String name, Object value, boolean isCorrelation); + + /** + * Get the Message + */ + Message getMessage(); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,64 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link MessageBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class MessageBuilderFactory -{ - /** The bean name - jBPMMessageBuilderFactory */ - public static final String BEAN_NAME = "jBPMMessageBuilderFactory"; - - // Hide the constructor - protected MessageBuilderFactory() - { - } - - /** - * Get a MessageBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static MessageBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (MessageBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link MessageBuilder}. - */ - public abstract MessageBuilder newMessageBuilder(); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.model; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.util.KernelLocator; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; + +/** + * A Factory for the {@link MessageBuilder}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class MessageBuilderFactory +{ + /** The bean name - jBPMMessageBuilderFactory */ + public static final String BEAN_NAME = "jBPMMessageBuilderFactory"; + + // Hide the constructor + protected MessageBuilderFactory() + { + } + + /** + * Get a MessageBuilderFactory instance. + */ + @SuppressWarnings("deprecation") + public static MessageBuilderFactory newInstance() + { + // Make sure the engine is bootstrapped + ProcessEngine.locateProcessEngine(); + Kernel kernel = KernelLocator.getKernel(); + KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); + return (MessageBuilderFactory)entry.getTarget(); + } + + /** + * Get a {@link MessageBuilder}. + */ + public abstract MessageBuilder newMessageBuilder(); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,44 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Message event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface MessageEventDetail extends EventDetail -{ - /** - * If the EventDetailType is a MessageRef, then the a Message MUST be supplied. - */ - Message getMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the - * message. A Web service is the default technology. - */ - Message.Implementation getImplementation(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,42 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to - * send and receive them. In BPMN, two separate Pools in the Diagram will represent the two entities. - * - * Message Flow MUST connect two Pools, either to the Pools themselves or to Flow Objects within the Pools. They cannot - * connect two objects within the same Pool. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MessageFlow extends ConnectingObject -{ - /** - * MessageRef is an optional attribute that identifies the Message that is being sent. - */ - Message getMessageRef(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,40 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MultipleInFlowSupport -{ - /** - * Get the list of in flows - */ - List<ConnectingObject> getInFlows(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,40 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface MultipleOutFlowSupport -{ - /** - * Get the list of out flows - */ - List<ConnectingObject> getOutFlows(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,52 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -import org.jboss.bpm.runtime.MutablePropertySupport; - -/** - * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface OutputSet extends SupportingElement, MutablePropertySupport -{ - /** - * Zero or more ArtifactOutputs MAY be defined for each OutputSet. For the - * combination of ArtifactOutputs and PropertyOutputs, there MUST be at least one - * item defined for the OutputSet. An ArtifactOutput is an {@link Artifact}, - * usually a {@link DataObject}. - */ - List<ArtifactOutput> getArtifactOutputs(); - - /** - * Zero or more PropertyInputs MAY be defined for each InputSet. For the - * combination of ArtifactInputs and PropertyInputs, there MUST be at least one - * item defined for the InputSet. - */ - List<Property> getProperties(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * Parallel Gateway is required when two or more Activities need to be executed in parallel. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ParallelGateway extends Gateway -{ - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Participant.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Participant.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,55 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService - * - * TODO: Add javadoc links for Pool, WebService - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Participant extends SupportingElement -{ - public enum ParticipantType - { - Role, Entity - } - - /** - * Get the type of this participant - */ - ParticipantType getParticipantType(); - - /** - * If the ParticipantType = Role, then a Role MUST be identified. - */ - Role getRoleRef(); - - /** - * If the ParticipantType = Entity, then an Entity MUST be identified. - */ - Entity getEntityRef(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,159 +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.jboss.bpm.model; - -//$Id: MultipleInFlowSupport.java 1627 2008-07-14 15:16:28Z thomas.diesler(a)jboss.com $ - -import java.util.List; - -import javax.management.ObjectName; - -import org.jboss.bpm.runtime.Attachments; - -/** - * A Process is any {@link Activity} performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Process extends SupportingElement, PropertySupport -{ - /** - * Defines the type of a {@link Process} - */ - public enum ProcessType - { - None, Private, Abstract, Collaboration - }; - - /** - * Defines the status a {@link Process} can be in - */ - public enum ProcessStatus - { - None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed - }; - - /** - * Get the unique name. - */ - String getName(); - - /** - * Get the process type - */ - ProcessType getProcessType(); - - /** - * Get the process state - */ - ProcessStatus getProcessStatus(); - - /** - * Get the list of flow objects - */ - List<FlowObject> getFlowObjects(); - - /** - * Get a list of flow objects of a given type. - */ - <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz); - - /** - * Get a flow object by name. - * @return null if not found - */ - FlowObject getFlowObject(String name); - - /** - * One or more Performers MAY be entered. The Performers attribute defines the resource that will be responsible for - * the Process. The Performers entry could be in the form of a specific individual, a group, an organization role or - * position, or an organization. - */ - List<String> getPerformers(); - - /** - * One or more assignment expressions MAY be made for the object. The Assignment SHALL be performed as defined by the - * AssignTime attribute. - */ - List<Assignment> getAssignments(); - - /** - * The InputSets attribute defines the data requirements for input to the Process. Zero or more InputSets MAY be - * defined. Each Input set is sufficient to allow the Process to be performed (if it has first been instantiated by - * the appropriate signal arriving from an incoming Sequence Flow) - */ - List<InputSet> getInputSets(); - - /** - * The OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be - * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the - * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate - * a relationship between an OutputSet and an InputSet that started the Process. - */ - List<OutputSet> getOutputSets(); - - /** - * Get the list of associated {@link Message} objects. - * @return An empty list if there are none - */ - List<Message> getMessages(); - - /** - * Get an associated {@link Message} by name. - * @return null if not found - */ - Message getMessage(String msgName); - - // Not Part of BPMN ======================================================================== - - /** - * Make a deep copy of the process - */ - Process copyProcess(); - - /** - * Start the process - */ - ObjectName startProcess(); - - /** - * Start the process, with a given execution context - */ - ObjectName startProcess(Attachments att); - - /** - * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. - * The Process will be in a running state until all Tokens are consumed. - * - * This method until the process ends without timeout. - */ - void waitForEnd(); - - /** - * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. - * The Process will be in a running state until all Tokens are consumed. - * - * This method until the process ends with a given timeout. - */ - void waitForEnd(long timeout); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,166 @@ +/* + * 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.jboss.bpm.model; + +//$Id$ + +import java.util.List; + +import javax.management.ObjectName; + +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.PropertySupport; +import org.jboss.bpm.model.internal.SupportingElement; +import org.jboss.bpm.runtime.Attachments; + +/** + * A Process is any {@link Activity} performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Process extends SupportingElement, PropertySupport +{ + /** + * Defines the type of a {@link Process} + */ + public enum ProcessType + { + None, Private, Abstract, Collaboration + }; + + /** + * Defines the status a {@link Process} can be in + */ + public enum ProcessStatus + { + None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed + }; + + /** + * Get the unique name. + */ + String getName(); + + /** + * Get the process type + */ + ProcessType getProcessType(); + + /** + * Get the process state + */ + ProcessStatus getProcessStatus(); + + /** + * Get the list of flow objects + */ + List<FlowObject> getFlowObjects(); + + /** + * Get a list of flow objects of a given type. + */ + <T extends FlowObject> List<T> getFlowObjects(Class<T> clazz); + + /** + * Get a flow object by name. + * @return null if not found + */ + FlowObject getFlowObject(String name); + + /** + * One or more Performers MAY be entered. The Performers attribute defines the resource that will be responsible for + * the Process. The Performers entry could be in the form of a specific individual, a group, an organization role or + * position, or an organization. + */ + List<String> getPerformers(); + + /** + * One or more assignment expressions MAY be made for the object. The Assignment SHALL be performed as defined by the + * AssignTime attribute. + */ + List<Assignment> getAssignments(); + + /** + * The InputSets attribute defines the data requirements for input to the Process. Zero or more InputSets MAY be + * defined. Each Input set is sufficient to allow the Process to be performed (if it has first been instantiated by + * the appropriate signal arriving from an incoming Sequence Flow) + */ + List<InputSet> getInputSets(); + + /** + * The OutputSets attribute defines the data requirements for output from the Process. Zero or more OutputSets MAY be + * defined. At the completion of the Process, only one of the OutputSets may be produced--It is up to the + * implementation of the Process to determine which set will be produced. However, the IORules attribute MAY indicate + * a relationship between an OutputSet and an InputSet that started the Process. + */ + List<OutputSet> getOutputSets(); + + /** + * Get the list of associated {@link Message} objects. + * @return An empty list if there are none + */ + List<Message> getMessages(); + + /** + * Get an associated {@link Message} by name. + * @return null if not found + */ + Message getMessage(String msgName); + + // Not Part of BPMN ======================================================================== + + /** + * Make a deep copy of the process + */ + Process copyProcess(); + + /** + * Start the process + */ + ObjectName startProcess(); + + /** + * Start the process, with a given execution context + */ + ObjectName startProcess(Attachments att); + + /** + * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. + * The Process will be in a running state until all Tokens are consumed. + * + * This method until the process ends without timeout. + */ + void waitForEnd(); + + /** + * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. + * The Process will be in a running state until all Tokens are consumed. + * + * This method until the process ends with a given timeout. + */ + void waitForEnd(long timeout); +} \ No newline at end of file Property changes on: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Process.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,139 +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.jboss.bpm.model; - -import org.jboss.bpm.client.DialectHandler; -import org.jboss.bpm.model.Constants.AssignTime; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.Constants.TaskType; -import org.jboss.bpm.runtime.ExecutionHandler; -import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.SignalHandler; - -//$Id$ - -/** - * The ProcessBuilder can be used to build a {@link Process} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ProcessBuilder -{ - /** - * Add a {@link Process} with a given name - */ - ProcessBuilder addProcess(String name); - - /** - * Add all elements from another {@link Process}. - * This is typically used by a {@link DialectHandler} when processing an include. - */ - ProcessBuilder addProcessElements(Process proc); - - /** - * Get the {@link Process}. - * - * This is the final call to the ProcessBuilder after all elements have been added. - * The {@link Process} is initialized and put in state READY - */ - Process getProcess(); - - /** - * Get the {@link Process} for inclusion in another. - * - * This is the final call to the ProcessBuilder after all elements have been added. - * The {@link Process} is not initialized and put in state READY - */ - Process getProcessForInclude(); - - /** - * Add a {@link SequenceFlow} with a given name - */ - ProcessBuilder addSequenceFlow(String targetName); - - /** - * Add a {@link MessageFlow} with a given name - */ - ProcessBuilder addMessageFlow(String targetName); - - /** - * Add a {@link StartEvent} with a given name - */ - EventBuilder addStartEvent(String name); - - /** - * Add an {@link IntermediateEvent} with a given name - */ - EventBuilder addEvent(String name); - - /** - * Add an {@link EndEvent} with a given name - */ - EventBuilder addEndEvent(String name); - - /** - * Add a {@link Task} of {@link TaskType} NONE with a given name - */ - TaskBuilder addTask(String name); - - /** - * Add a {@link Task} with a given name and type - */ - TaskBuilder addTask(String name, TaskType type); - - /** - * Add an {@link ExclusiveGateway} with a given name - */ - GatewayBuilder addGateway(String name, GatewayType type); - - /** - * Add a {@link Message} with a given name. - */ - MessageBuilder addMessage(String name); - - /** - * Add a process property - */ - ProcessBuilder addProperty(String name, String value); - - /** - * Add an {@link Assignment} to the {@link Process} or the current {@link FlowObject}. - */ - ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); - - /** - * Add an {@link ExecutionHandler} with a given Class - */ - ProcessBuilder addExecutionHandler(Class<?> clazz); - - /** - * Add an {@link FlowHandler} with a given Class - */ - ProcessBuilder addFlowHandler(Class<?> clazz); - - /** - * Add an {@link SignalHandler} with a given Class - */ - ProcessBuilder addSignalHandler(Class<?> clazz); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,140 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.client.DialectHandler; +import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; +import org.jboss.bpm.runtime.ExecutionHandler; +import org.jboss.bpm.runtime.FlowHandler; +import org.jboss.bpm.runtime.SignalHandler; + + +//$Id$ + +/** + * The ProcessBuilder can be used to build a {@link Process} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessBuilder +{ + /** + * Add a {@link Process} with a given name + */ + ProcessBuilder addProcess(String name); + + /** + * Add all elements from another {@link Process}. + * This is typically used by a {@link DialectHandler} when processing an include. + */ + ProcessBuilder addProcessElements(Process proc); + + /** + * Get the {@link Process}. + * + * This is the final call to the ProcessBuilder after all elements have been added. + * The {@link Process} is initialized and put in state READY + */ + Process getProcess(); + + /** + * Get the {@link Process} for inclusion in another. + * + * This is the final call to the ProcessBuilder after all elements have been added. + * The {@link Process} is not initialized and put in state READY + */ + Process getProcessForInclude(); + + /** + * Add a SequenceFlow with a given name + */ + ProcessBuilder addSequenceFlow(String targetName); + + /** + * Add a MessageFlow with a given name + */ + ProcessBuilder addMessageFlow(String targetName); + + /** + * Add a SartEvent with a given name + */ + EventBuilder addStartEvent(String name); + + /** + * Add an IntermediateEvent with a given name + */ + EventBuilder addEvent(String name); + + /** + * Add an EndEvent with a given name + */ + EventBuilder addEndEvent(String name); + + /** + * Add a Task of {@link TaskType} NONE with a given name + */ + TaskBuilder addTask(String name); + + /** + * Add a Task with a given name and type + */ + TaskBuilder addTask(String name, TaskType type); + + /** + * Add a Gateway with a given name + */ + GatewayBuilder addGateway(String name, GatewayType type); + + /** + * Add a {@link Message} with a given name. + */ + MessageBuilder addMessage(String name); + + /** + * Add a process property + */ + ProcessBuilder addProperty(String name, String value); + + /** + * Add an Assignment to the Process or the current FlowObject. + */ + ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); + + /** + * Add an {@link ExecutionHandler} with a given Class + */ + ProcessBuilder addExecutionHandler(Class<?> clazz); + + /** + * Add an {@link FlowHandler} with a given Class + */ + ProcessBuilder addFlowHandler(Class<?> clazz); + + /** + * Add an {@link SignalHandler} with a given Class + */ + ProcessBuilder addSignalHandler(Class<?> clazz); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,64 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link ProcessBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class ProcessBuilderFactory -{ - /** The bean name - jBPMProcessBuilderFactory */ - public static final String BEAN_NAME = "jBPMProcessBuilderFactory"; - - // Hide the constructor - protected ProcessBuilderFactory() - { - } - - /** - * Get a ProcessBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static ProcessBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (ProcessBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link ProcessBuilder}. - */ - public abstract ProcessBuilder newProcessBuilder(); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.model; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.util.KernelLocator; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; + +/** + * A Factory for the {@link ProcessBuilder}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class ProcessBuilderFactory +{ + /** The bean name - jBPMProcessBuilderFactory */ + public static final String BEAN_NAME = "jBPMProcessBuilderFactory"; + + // Hide the constructor + protected ProcessBuilderFactory() + { + } + + /** + * Get a ProcessBuilderFactory instance. + */ + @SuppressWarnings("deprecation") + public static ProcessBuilderFactory newInstance() + { + // Make sure the engine is bootstrapped + ProcessEngine.locateProcessEngine(); + Kernel kernel = KernelLocator.getKernel(); + KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); + return (ProcessBuilderFactory)entry.getTarget(); + } + + /** + * Get a {@link ProcessBuilder}. + */ + public abstract ProcessBuilder newProcessBuilder(); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,73 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Property, which is used in the definition of attributes for a Process and common activity attributes - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Property extends SupportingElement -{ - /** - * Supported property types - */ - public enum PropertyType - { - String, Object - } - - /** - * Each Property has a Name (e.g., name=”Customer Name”). - */ - String getName(); - - /** - * Each Property has a Type (e.g., type=”String”). Properties may be defined - * hierarchically. - */ - PropertyType getPropertyType(); - - /** - * Each Property MAY have a value expression specified. - */ - Expression getExpression(); - - /** - * Get the body of the expression value. - */ - String getValue(); - - /** - * Get the body of the expression value. - */ - <T> T getValue(Class<T> T); - - /** - * If the Correlation attribute is set to True, then the Property is marked to be used for - * correlation (e.g., for incoming Messages). - */ - boolean isCorrelation(); -} Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Property.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,76 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.SupportingElement; + +//$Id$ + +/** + * A Property, which is used in the definition of attributes for a Process and common activity attributes + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Property extends SupportingElement +{ + /** + * Supported property types + */ + public enum PropertyType + { + String, Object + } + + /** + * Each Property has a Name (e.g., name=”Customer Name”). + */ + String getName(); + + /** + * Each Property has a Type (e.g., type=”String”). Properties may be defined + * hierarchically. + */ + PropertyType getPropertyType(); + + /** + * Each Property MAY have a value expression specified. + */ + Expression getExpression(); + + /** + * Get the body of the expression value. + */ + String getValue(); + + /** + * Get the body of the expression value. + */ + <T> T getValue(Class<T> T); + + /** + * If the Correlation attribute is set to True, then the Property is marked to be used for + * correlation (e.g., for incoming Messages). + */ + boolean isCorrelation(); +} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * A PropertyBuilder can be used to build a {@link Property} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface PropertyBuilder -{ - /** - * Create a {@link Property} with a given name and value - */ - Property newProperty(String name, Object value); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,64 +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.jboss.bpm.model; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.plugins.util.KernelLocator; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; - -/** - * A Factory for the {@link PropertyBuilder}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public abstract class PropertyBuilderFactory -{ - /** The bean name - jBPMMessageBuilderFactory */ - public static final String BEAN_NAME = "jBPMPropertyBuilderFactory"; - - // Hide the constructor - protected PropertyBuilderFactory() - { - } - - /** - * Get a MessageBuilderFactory instance. - */ - @SuppressWarnings("deprecation") - public static PropertyBuilderFactory newInstance() - { - // Make sure the engine is bootstrapped - ProcessEngine.locateProcessEngine(); - Kernel kernel = KernelLocator.getKernel(); - KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); - return (PropertyBuilderFactory)entry.getTarget(); - } - - /** - * Get a {@link PropertyBuilder}. - */ - public abstract PropertyBuilder newPropertyBuilder(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,55 +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.jboss.bpm.model; - -//$Id$ - -import java.util.List; - -/** - * Property support - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface PropertySupport -{ - /** - * Get a Property with a given name. - */ - Property getProperty(String name); - - /** - * Get a Property value with a given name. - */ - String getPropertyValue(String name); - - /** - * Multiple Properties MAY entered for the Message. - */ - List<Property> getProperties(); - - /** - * Get the list of property names - */ - List<String> getPropertyNames(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,58 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A Receive Task is a simple Task that is designed to wait for a message to arrive from an external participant - * (relative to the Business Process). Once the message has been received, the Task is completed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ReceiveTask extends Task -{ - /** - * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be received by the - * Task. The Message in this context is equivalent to an in-only message pattern (Web service). One or more - * corresponding incoming Message Flows MAY be shown on the diagram. However, the display of the Message Flow is not - * required. The Message is applied to all incoming Message Flow, but can arrive for only one of the incoming Message - * Flow for a single instance of the Task. - */ - Message getMessageRef(); - - /** - * Receive Tasks can be defined as the instantiation mechanism for the Process with the Instantiate attribute. This - * attribute MAY be set to true if the Task is the first activity after the Start Event or a starting Task if there is - * no Start Event (i.e., there are no incoming Sequence Flow). Multiple Tasks MAY have this attribute set to True. - */ - boolean isInstantiate(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the - * default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,40 +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.jboss.bpm.model; - -//$Id$ - -/** - * There may be times where a modeler may want to reference another activity that has been defined. If the two (or more) - * activities share the exact same behavior, then by one referencing the other, the attributes that define the behavior only - * have to be created once and maintained in only one location. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ReferenceTask extends Task -{ - /** - * The Task being referenced MUST be identified. - */ - Task getTaskRef(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Role.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Role.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,39 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Role, which is used in the definition of attributes for a {@link Participant} - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Role extends SupportingElement -{ - /** - * Name is an attribute that is text description of the Role. - */ - String getName(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,41 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Script Task is executed by a business process engine. The modeler or implementer defines a script in a language that - * the engine can interpret. When the Task is ready to start, the engine will execute the script. When the script is completed, - * the Task will also be completed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ScriptTask extends Task -{ - /** - * The modeler MAY include a script that can be run when the Task is performed. If - * a script is not included, then the Task will act equivalent to a TaskType of None. - */ - String getScript(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,49 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - - -//$Id$ - -/** - * A Send Task. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SendTask extends Task -{ - /** - * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be sent by the Task. The Message in this context is equivalent to an - * out-only message pattern (Web service). One or more corresponding outgoing Message Flow MAY be shown on the diagram. However, the display of the Message Flow is - * not required. The Message is applied to all outgoing Message Flow and the Message will be sent down all outgoing Message Flow at the completion of a single - * instance of the Task. - */ - Message getMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,71 +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.jboss.bpm.model; - -//$Id$ - -/** - * A Sequence Flow is used to show the order that activities will be performed in a Process. Each Flow has only one - * source and only one target. The source and target must be from the set of the following Flow Objects: Events (Start, - * Intermediate, and End), Activities (Task and Sub-Process), and Gateways. During performance (or simulation) of the - * process, a Token will leave the source Flow Object, traverse down the Sequence Flow, and enter the target Flow - * Object. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SequenceFlow extends ConnectingObject -{ - /** - * The ConditionType - */ - public enum ConditionType - { - None, Expression, Default - } - - /** - * By default, the ConditionType of a Sequence Flow is None. This means that there is no evaluation at runtime to - * determine whether or not the Sequence Flow will be used. Once a Token is ready to traverse the Sequence Flow (i.e., - * the Source is an activity that has completed), then the Token will do so. The normal, uncontrolled use of Sequence - * Flow, in a sequence of activities, will have a None ConditionType. A None ConditionType MUST NOT be used if the - * Source of the Sequence Flow is an Exclusive Data-Based or Inclusive Gateway. The ConditionType attribute MAY be set - * to Expression if the Source of the Sequence Flow is a Task, a Sub-Process, or a Gateway of type Exclusive-Data- - * Based or Inclusive. If the ConditionType attribute is set to Expression, then a condition marker SHALL be added to - * the line if the Sequence Flow is outgoing from an activity. However, a condition indicator MUST NOT be added to the - * line if the Sequence Flow is outgoing from a Gateway. An Expression ConditionType MUST NOT be used if the Source of - * the Sequence Flow is an Event-Based Exclusive Gateway, a Complex Gateway, a Parallel Gateway, a Start Event, or an - * Intermediate Event. In addition, an Expression ConditionType MUST NOT be used if the Sequence Flow is associated - * with the Default Gate of a Gateway. The ConditionType attribute MAY be set to Default only if the Source of the - * Sequence Flow is an activity or an Exclusive Data-Based Gateway. - */ - ConditionType getConditionType(); - - /** - * If the ConditionType attribute is set to Expression, then the ConditionExpression attribute MUST be defined as a - * valid expression. The expression will be evaluated at runtime. If the result of the evaluation is TRUE, then a - * Token will be generated and will traverse the Sequence--Subject to any constraints imposed by a Source that is a - * Gateway. - */ - Expression getConditionExpression(); - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,63 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A Service Task. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ServiceTask extends Task -{ - /** - * A Message for the InMessageRef attribute MUST be entered. This indicates - * that the Message will be received at the start of the Task, after the - * availability of any defined InputSets. One or more corresponding incoming - * Message Flows MAY be shown on the diagram. However, the display of the - * Message Flow is not required. The Message is applied to all incoming - * Message Flow, but can arrive for only one of the incoming Message Flow - * for a single instance of the Task. - */ - Message getInMessageRef(); - - /** - * A Message for the OutMessageRef attribute MUST be entered. The sending - * of this message marks the completion of the Task, which may cause the - * production of an OutputSet. One or more corresponding outgoing Message - * Flow MAY be shown on the diagram. However, the display of the Message - * Flow is not required. The Message is applied to all outgoing Message Flow - * and the Message will be sent down all outgoing Message Flow at the - * completion of a single instance of the Task. - */ - Message getOutMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the - * message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,100 +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.jboss.bpm.model; - -import java.io.Serializable; - -//$Id$ - -/** - * A Signal thrown by the ProcessEngine - * - * @author Thomas.Diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public class Signal implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** - * Defines the types of supported Signals - */ - public enum SignalType - { - SYSTEM_START_EVENT_ENTER, SYSTEM_START_EVENT_EXIT, SYSTEM_START_TRIGGER, - SYSTEM_EVENT_ENTER, SYSTEM_EVENT_EXIT, SYSTEM_EVENT_TRIGGER, - SYSTEM_END_EVENT_ENTER, SYSTEM_END_EVENT_EXIT, SYSTEM_END_TRIGGER, - SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT, - SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT, - SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT, - SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER, - USER_SIGNAL - } - - private SignalType type; - private String message; - private String fromRef; - - /** Create the signal for a given process */ - public Signal(String fromRef, SignalType type) - { - this.fromRef = fromRef; - this.type = type; - if (fromRef == null) - throw new IllegalArgumentException("Signal fromRef cannot be null"); - if (type == null) - throw new IllegalArgumentException("SignalType cannot be null"); - } - - /** Create the signal for a given process */ - public Signal(String fromRef, SignalType type, String message) - { - this(fromRef, type); - this.message = message; - } - - public String getFromRef() - { - return fromRef; - } - - public SignalType getSignalType() - { - return type; - } - - public String getMessage() - { - return message; - } - - public String toString() - { - StringBuilder string = new StringBuilder(type + "[" + fromRef); - if (message != null) - { - string.append(":" + message); - } - string.append("]"); - return string.toString(); - } -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,100 @@ +/* + * 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.jboss.bpm.model; + +import java.io.Serializable; + +//$Id$ + +/** + * A Signal thrown by the ProcessEngine + * + * @author Thomas.Diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public class Signal implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** + * Defines the types of supported Signals + */ + public enum SignalType + { + SYSTEM_START_EVENT_ENTER, SYSTEM_START_EVENT_EXIT, SYSTEM_START_TRIGGER, + SYSTEM_EVENT_ENTER, SYSTEM_EVENT_EXIT, SYSTEM_EVENT_TRIGGER, + SYSTEM_END_EVENT_ENTER, SYSTEM_END_EVENT_EXIT, SYSTEM_END_TRIGGER, + SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT, + SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT, + SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT, + SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER, + USER_SIGNAL + } + + private SignalType type; + private String message; + private String fromRef; + + /** Create the signal for a given process */ + public Signal(String fromRef, SignalType type) + { + this.fromRef = fromRef; + this.type = type; + if (fromRef == null) + throw new IllegalArgumentException("Signal fromRef cannot be null"); + if (type == null) + throw new IllegalArgumentException("SignalType cannot be null"); + } + + /** Create the signal for a given process */ + public Signal(String fromRef, SignalType type, String message) + { + this(fromRef, type); + this.message = message; + } + + public String getFromRef() + { + return fromRef; + } + + public SignalType getSignalType() + { + return type; + } + + public String getMessage() + { + return message; + } + + public String toString() + { + StringBuilder string = new StringBuilder(type + "[" + fromRef); + if (message != null) + { + string.append(":" + message); + } + string.append("]"); + return string.toString(); + } +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,39 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Signal event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface SignalEventDetail extends EventDetail -{ - /** - * If the Trigger is a Signal, then a Signal Shall be entered. - */ - Signal getSignalRef(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - -/** - * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SingleInFlowSupport -{ - /** - * Get the out flow - */ - ConnectingObject getInFlow(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,39 +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.jboss.bpm.model; - - -//$Id$ - -/** - * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SingleOutFlowSupport -{ - /** - * Get the out flow - */ - SequenceFlow getOutFlow(); -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,46 +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.jboss.bpm.model; - -import java.util.List; - -//$Id$ - -/** - * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts - * the Flow of the Process, and thus, will not have any incoming Sequence Flow. A Start Event can have a Trigger that - * indicates how the Process starts: Message, Timer, Rule, Link, or Multiple. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface StartEvent extends Event, SingleOutFlowSupport -{ - /** - * Trigger is an attribute that defines the type of trigger expected for a Start Event. Of the set of - * EventDetailTypes, only four (4) can be applied to a Start Event: Message, Timer, Conditional, and Signal. If there - * is no EventDetail defined, then this is considered a None Start Event and the Event will not have an internal - * marker. If there is more than one EventDetail defined, this is considered a Multiple Start Event - * and the Event will have the pentagon internal marker. - */ - List<EventDetail> getTrigger(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,35 +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.jboss.bpm.model; - - -//$Id$ - -/** - * A Sub-Process is Process that is included within another Process. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SubProcess extends Activity, SingleInFlowSupport, SingleOutFlowSupport -{ -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.model; - -//$Id$ - -/** - * A graphical BPMN element - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SupportingElement extends BPMNElement -{ -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Task.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,49 +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.jboss.bpm.model; - - - -//$Id$ - -/** - * A Task is an Atomic Activity that is included within a Process. - * - * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to - * perform the Task when it is executed. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport -{ - /** - * TaskType is an attribute that has a default of None, but MAY be set to Send, - * Receive, User, Script, Manual, Reference, or Service. The TaskType will be - * impacted by the Message Flow to and/or from the Task, if Message Flow are - * used. A TaskType of Receive MUST NOT have an outgoing Message Flow. A - * TaskType of Send MUST NOT have an incoming Message Flow. A TaskType of - * Script or Manual MUST NOT have an incoming or an outgoing Message Flow. - * The TaskType list MAY be extended to include new types. - */ - Constants.TaskType getTaskType(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,38 +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.jboss.bpm.model; - -//$Id$ - - -/** - * The TaskBuilder can be used to build a {@link Task} dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface TaskBuilder extends ActivityBuilder -{ - TaskBuilder addMessageRef(String msgName); - - TaskBuilder addExecutionHandler(Class<?> clazz); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TaskBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.model; + +import org.jboss.bpm.model.internal.ActivityBuilder; +import org.jboss.bpm.model.internal.Task; + +//$Id$ + + +/** + * The TaskBuilder can be used to build a {@link Task} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface TaskBuilder extends ActivityBuilder +{ + TaskBuilder addMessageRef(String msgName); + + TaskBuilder addExecutionHandler(Class<?> clazz); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,35 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Terminate event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TerminateEventDetail extends EventDetail -{ - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,37 +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.jboss.bpm.model; - -//$Id$ - - -/** - * The TimeDateExpression supporting element is a sub-type of the Expression Element (Expression on page 273) and uses all - * the attributes of the {@link Expression} Element. - * - * @author Thomas.Diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TimeDateExpression extends Expression -{ - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,46 +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.jboss.bpm.model; - -//$Id$ - -/** - * The Timer event detail - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface TimerEventDetail extends EventDetail -{ - /** - * If the Trigger is a Timer, then a TimeDate MAY be entered. If a TimeDate is not - * entered, then a TimeCycle MUST be entered - */ - TimeDateExpression getTimeDate(); - - /** - * If the Trigger is a Timer, then a TimeCycle MAY be entered. If a TimeCycle is - * not entered, then a TimeDate MUST be entered - */ - TimeDateExpression getTimeCycle(); - -} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,63 +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.jboss.bpm.model; - -import org.jboss.bpm.model.Message.Implementation; - -//$Id$ - -/** - * A User Task is a typical “workflow” task where a human performer performs the Task with the assistance of a software - * application and is scheduled through a task list manager of some sort. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface UserTask extends Task -{ - /** - * A Message for the InMessageRef attribute MUST be entered. This indicates - * that the Message will be received at the start of the Task, after the - * availability of any defined InputSets. One or more corresponding incoming - * Message Flows MAY be shown on the diagram. However, the display of the - * Message Flow is not required. The Message is applied to all incoming - * Message Flow, but can arrive for only one of the incoming Message Flow - * for a single instance of the Task. - */ - Message getInMessageRef(); - - /** - * A Message for the OutMessageRef attribute MUST be entered. The sending - * of this message marks the completion of the Task, which may cause the - * production of an OutputSet. One or more corresponding outgoing Message - * Flow MAY be shown on the diagram. However, the display of the Message - * Flow is not required. The Message is applied to all outgoing Message Flow - * and the Message will be sent down all outgoing Message Flow at the - * completion of a single instance of the Task. - */ - Message getOutMessageRef(); - - /** - * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. - */ - Implementation getImplementation(); -} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Activity.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Activity.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,114 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Process; + +//$Id$ + +/** + * An activity is a generic term for work that a company or organization performs via business processes. An activity can be atomic or non-atomic (compound). The types + * of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Activity extends FlowObject, PropertySupport +{ + /** + * The ActivityType MUST be of type Task or Sub-Process. + */ + enum ActivityType + { + Task, SubProcess + } + + /** + * The Activity LoopType + */ + enum LoopType + { + None, Standard, MultiInstance + } + + /** + * The ActivityType MUST be of type Task or Sub-Process. + */ + ActivityType getActivityType(); + + /** + * One or more Performers MAY be entered. The Performer attribute defines the + * resource that will perform or will be responsible for the activity. The Performer + * entry could be in the form of a specific individual, a group, an organization role + * or position, or an organization. + */ + List<String> getPerformers(); + + /** + * The InputSets attribute defines the data requirements for input to the Activity. + * Zero or more InputSets MAY be defined. Each Input set is sufficient to allow the + * Activity to be performed (if it has first been instantiated by the appropriate signal + * arriving from an incoming Sequence Flow) + */ + List<InputSet> getInputSets(); + + /** + * The OutputSets attribute defines the data requirements for output from the + * activity. Zero or more OutputSets MAY be defined. At the completion of the + * activity, only one of the OutputSets may be produced--It is up to the + * implementation of the activity to determine which set will be produced. However, + * the IORules attribute MAY indicate a relationship between an OutputSet and an + * InputSet that started the activity. + */ + List<OutputSet> getOutputSets(); + + /** + * The IORules attribute is a collection of expressions, each of which specifies the + * required relationship between one input and one output. That is, if the activity is + * instantiated with a specified input, that activity shall complete with the specified + * output. + */ + List<Expression> getIORules(); + + /** + * The default value is 1. The value MUST NOT be less than 1. This attribute + * defines the number of Tokens that must arrive before the activity can begin. + */ + int getStartQuantity(); + + /** + * The default value is 1. The value MUST NOT be less than 1. This attribute + * defines the number of Tokens that must be generated from the activity. This + * number of Tokens will be sent down any outgoing Sequence Flow (assuming any + * Sequence Flow Conditions are satisfied). + */ + int getCompletionQuantity(); + + /** + * LoopType is an attribute and is by default None, but MAY be set to Standard or + * MultiInstance. A Task of type Receive that has its Instantiate attribute set to True MUST NOT + * have a Standard or MultiInstance LoopType. + */ + LoopType getLoopType(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ActivityBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,68 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Constants; +import org.jboss.bpm.model.ProcessBuilder; +import org.jboss.bpm.model.Property; + + +//$Id$ + +/** + * The ActivityBuilder can be used to build an {@link Activity} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ActivityBuilder extends ProcessBuilder +{ + /** + * Add an {@link InputSet} + */ + ActivityBuilder addInputSet(); + + /** + * Add an {@link Property} Input + */ + ActivityBuilder addPropertyInput(String name, String value); + + /** + * Add an {@link OutputSet} + */ + ActivityBuilder addOutputSet(); + + /** + * Add an {@link Property} Output + */ + ActivityBuilder addPropertyOutput(String name, String value); + + /** + * Add an IORule {@link Expression} + */ + ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang); + + /** + * Add an activity property + */ + ActivityBuilder addProperty(String name, String value); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Artifact.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Artifact.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,48 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * An ArtifactInput, which is used in the definition of attributes for InputSet + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Artifact extends GraphicalElement +{ + /** + * Defines the type of an {@link Artifact} + */ + enum ArtifactType + { + DataObject, Group, Annotation + }; + + /** + * The ArtifactType MAY be set to DataObject, Group, or Annotation. + * The ArtifactType list MAY be extended to include new types. + */ + ArtifactType getArtifactType(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactInput.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactInput.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * An ArtifactInput, which is used in the definition of attributes for {@link InputSet} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ArtifactInput extends Artifact +{ + /** + * This attribute identifies an Artifact that will be used as an input to an activity. The + * identified Artifact will be part of an InputSet for an activity. + */ + Artifact getArtifactRef(); + + /** + * The default value for this attribute is True. This means that the Input is required for + * an activity to start. If set to False, then the activity MAY start within the input if it + * is available, but MAY accept the input (more than once) after the activity has + * started. An InputSet may have a some of ArtifactInputs that have this attribute set + * to True and some that are set to False. + */ + boolean isRequireForStart(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ArtifactOutput.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ArtifactOutput.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * An ArtifactOutput, which is used in the definition of attributes for {@link OutputSet} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ArtifactOutput extends Artifact +{ + /** + * This attribute identifies an Artifact that will be used as an output to an activity. The + * identified Artifact will be part of an OutputSet for an activity. + */ + Artifact getArtifactRef(); + + /** + * The default value for this attribute is True. This means that the Output will be + * produced when an activity has been completed. If set to False, then the activity + * MAY produce the output (more than once) before it has completed. An OutputSet + * may have a some of ArtifactOutputs that have this attribute set to True and some that + * are set to False. + */ + boolean isProduceAtCompletion(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Assignment.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Process; +import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.Constants.AssignTime; + +//$Id$ + +/** + * An Assignment, which is used in the definition of attributes for {@link Process}, + * {@link Activity}, {@link Event}, {@link Gateway}, and {@link Gate}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Assignment extends SupportingElement +{ + /** + * The target for the Assignment MUST be a Property of the Process or the activity + * itself. + */ + Property getTo(); + + /** + * The Expression MUST be made up of a combination of Values, Properties, and + * Attributes, which are separated by operators such as add or multiply. The expression + * language is defined in the ExpressionLanguage attribute of the Business Process + * Diagram + */ + Expression getFrom(); + + /** + * An Assignment MAY have a AssignTime setting. If the Object is an activity (Task, + * Sub-Process, or Process), then the Assignment MUST have an AssignTime. + * A value of Start means that the assignment SHALL occur at the start of the activity. + * This can be used to assign the higher-level (global) Properties of the Process to the + * (local) Properties of the activity as an input to the activity. + * A value of End means that the assignment SHALL occur at the end of the activity. + * This can be used to assign the (local) Properties of the activity to the higher-level + * (global) Properties of the Process as an output to the activity. + */ + AssignTime getAssignTime(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/BPMNElement.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.io.Serializable; + +import javax.management.ObjectName; + +/** + * The parrent of all BPMN elements + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface BPMNElement extends Serializable +{ + public static final String ID_DOMAIN = "jboss.bpm"; + + /** + * Get the ID of this element + */ + ObjectName getID(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CancelEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CancelEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Cancel event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface CancelEventDetail extends EventDetail +{ + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/CompensateEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/CompensateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Compensate event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface CompensateEventDetail extends EventDetail +{ + /** + * For an End Event: + * + * If the Result is a Compensation, then the Activity that needs to be compensated MAY be supplied. + * If an Activity is not supplied, then the Event broadcast to all completed activities in the Process Instance. + * + * For an Intermediate Event within Normal Flow: If the Trigger is a Compensation, then the Activity that needs + * to be compensated MAY be supplied. If an Activity is not supplied, then the Event broadcast to all completed + * activities in the Process Instance. This “throws” the compensation. + * + * For an Intermediate Event attached to the boundary of an Activity: This Event “catches” the compensation. + * No further information is required. The Activity the Event is attached to will provide the Id necessary + * to match the compensation event with the event that “threw” the compensation or the compensation will be a + * broadcast. + */ + Activity getActivityRef(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ComplexGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +// $Id$ + +/** + * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex + * Gateways can also be used to combine a set of linked simple Gateways into a single, more compact situation. Modelers + * can provide complex expressions that determine the merging and/or splitting behavior of the Gateway. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ComplexGateway extends Gateway +{ + /** + * If there are multiple incoming Sequence Flow, an IncomingCondition expression + * MUST be set by the modeler. This will consist of an expression that can reference + * Sequence Flow names and/or Process Properties (Data). + */ + Expression getIncommingCondition(); + + /** + * If there are multiple outgoing Sequence Flow, an OutgoingCondition expression + * MUST be set by the modeler. This will consist of an expression that can reference + * (outgoing) Sequence Flow Ids and/or Process Properties (Data). + */ + Expression getOutgoingCondition(); + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Condition.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Condition.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,48 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Condition, which is used in the definition of attributes for Start Event and + * Intermediate Event + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Condition extends SupportingElement +{ + /** + * Name is an optional attribute that is text description of the Condition. If a Name is + * not entered, then a ConditionExpression MUST be entered + */ + String getName(); + + /** + * A ConditionExpression MAY be entered. In some cases the Condition itself will be + * stored and maintained in a separate application (e.g., a Rules Engine). If a ConditionExpression + * is not entered, then a Name MUST be entered + */ + Expression getConditionExpression(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConditionalEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConditionalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Conditional event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ConditionalEventDetail extends EventDetail +{ + /** + * If the Trigger is Conditional, then a Condition MUST be entered. + */ + Condition getConditionRef(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ConnectingObject.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ConnectingObject.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,59 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * There are two ways of Connecting Objects in BPMN: a Flow, either sequence or message, and an Association. Sequence + * Flow and Message Flow, to a certain extent, represent orthogonal aspects of the business processes depicted in a model, + * although they both affect the performance of activities within a Process. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ConnectingObject extends GraphicalElement +{ + /** + * Name is an optional attribute that is text description of the Connecting Object. + */ + String getName(); + + /** + * SourceRef is an attribute that identifies which Graphical Element the Connecting + * Object is connected from. Note: there are restrictions as to what objects Sequence + * Flow and Message Flow can connect. + */ + FlowObject getSourceRef(); + + /** + * TargetRef is an attribute that identifies which Graphical Element the Connecting + * Object is connected to. Note: there are restrictions as to what objects Sequence + * Flow and Message Flow can connect. + */ + FlowObject getTargetRef(); + + /** + * Get the required target name + */ + String getTargetName(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/DataObject.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/DataObject.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,56 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Property; + +//$Id$ + + +/** + * DataObject, which extends common Artifact + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface DataObject extends Artifact +{ + /** + * Name is an attribute that is text description of the object. + */ + String getName(); + + /** + * State is an optional attribute that indicates the impact the Process has had on the Data + * Object. Multiple Data Objects with the same name MAY share the same state within one Process. + */ + String getState(); + + /** + * Modeler-defined Properties MAY be added to a Data Object. The fully delineated name of these + * properties are “<process name>.<task name>.<property name>” + * (e.g., “Add Customer.Review Credit Report.Score”). + */ + List<Property> getProperties(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EndEvent.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +/** + * As the name implies, the End Event indicates where a Process will end. + * + * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. + * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape. + * End Event Results are Message, Error, Compensation, Link, and Multiple. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EndEvent extends Event, SingleInFlowSupport +{ + /** + * Result defines the type of result expected for an End Event. + * Of the set of EventDetailTypes only six can be applied to an + * End Event: Message, Error, Cancel, Compensation, Signal, and Terminate. + * + * If there is no EventDetail defined, then this is considered a None End Event. + * If there is more than one EventDetail defined, this is considered a Multiple EndEvent. + */ + List<EventDetail> getResult(); + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Entity.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Entity.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * An Entity, which is used in the definition of attributes for a {@link Participant} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Entity extends SupportingElement +{ + /** + * Name is an attribute that is text description of the Entity. + */ + String getName(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ErrorEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ErrorEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,51 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Error event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface ErrorEventDetail extends EventDetail +{ + /** + * For an End Event: + * If the Result is an Error, then the ErrorCode MUST be supplied.This “throws” the + * error. + * + * For an Intermediate Event within Normal Flow: + * If the Trigger is an Error, then the ErrorCode MUST be entered. This “throws” + * the error. + * + * For an Intermediate Event attached to the boundary of an Activity: + * If the Trigger is an Error, then the ErrorCode MAY be entered. This Event + * “catches” the error. If there is no ErrorCode, then any error SHALL trigger the + * Event. If there is an ErrorCode, then only an error that matches the ErrorCode + * SHALL trigger the Event. + */ + String getErrorCode(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Event.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Event.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * An Event is something that “happens” during the course of a business process. + * + * These Events affect the flow of the Process and usually have a cause or an impact. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Event extends FlowObject +{ + /** + * Defines the type of an {@link Event} + */ + enum EventType + { + Start, End, Intermediate + }; +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/EventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Constants.EventDetailType; + +//$Id$ + +/** + * The base of all supported event details. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EventDetail extends SupportingElement +{ + /** + * The EventDetailType attribute defines the type of trigger expected for an Event. The + * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate, + * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each + * have a subset of the EventDetailTypes that can be used. + * The EventDetailType list MAY be extended to include new types. + */ + EventDetailType getEventDetailType(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,57 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * Exclusive Gateways (Decisions) are locations within a business process where the Sequence Flow can take two or more + * alternative paths. This is basically the “fork in the road” for a process. For a given performance (or instance) of the + * process, only one of the paths can be taken (this should not be confused with forking of paths—refer to “Forking Flow”) + * + * A Decision is not an activity from the business process perspective, but is a type of Gateway that controls + * the Sequence Flow between activities. It can be thought of as a question that is asked at that point in the Process. The + * question has a defined set of alternative answers (Gates). Each Decision Gate is associated with a condition expression + * found within an outgoing Sequence Flow. When a Gate is chosen during the performance of the Process, the + * corresponding Sequence Flow is then chosen. A Token arriving at the Decision would be directed down the appropriate + * path, based on the chosen Gate. + * + * The Exclusive Decision has two or more outgoing Sequence Flow, but only one of them may be taken during the + * performance of the Process. Thus, the Exclusive Decision defines a set of alternative paths for the Token to take as it + * traverses the Flow. There are two types of Exclusive Decisions: Data-Based and Event-Based. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExclusiveGateway extends Gateway +{ + enum ExclusiveType + { + Data, Event + } + + /** + * ExclusiveType is by default Data. The ExclusiveType MAY be set to Event. + */ + ExclusiveType getExclusiveType(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayDataBased.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBased.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,55 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * The Data-Based Exclusive Gateways are the most commonly used type of Gateways. The set of Gates for Data-Based + * Exclusive Decisions is based on the boolean expression contained in the ConditionExpression attribute of the outgoing + * Sequence Flow of the Gateway. These expressions use the values of process data to determine which path should be taken + * (hence the name Data-Based). + * + * The conditions for the alternative Gates should be evaluated in a specific order. The first one that evaluates as TRUE will + * determine the Sequence Flow that will be taken. Since the behavior of this Gateway is exclusive, any other conditions that + * may actually be TRUE will be ignored--only one Gate can be chosen. One of the Gates may be “default” (or otherwise), + * and is the last Gate considered. This means that if none of the other Gates are chosen, then the default Gate will be + * chosen—along with its associated Sequence Flow. + * + * The default Gate is not mandatory for a Gateway. This means that if it is not used, then it is up to the modeler to insure + * that at least one Gate be valid at runtime. BPMN does not specify what will happen if there are no valid Gates. However, + * BPMN does specify that there MUST NOT be implicit flow and that all Normal Flow of a Process must be expressed + * through Sequence Flow. This would mean that a Process Model that has a Gateway that potentially does not have a valid + * Gate at runtime is an invalid model. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExclusiveGatewayDataBased extends ExclusiveGateway +{ + /** + * A Default Gate MAY be specified + */ + Gate getDefaultGate(); + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGatewayEventBased.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayEventBased.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * The inclusion of Event-Based Exclusive Gateways is the result of recent developments in the handling of distributed + * systems (e.g., with pi-calculus) and was derived from the BPEL4WS pick. On the input side, their behavior is the same as + * a Data-Based Exclusive Gateway (see “Data-Based” on page 73). On the output side, the basic idea is that this Decision + * represents a branching point in the process where the alternatives are based on events that occurs at that point in the + * Process, rather than the evaluation of expressions using process data. A specific event, usually the receipt of a message, + * determines which of the paths will be taken. For example, if a company is waiting for a response from a customer, they + * will perform one set of activities if the customer responds “Yes” and another set of activities if the customer responds + * “No.” The customer’s response determines which path is taken. The identity of the Message determines which path is taken. + * That is, the “Yes” Message and the “No” message are different messages—they are not the same message with different values + * within a property of the Message. The receipt of the message can be modeled with a Task of TaskType Receive or an + * Intermediate Event with a Message Trigger. In addition to Messages, other Triggers for Intermediate Events can be used, such as Timers. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExclusiveGatewayEventBased extends ExclusiveGateway +{ + /** + * Event-Based Gateways can be defined as the instantiation mechanism for the + * Process with the Instantiate attribute. This attribute MAY be set to true if the + * Gateway is the first element after the Start Event or a starting Gateway if there is + * no Start Event (i.e., there are no incoming Sequence Flow). + */ + boolean isInstantiate(); + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Expression.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Expression.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,56 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.Constants.ExpressionLanguage; + +//$Id$ + +/** + * An Expression, which is used in the definition of attributes for {@link StartEvent}, + * {@link IntermediateEvent}, {@link Activity}, {@link ComplexGateway}, and {@link SequenceFlow} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Expression extends SupportingElement +{ + /** + * An ExpressionBody MUST be entered to provide the text of the expression, which + * will be written in the language defined by the ExpressionLanguage attribute. + */ + String getExpressionBody(); + + /** + * An ExpressionValue MAY be available if the Expression is used as a {@link Property} value. + */ + Object getExpressionValue(); + + /** + * A Language MUST be provided to identify the language of the ExpressionBody. + * The value of the ExpressionLanguage should follow the naming conventions for the + * version of the specified language. + */ + ExpressionLanguage getExpressionLanguage(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/FlowObject.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Process; + +//$Id$ + +/** + * A Flow Object is one of the set of following graphical objects: {@link Event}, {@link Activity}, and {@link Gateway}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface FlowObject extends GraphicalElement +{ + /** + * Get the unique name. + */ + String getName(); + + /** + * Get the associated Process + */ + Process getProcess(); + + /** + * One or more assignment expressions MAY be made for the object. For activities (Task, Sub-Process, and Process), the + * Assignment SHALL be performed as defined by the AssignTime attribute. + */ + List<Assignment> getAssignments(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gate.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gate.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,75 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + + + +//$Id$ + +/** + * There MAY be zero or more Gates (except where noted below). Zero Gates are + * allowed if the Gateway is last object in a Process flow and there are no Start or + * End Events for the Process. If there are zero or only one incoming Sequence + * Flow, then there MUST be at least two Gates. + * + * For Exclusive Data-Based Gateways + * When two Gates are required, one of them MAY be the DefaultGate. + * + * For Exclusive Event-Based Gateways + * There MUST be two or more Gates. (Note that this type of Gateway does not act + * only as a Merge--it is always a Decision, at least.) + * + * For Inclusive Gateways + * When two Gates are required, one of them MAY be the DefaultGate. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Gate extends SupportingElement +{ + /** + * Each Gate MUST have an associated (outgoing) Sequence Flow. + * + * For Exclusive Event-Based, Complex, and Parallel Gateways: + * The Sequence Flow MUST have its Condition attribute set to None (there is not an + * evaluation of a condition expression). + * + * For Exclusive Data-Based, and Inclusive Gateways: + * The Sequence Flow MUST have its Condition attribute set to Expression and + * MUST have a valid ConditionExpression. The ConditionExpression MUST be + * unique for all the Gates within the Gateway. If there is only one Gate (i.e., the + * Gateway is acting only as a Merge), then Sequence Flow MUST have its Condition + * set to None. + * + * For DefaultGates: + * The Sequence Flow MUST have its Condition attribute set to Otherwise + */ + SequenceFlow getOutgoingSequenceFlow(); + + /** + * One or more assignment expressions MAY be made for each Gate. The + * Assignment SHALL be performed when the Gate is selected. + */ + List<Assignment> getAssignments(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Gateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,75 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +import org.jboss.bpm.model.Constants.GatewayType; + +//$Id$ + +/** + * Gateways are modeling elements that are used to control how Sequence Flow interact as they converge and diverge within + * a Process. If the flow does not need to be controlled, then a Gateway is not needed. The term “Gateway” implies that + * there is a gating mechanism that either allows or disallows passage through the Gateway--that is, as Tokens arrive at a + * Gateway, they can be merged together on input and/or split apart on output as the Gateway mechanisms are invoked. To + * be more descriptive, a Gateway is actually a collection of “Gates.” + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Gateway extends FlowObject, MultipleInFlowSupport +{ + /** + * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway, + * both for incoming and outgoing Sequence Flow + */ + GatewayType getGatewayType(); + + /** + * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Process flow and there are no Start or End + * Events for the Process. If there are zero or only one incoming Sequence Flow, then there MUST be at least two Gates. + * + * For Exclusive Data-Based Gateways. + * When two Gates are required, one of them MAY be the DefaultGate. + * + * For Exclusive Event-Based Gateways. + * There MUST be two or more Gates. (Note that this type of Gateway does not act only as a Merge--it is always a Decision, at + * least.) + * + * For Inclusive Gateways. + * When two Gates are required, one of them MAY be the DefaultGate. + */ + List<Gate> getGates(); + + /** + * Get the optional default gate + * @return null if there is none + */ + Gate getDefaultGate(); + + /** + * Get the gate for the given target name + * @return null if there is none + */ + Gate getGateByTargetName(String targetName); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/GraphicalElement.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.model.internal; + +//$Id$ + +/** + * A graphical BPMN element + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface GraphicalElement extends BPMNElement +{ +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InclusiveGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,43 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * This Decision represents a branching point where Alternatives are based on conditional expressions contained within + * outgoing Sequence Flow. However, in this case, the True evaluation of one condition expression does not exclude the + * evaluation of other condition expressions. All Sequence Flow with a True evaluation will be traversed by a Token. In + * some sense it’s like a grouping of related independent Binary (Yes/No) Decisions--and can be modeled that way. Since + * each path is independent, all combinations of the paths may be taken, from zero to all. However, it should be + * designed so that at least one path is taken. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface InclusiveGateway extends Gateway +{ + /** + * A Default Gate MAY be specified + */ + Gate getDefaultGate(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/InputSet.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/InputSet.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; + +/** + * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface InputSet extends SupportingElement, MutablePropertySupport +{ + /** + * Zero or more ArtifactInputs MAY be defined for each InputSet. For the + * combination of ArtifactInputs and PropertyInputs, there MUST be at least one + * item defined for the InputSet. An ArtifactInput is an Artifact, usually a Data + * Object. + */ + List<ArtifactInput> getArtifactInputs(); + + /** + * Zero or more PropertyInputs MAY be defined for each InputSet. For the + * combination of ArtifactInputs and PropertyInputs, there MUST be at least one + * item defined for the InputSet. + */ + List<Property> getProperties(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/IntermediateEvent.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Process; + +//$Id$ + +/** + * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. + * + * It will affect the {@link ConnectingObject} of the {@link Process}, but will not start or (directly) terminate + * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, + * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface IntermediateEvent extends Event, SingleInFlowSupport, SingleOutFlowSupport +{ +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/LinkEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/LinkEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Link event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface LinkEventDetail extends EventDetail +{ + /** + * If the Trigger is a Link, then the Name MUST be entered. + */ + String getName(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ManualTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ManualTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Manual Task is a Task that is expected to be performed without the aid of any business process execution engine or any + * application. An example of this could be a telephone technician installing a telephone at a customer location. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ManualTask extends Task +{ +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,46 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; + +//$Id$ + +/** + * The Message event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface MessageEventDetail extends EventDetail +{ + /** + * If the EventDetailType is a MessageRef, then the a Message MUST be supplied. + */ + Message getMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the + * message. A Web service is the default technology. + */ + Message.Implementation getImplementation(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MessageFlow.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; + +//$Id$ + +/** + * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to + * send and receive them. In BPMN, two separate Pools in the Diagram will represent the two entities. + * + * Message Flow MUST connect two Pools, either to the Pools themselves or to Flow Objects within the Pools. They cannot + * connect two objects within the same Pool. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MessageFlow extends ConnectingObject +{ + /** + * MessageRef is an optional attribute that identifies the Message that is being sent. + */ + Message getMessageRef(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +//$Id$ + +/** + * Implementing {@link FlowObject}s support multiple incomming {@link ConnectingObject}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MultipleInFlowSupport +{ + /** + * Get the list of in flows + */ + List<ConnectingObject> getInFlows(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +//$Id$ + +/** + * Implementing {@link FlowObject} support multiple outgoing {@link ConnectingObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MultipleOutFlowSupport +{ + /** + * Get the list of out flows + */ + List<ConnectingObject> getOutFlows(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/OutputSet.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/OutputSet.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,53 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; + +/** + * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface OutputSet extends SupportingElement, MutablePropertySupport +{ + /** + * Zero or more ArtifactOutputs MAY be defined for each OutputSet. For the + * combination of ArtifactOutputs and PropertyOutputs, there MUST be at least one + * item defined for the OutputSet. An ArtifactOutput is an {@link Artifact}, + * usually a {@link DataObject}. + */ + List<ArtifactOutput> getArtifactOutputs(); + + /** + * Zero or more PropertyInputs MAY be defined for each InputSet. For the + * combination of ArtifactInputs and PropertyInputs, there MUST be at least one + * item defined for the InputSet. + */ + List<Property> getProperties(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ParallelGateway.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * Parallel Gateway is required when two or more Activities need to be executed in parallel. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ParallelGateway extends Gateway +{ + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Participant.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Participant.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,57 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; + +//$Id$ + +/** + * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService + * + * TODO: Add javadoc links for Pool, WebService + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Participant extends SupportingElement +{ + public enum ParticipantType + { + Role, Entity + } + + /** + * Get the type of this participant + */ + ParticipantType getParticipantType(); + + /** + * If the ParticipantType = Role, then a Role MUST be identified. + */ + Role getRoleRef(); + + /** + * If the ParticipantType = Entity, then an Entity MUST be identified. + */ + Entity getEntityRef(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilder.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilder.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Property; + +//$Id$ + +/** + * A PropertyBuilder can be used to build a {@link Property} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface PropertyBuilder +{ + /** + * Create a {@link Property} with a given name and value + */ + Property newProperty(String name, Object value); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertyBuilderFactory.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactory.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.model.internal; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.util.KernelLocator; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; + +/** + * A Factory for the {@link PropertyBuilder}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class PropertyBuilderFactory +{ + /** The bean name - jBPMMessageBuilderFactory */ + public static final String BEAN_NAME = "jBPMPropertyBuilderFactory"; + + // Hide the constructor + protected PropertyBuilderFactory() + { + } + + /** + * Get a MessageBuilderFactory instance. + */ + @SuppressWarnings("deprecation") + public static PropertyBuilderFactory newInstance() + { + // Make sure the engine is bootstrapped + ProcessEngine.locateProcessEngine(); + Kernel kernel = KernelLocator.getKernel(); + KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME); + return (PropertyBuilderFactory)entry.getTarget(); + } + + /** + * Get a {@link PropertyBuilder}. + */ + public abstract PropertyBuilder newPropertyBuilder(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/PropertySupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/PropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,57 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +import java.util.List; + +import org.jboss.bpm.model.Property; + +/** + * Property support + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface PropertySupport +{ + /** + * Get a Property with a given name. + */ + Property getProperty(String name); + + /** + * Get a Property value with a given name. + */ + String getPropertyValue(String name); + + /** + * Multiple Properties MAY entered for the Message. + */ + List<Property> getProperties(); + + /** + * Get the list of property names + */ + List<String> getPropertyNames(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReceiveTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReceiveTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,59 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + +//$Id$ + +/** + * A Receive Task is a simple Task that is designed to wait for a message to arrive from an external participant + * (relative to the Business Process). Once the message has been received, the Task is completed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ReceiveTask extends Task +{ + /** + * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be received by the + * Task. The Message in this context is equivalent to an in-only message pattern (Web service). One or more + * corresponding incoming Message Flows MAY be shown on the diagram. However, the display of the Message Flow is not + * required. The Message is applied to all incoming Message Flow, but can arrive for only one of the incoming Message + * Flow for a single instance of the Task. + */ + Message getMessageRef(); + + /** + * Receive Tasks can be defined as the instantiation mechanism for the Process with the Instantiate attribute. This + * attribute MAY be set to true if the Task is the first activity after the Start Event or a starting Task if there is + * no Start Event (i.e., there are no incoming Sequence Flow). Multiple Tasks MAY have this attribute set to True. + */ + boolean isInstantiate(); + + /** + * This attribute specifies the technology that will be used to send or receive the message. A Web service is the + * default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ReferenceTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ReferenceTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,40 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * There may be times where a modeler may want to reference another activity that has been defined. If the two (or more) + * activities share the exact same behavior, then by one referencing the other, the attributes that define the behavior only + * have to be created once and maintained in only one location. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ReferenceTask extends Task +{ + /** + * The Task being referenced MUST be identified. + */ + Task getTaskRef(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Role.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Role.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Role, which is used in the definition of attributes for a {@link Participant} + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Role extends SupportingElement +{ + /** + * Name is an attribute that is text description of the Role. + */ + String getName(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ScriptTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ScriptTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Script Task is executed by a business process engine. The modeler or implementer defines a script in a language that + * the engine can interpret. When the Task is ready to start, the engine will execute the script. When the script is completed, + * the Task will also be completed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ScriptTask extends Task +{ + /** + * The modeler MAY include a script that can be run when the Task is performed. If + * a script is not included, then the Task will act equivalent to a TaskType of None. + */ + String getScript(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SendTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SendTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + + +//$Id$ + +/** + * A Send Task. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SendTask extends Task +{ + /** + * A Message for the MessageRef attribute MUST be entered. This indicates that the Message will be sent by the Task. The Message in this context is equivalent to an + * out-only message pattern (Web service). One or more corresponding outgoing Message Flow MAY be shown on the diagram. However, the display of the Message Flow is + * not required. The Message is applied to all outgoing Message Flow and the Message will be sent down all outgoing Message Flow at the completion of a single + * instance of the Task. + */ + Message getMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SequenceFlow.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,71 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * A Sequence Flow is used to show the order that activities will be performed in a Process. Each Flow has only one + * source and only one target. The source and target must be from the set of the following Flow Objects: Events (Start, + * Intermediate, and End), Activities (Task and Sub-Process), and Gateways. During performance (or simulation) of the + * process, a Token will leave the source Flow Object, traverse down the Sequence Flow, and enter the target Flow + * Object. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SequenceFlow extends ConnectingObject +{ + /** + * The ConditionType + */ + public enum ConditionType + { + None, Expression, Default + } + + /** + * By default, the ConditionType of a Sequence Flow is None. This means that there is no evaluation at runtime to + * determine whether or not the Sequence Flow will be used. Once a Token is ready to traverse the Sequence Flow (i.e., + * the Source is an activity that has completed), then the Token will do so. The normal, uncontrolled use of Sequence + * Flow, in a sequence of activities, will have a None ConditionType. A None ConditionType MUST NOT be used if the + * Source of the Sequence Flow is an Exclusive Data-Based or Inclusive Gateway. The ConditionType attribute MAY be set + * to Expression if the Source of the Sequence Flow is a Task, a Sub-Process, or a Gateway of type Exclusive-Data- + * Based or Inclusive. If the ConditionType attribute is set to Expression, then a condition marker SHALL be added to + * the line if the Sequence Flow is outgoing from an activity. However, a condition indicator MUST NOT be added to the + * line if the Sequence Flow is outgoing from a Gateway. An Expression ConditionType MUST NOT be used if the Source of + * the Sequence Flow is an Event-Based Exclusive Gateway, a Complex Gateway, a Parallel Gateway, a Start Event, or an + * Intermediate Event. In addition, an Expression ConditionType MUST NOT be used if the Sequence Flow is associated + * with the Default Gate of a Gateway. The ConditionType attribute MAY be set to Default only if the Source of the + * Sequence Flow is an activity or an Exclusive Data-Based Gateway. + */ + ConditionType getConditionType(); + + /** + * If the ConditionType attribute is set to Expression, then the ConditionExpression attribute MUST be defined as a + * valid expression. The expression will be evaluated at runtime. If the result of the evaluation is TRUE, then a + * Token will be generated and will traverse the Sequence--Subject to any constraints imposed by a Source that is a + * Gateway. + */ + Expression getConditionExpression(); + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/ServiceTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/ServiceTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + +//$Id$ + +/** + * A Service Task. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ServiceTask extends Task +{ + /** + * A Message for the InMessageRef attribute MUST be entered. This indicates + * that the Message will be received at the start of the Task, after the + * availability of any defined InputSets. One or more corresponding incoming + * Message Flows MAY be shown on the diagram. However, the display of the + * Message Flow is not required. The Message is applied to all incoming + * Message Flow, but can arrive for only one of the incoming Message Flow + * for a single instance of the Task. + */ + Message getInMessageRef(); + + /** + * A Message for the OutMessageRef attribute MUST be entered. The sending + * of this message marks the completion of the Task, which may cause the + * production of an OutputSet. One or more corresponding outgoing Message + * Flow MAY be shown on the diagram. However, the display of the Message + * Flow is not required. The Message is applied to all outgoing Message Flow + * and the Message will be sent down all outgoing Message Flow at the + * completion of a single instance of the Task. + */ + Message getOutMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the + * message. A Web service is the default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SignalEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SignalEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Signal; + +//$Id$ + +/** + * The Signal event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface SignalEventDetail extends EventDetail +{ + /** + * If the Trigger is a Signal, then a Signal Shall be entered. + */ + Signal getSignalRef(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,38 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * Implementing {@link FlowObject} support a single incomming {@link ConnectingObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SingleInFlowSupport +{ + /** + * Get the out flow + */ + ConnectingObject getInFlow(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * Implementing {@link FlowObject}s support a single outgoing {@link ConnectingObject}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SingleOutFlowSupport +{ + /** + * Get the out flow + */ + SequenceFlow getOutFlow(); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/StartEvent.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,46 @@ +/* + * 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.jboss.bpm.model.internal; + +import java.util.List; + +//$Id$ + +/** + * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts + * the Flow of the Process, and thus, will not have any incoming Sequence Flow. A Start Event can have a Trigger that + * indicates how the Process starts: Message, Timer, Rule, Link, or Multiple. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface StartEvent extends Event, SingleOutFlowSupport +{ + /** + * Trigger is an attribute that defines the type of trigger expected for a Start Event. Of the set of + * EventDetailTypes, only four (4) can be applied to a Start Event: Message, Timer, Conditional, and Signal. If there + * is no EventDetail defined, then this is considered a None Start Event and the Event will not have an internal + * marker. If there is more than one EventDetail defined, this is considered a Multiple Start Event + * and the Event will have the pentagon internal marker. + */ + List<EventDetail> getTrigger(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SubProcess.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + + +//$Id$ + +/** + * A Sub-Process is Process that is included within another Process. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SubProcess extends Activity, SingleInFlowSupport, SingleOutFlowSupport +{ +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/SupportingElement.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/SupportingElement.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.model.internal; + +//$Id$ + +/** + * A graphical BPMN element + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SupportingElement extends BPMNElement +{ +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/Task.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/Task.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,51 @@ +/* + * 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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Constants; + + + +//$Id$ + +/** + * A Task is an Atomic Activity that is included within a Process. + * + * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to + * perform the Task when it is executed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport +{ + /** + * TaskType is an attribute that has a default of None, but MAY be set to Send, + * Receive, User, Script, Manual, Reference, or Service. The TaskType will be + * impacted by the Message Flow to and/or from the Task, if Message Flow are + * used. A TaskType of Receive MUST NOT have an outgoing Message Flow. A + * TaskType of Send MUST NOT have an incoming Message Flow. A TaskType of + * Script or Manual MUST NOT have an incoming or an outgoing Message Flow. + * The TaskType list MAY be extended to include new types. + */ + Constants.TaskType getTaskType(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TerminateEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TerminateEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,35 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Terminate event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface TerminateEventDetail extends EventDetail +{ + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimeDateExpression.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimeDateExpression.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,37 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + + +/** + * The TimeDateExpression supporting element is a sub-type of the Expression Element (Expression on page 273) and uses all + * the attributes of the {@link Expression} Element. + * + * @author Thomas.Diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface TimeDateExpression extends Expression +{ + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/TimerEventDetail.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/TimerEventDetail.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,46 @@ +/* + * 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.jboss.bpm.model.internal; + +//$Id$ + +/** + * The Timer event detail + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface TimerEventDetail extends EventDetail +{ + /** + * If the Trigger is a Timer, then a TimeDate MAY be entered. If a TimeDate is not + * entered, then a TimeCycle MUST be entered + */ + TimeDateExpression getTimeDate(); + + /** + * If the Trigger is a Timer, then a TimeCycle MAY be entered. If a TimeCycle is + * not entered, then a TimeDate MUST be entered + */ + TimeDateExpression getTimeCycle(); + +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/UserTask.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/model/internal/UserTask.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.model.internal; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Message.Implementation; + +//$Id$ + +/** + * A User Task is a typical “workflow” task where a human performer performs the Task with the assistance of a software + * application and is scheduled through a task list manager of some sort. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface UserTask extends Task +{ + /** + * A Message for the InMessageRef attribute MUST be entered. This indicates + * that the Message will be received at the start of the Task, after the + * availability of any defined InputSets. One or more corresponding incoming + * Message Flows MAY be shown on the diagram. However, the display of the + * Message Flow is not required. The Message is applied to all incoming + * Message Flow, but can arrive for only one of the incoming Message Flow + * for a single instance of the Task. + */ + Message getInMessageRef(); + + /** + * A Message for the OutMessageRef attribute MUST be entered. The sending + * of this message marks the completion of the Task, which may cause the + * production of an OutputSet. One or more corresponding outgoing Message + * Flow MAY be shown on the diagram. However, the display of the Message + * Flow is not required. The Message is applied to all outgoing Message Flow + * and the Message will be sent down all outgoing Message Flow at the + * completion of a single instance of the Task. + */ + Message getOutMessageRef(); + + /** + * This attribute specifies the technology that will be used to send or receive the message. A Web service is the default technology. + */ + Implementation getImplementation(); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,142 +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.jboss.bpm.runtime; - -//$Id$ - -import java.util.Collection; - -/** - * An interface for general Attachments - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Attachments -{ - /** Get attachment keys */ - Collection<Key> getAttachmentKeys(); - - /** Add arbitrary attachment */ - <T> T addAttachment(Class<T> clazz, Object value); - - /** Add arbitrary attachment with name */ - <T> T addAttachment(Class<T> clazz, String name, Object value); - - /** Add arbitrary attachment with name */ - Object addAttachment(String name, Object value); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> clazz); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> clazz, String name); - - /** Get an arbitrary attachment */ - Object getAttachment(String name); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> clazz); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> clazz, String name); - - /** Remove arbitrary attachments */ - Object removeAttachment(String name); - - /** - * A key for attachements - */ - public static class Key - { - private Class<?> clazz; - private String name; - - /** - * Construct the key with optional class and name - */ - public Key(Class<?> clazz, String name) - { - this.clazz = clazz; - this.name = name; - } - - /** - * Get the class part for this key - * - * @return maybe null - */ - public Class<?> getClassPart() - { - return clazz; - } - - /** - * Get the name part for this key - * - * @return maybe null - */ - public String getNamePart() - { - return name; - } - - /** - * Two keys are equal if their {@link #toString()} is equal - */ - public boolean equals(Object obj) - { - if (!(obj instanceof Key)) - return false; - if (obj == this) - return true; - return obj.toString().equals(toString()); - } - - /** - * Two keys have the same hashCode if their {@link #toString()} is equal - */ - public int hashCode() - { - return toString().hashCode(); - } - - /** - * Returns the String repesentation of this Key. - * <pre> - * "[" + clazz + "," + name + "]" - * </pre> - */ - public String toString() - { - StringBuilder str = new StringBuilder("["); - if (clazz != null) - str.append(clazz.getName()); - if (clazz != null && name != null) - str.append(","); - if (name != null) - str.append(name); - str.append("]"); - return str.toString(); - } - } -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,142 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import java.util.Collection; + +/** + * An interface for general Attachments + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Attachments +{ + /** Get attachment keys */ + Collection<Key> getAttachmentKeys(); + + /** Add arbitrary attachment */ + <T> T addAttachment(Class<T> clazz, Object value); + + /** Add arbitrary attachment with name */ + <T> T addAttachment(Class<T> clazz, String name, Object value); + + /** Add arbitrary attachment with name */ + Object addAttachment(String name, Object value); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> clazz); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> clazz, String name); + + /** Get an arbitrary attachment */ + Object getAttachment(String name); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> clazz); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> clazz, String name); + + /** Remove arbitrary attachments */ + Object removeAttachment(String name); + + /** + * A key for attachements + */ + public static class Key + { + private Class<?> clazz; + private String name; + + /** + * Construct the key with optional class and name + */ + public Key(Class<?> clazz, String name) + { + this.clazz = clazz; + this.name = name; + } + + /** + * Get the class part for this key + * + * @return maybe null + */ + public Class<?> getClassPart() + { + return clazz; + } + + /** + * Get the name part for this key + * + * @return maybe null + */ + public String getNamePart() + { + return name; + } + + /** + * Two keys are equal if their {@link #toString()} is equal + */ + public boolean equals(Object obj) + { + if (!(obj instanceof Key)) + return false; + if (obj == this) + return true; + return obj.toString().equals(toString()); + } + + /** + * Two keys have the same hashCode if their {@link #toString()} is equal + */ + public int hashCode() + { + return toString().hashCode(); + } + + /** + * Returns the String repesentation of this Key. + * <pre> + * "[" + clazz + "," + name + "]" + * </pre> + */ + public String toString() + { + StringBuilder str = new StringBuilder("["); + if (clazz != null) + str.append(clazz.getName()); + if (clazz != null && name != null) + str.append(","); + if (name != null) + str.append(name); + str.append("]"); + return str.toString(); + } + } +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,119 +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.jboss.bpm.runtime; - -//$Id$ - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -/** - * Basic attachments. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class BasicAttachments implements Attachments -{ - private Map<Key, Object> attachments = new HashMap<Key, Object>(); - - /** Construct the execution context with no attachments */ - public BasicAttachments() - { - - } - - /** Construct the execution context with given attachments */ - public BasicAttachments(Attachments att) - { - if (att != null) - { - for (Key key : att.getAttachmentKeys()) - { - Object value = att.getAttachment(key.getClassPart(), key.getNamePart()); - this.attachments.put(key, value); - } - } - } - - public Collection<Key> getAttachmentKeys() - { - return attachments.keySet(); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(Class<T> clazz) - { - return (T)attachments.get(new Key(clazz, null)); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(Class<T> clazz, String name) - { - return (T)attachments.get(new Key(clazz, name)); - } - - public Object getAttachment(String name) - { - return attachments.get(new Key(null, name)); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(Class<T> clazz, Object obj) - { - return (T)attachments.put(new Key(clazz, null), obj); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(Class<T> clazz, String name, Object obj) - { - return (T)attachments.put(new Key(clazz, name), obj); - } - - public Object addAttachment(String name, Object obj) - { - return attachments.put(new Key(null, name), obj); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(Class<T> clazz) - { - return (T)attachments.remove(new Key(clazz, null)); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(Class<T> clazz, String name) - { - return (T)attachments.remove(new Key(clazz, name)); - } - - public Object removeAttachment(String name) - { - return attachments.remove(new Key(null, name)); - } - - public String toString() - { - return attachments.toString(); - } -} Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,120 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + + +/** + * Basic attachments. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class BasicAttachments implements Attachments +{ + private Map<Key, Object> attachments = new HashMap<Key, Object>(); + + /** Construct the execution context with no attachments */ + public BasicAttachments() + { + + } + + /** Construct the execution context with given attachments */ + public BasicAttachments(Attachments att) + { + if (att != null) + { + for (Key key : att.getAttachmentKeys()) + { + Object value = att.getAttachment(key.getClassPart(), key.getNamePart()); + this.attachments.put(key, value); + } + } + } + + public Collection<Key> getAttachmentKeys() + { + return attachments.keySet(); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(Class<T> clazz) + { + return (T)attachments.get(new Key(clazz, null)); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(Class<T> clazz, String name) + { + return (T)attachments.get(new Key(clazz, name)); + } + + public Object getAttachment(String name) + { + return attachments.get(new Key(null, name)); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(Class<T> clazz, Object obj) + { + return (T)attachments.put(new Key(clazz, null), obj); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(Class<T> clazz, String name, Object obj) + { + return (T)attachments.put(new Key(clazz, name), obj); + } + + public Object addAttachment(String name, Object obj) + { + return attachments.put(new Key(null, name), obj); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(Class<T> clazz) + { + return (T)attachments.remove(new Key(clazz, null)); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(Class<T> clazz, String name) + { + return (T)attachments.remove(new Key(clazz, name)); + } + + public Object removeAttachment(String name) + { + return attachments.remove(new Key(null, name)); + } + + public String toString() + { + return attachments.toString(); + } +} Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,35 +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.jboss.bpm.runtime; - -//$Id$ - - -/** - * An execution context that can take attachments. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface ExecutionContext extends Attachments -{ -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.runtime; + + +//$Id$ + + +/** + * An execution context that can take attachments. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface ExecutionContext extends Attachments +{ +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,43 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.bpm.model.FlowObject; - -/** - * The {@link ProcessEngine} invokes the ExecutionHandler on a - * {@link FlowObject} to execute user provided business logic. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ExecutionHandler extends Handler -{ - /** - * Execute the associated business logic. - */ - void execute(Token token); - -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,44 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.runtime.internal.Handler; + +/** + * The {@link ProcessEngine} invokes the ExecutionHandler on a + * {@link FlowObject} to execute user provided business logic. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExecutionHandler extends Handler +{ + /** + * Execute the associated business logic. + */ + void execute(Token token); + +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,46 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.bpm.model.FlowObject; - -/** - * The {@link ProcessEngine} invokes the FlowHandler on an {@link HandlerSupport} - * {@link FlowObject} to move the {@link Token} to the next {@link FlowObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface FlowHandler extends Handler -{ - /** - * Execute the FlowHandler. - * - * The FlowHandler typically invoves one of the {@link TokenExecutor} - * methods to move the {@link Token} to the next {@link FlowObject}. - */ - void execute(TokenExecutor tokenExecutor, Token token); - -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/FlowHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,48 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.runtime.internal.Handler; +import org.jboss.bpm.runtime.internal.HandlerSupport; + +/** + * The {@link ProcessEngine} invokes the FlowHandler on an {@link HandlerSupport} + * {@link FlowObject} to move the {@link Token} to the next {@link FlowObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface FlowHandler extends Handler +{ + /** + * Execute the FlowHandler. + * + * The FlowHandler typically invoves one of the {@link TokenExecutor} + * methods to move the {@link Token} to the next {@link FlowObject}. + */ + void execute(TokenExecutor tokenExecutor, Token token); + +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,39 +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.jboss.bpm.runtime; - -import java.io.Serializable; - -import org.jboss.bpm.model.FlowObject; - -//$Id$ - -/** - * The generic base for handlers that can be associated with a {@link FlowObject}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Handler extends Serializable -{ - -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,43 +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.jboss.bpm.runtime; - - -//$Id$ - -/** - * A combined interface for execution aspects - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface HandlerSupport -{ - /** Get the associated ExecutionHandler */ - ExecutionHandler getExecutionHandler(); - - /** Get the associated SignalHandler */ - SignalHandler getSignalHandler(); - - /** Get the associated FlowHandler */ - FlowHandler getFlowHandler(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,41 +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.jboss.bpm.runtime; - -import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.PropertySupport; - -//$Id$ - -/** - * Mutable property support - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface MutablePropertySupport extends PropertySupport -{ - /** - * Add a property - */ - void addProperty(Property prop); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,46 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.model.Process; - -/** - * A RuntimeProcess add runtime behaviour to the {@link Process} To protect the engine from maligious user code it - * does not extend {@link Process} directly. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface RuntimeProcess -{ - /** - * Get the associated {@link Process} - */ - Process getProcess(); - - /** - * Get the {@link TokenExecutor} for this {@link Process} - */ - TokenExecutor getTokenExecutor(); -} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,48 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.client.ProcessEngine; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Signal; - -/** - * The {@link ProcessEngine} invokes the SignalHandler on an {@link HandlerSupport} - * {@link FlowObject} to send {@link Signal}s. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SignalHandler extends Handler -{ - /** - * Get signal for enter - */ - void throwEnterSignal(); - - /** - * Get signal for exit - */ - void throwExitSignal(); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/SignalHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,50 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.runtime.internal.Handler; +import org.jboss.bpm.runtime.internal.HandlerSupport; + +/** + * The {@link ProcessEngine} invokes the SignalHandler on an {@link HandlerSupport} + * {@link FlowObject} to send {@link Signal}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SignalHandler extends Handler +{ + /** + * Get signal for enter + */ + void throwEnterSignal(); + + /** + * Get signal for exit + */ + void throwExitSignal(); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -1,93 +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.jboss.bpm.runtime; - -//$Id$ - -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; - -/** - * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. - * - * By tracking how the Token traverses the Flow Objects, gets diverted through alternative paths, and gets split into parallel paths, the normal Sequence Flow should be - * completely definable. - * - * A Token will have a unique identity that can be used to separate multiple Tokens that may exist because of concurrent process instances or the splitting of the Token - * for parallel processing within a single process instance. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Token -{ - public enum TokenStatus - { - Created, Started, Stoped, Destroyed, Suspended - } - - /** - * Get the token status - */ - TokenStatus getTokenStatus(); - - /** - * Get the unique token identity - */ - String getTokenID(); - - /** - * Get the associated {@link ExecutionContext} - */ - ExecutionContext getExecutionContext(); - - /** - * Get the current {@link SequenceFlow} - */ - SequenceFlow getFlow(); - - /** - * Get the active {@link InputSet} - * @return null if the {@link Activity} does not define one - */ - InputSet getInputSet(); - - /** - * Get the active {@link OutputSet} - * @return null if the {@link Activity} does not define one - */ - OutputSet getOutputSet(); - - /** - * Create a schallow copy of this Token. - * - * The content in the {@link ExecutionContext} will be copied by reference. - */ - Token copyToken(); - - /** - * Merge this Token with another token. - */ - void mergeToken(Token token); -} \ No newline at end of file Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Token.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,93 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; + +/** + * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. + * + * By tracking how the Token traverses the Flow Objects, gets diverted through alternative paths, and gets split into parallel paths, the normal Sequence Flow should be + * completely definable. + * + * A Token will have a unique identity that can be used to separate multiple Tokens that may exist because of concurrent process instances or the splitting of the Token + * for parallel processing within a single process instance. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Token +{ + public enum TokenStatus + { + Created, Started, Stoped, Destroyed, Suspended + } + + /** + * Get the token status + */ + TokenStatus getTokenStatus(); + + /** + * Get the unique token identity + */ + String getTokenID(); + + /** + * Get the associated {@link ExecutionContext} + */ + ExecutionContext getExecutionContext(); + + /** + * Get the current {@link SequenceFlow} + */ + SequenceFlow getFlow(); + + /** + * Get the active {@link InputSet} + * @return null if the {@link Activity} does not define one + */ + InputSet getInputSet(); + + /** + * Get the active {@link OutputSet} + * @return null if the {@link Activity} does not define one + */ + OutputSet getOutputSet(); + + /** + * Create a schallow copy of this Token. + * + * The content in the {@link ExecutionContext} will be copied by reference. + */ + Token copyToken(); + + /** + * Merge this Token with another token. + */ + void mergeToken(Token token); +} \ No newline at end of file Deleted: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -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.jboss.bpm.runtime; - -//$Id$ - -import java.util.Set; - -import org.jboss.bpm.model.SequenceFlow; - -/** - * The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s - * along the {@link SequenceFlow}s in the {@link Process}. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface TokenExecutor -{ - /** - * Get the set of active tokens - */ - Set<Token> getRunnableTokens(); - - /** - * True if there are active tokens - */ - boolean hasRunnableTokens(); - - /** - * Create a {@link Token} with an initial flow - */ - void create(Token token, SequenceFlow flow); - - /** - * Start a {@link Token} - */ - void start(Token token); - - /** - * Stop a {@link Token} - */ - void stop(Token token); - - /** - * Destroy a {@link Token} - */ - void destroy(Token token); - - /** - * Suspend a {@link Token} - */ - String suspend(Token token); - - /** - * Activate a {@link Token} - */ - Token activate(String tokenID); - - /** - * Move a given {@link Token} along a given flow. - */ - void move(Token token, SequenceFlow flow); -} Added: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/TokenExecutor.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,83 @@ +/* + * 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.jboss.bpm.runtime; + +//$Id$ + +import java.util.Set; + +import org.jboss.bpm.model.internal.SequenceFlow; + +/** + * The {@link FlowHandler} invokes the TokenExecutor to move {@link Token}s + * along the {@link SequenceFlow}s in the {@link Process}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface TokenExecutor +{ + /** + * Get the set of active tokens + */ + Set<Token> getRunnableTokens(); + + /** + * True if there are active tokens + */ + boolean hasRunnableTokens(); + + /** + * Create a {@link Token} with an initial flow + */ + void create(Token token, SequenceFlow flow); + + /** + * Start a {@link Token} + */ + void start(Token token); + + /** + * Stop a {@link Token} + */ + void stop(Token token); + + /** + * Destroy a {@link Token} + */ + void destroy(Token token); + + /** + * Suspend a {@link Token} + */ + String suspend(Token token); + + /** + * Activate a {@link Token} + */ + Token activate(String tokenID); + + /** + * Move a given {@link Token} along a given flow. + */ + void move(Token token, SequenceFlow flow); +} Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/Handler.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/Handler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,39 @@ +/* + * 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.jboss.bpm.runtime.internal; + +import java.io.Serializable; + +import org.jboss.bpm.model.internal.FlowObject; + +//$Id$ + +/** + * The generic base for handlers that can be associated with a {@link FlowObject}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Handler extends Serializable +{ + +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/HandlerSupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/HandlerSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,47 @@ +/* + * 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.jboss.bpm.runtime.internal; + +import org.jboss.bpm.runtime.ExecutionHandler; +import org.jboss.bpm.runtime.FlowHandler; +import org.jboss.bpm.runtime.SignalHandler; + + +//$Id$ + +/** + * A combined interface for execution aspects + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface HandlerSupport +{ + /** Get the associated ExecutionHandler */ + ExecutionHandler getExecutionHandler(); + + /** Get the associated SignalHandler */ + SignalHandler getSignalHandler(); + + /** Get the associated FlowHandler */ + FlowHandler getFlowHandler(); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/MutablePropertySupport.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/MutablePropertySupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,41 @@ +/* + * 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.jboss.bpm.runtime.internal; + +import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.PropertySupport; + +//$Id$ + +/** + * Mutable property support + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface MutablePropertySupport extends PropertySupport +{ + /** + * Add a property + */ + void addProperty(Property prop); +} \ No newline at end of file Copied: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java (from rev 1918, jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/RuntimeProcess.java) =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java (rev 0) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/runtime/internal/RuntimeProcess.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -0,0 +1,47 @@ +/* + * 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.jboss.bpm.runtime.internal; + +//$Id$ + +import org.jboss.bpm.model.Process; +import org.jboss.bpm.runtime.TokenExecutor; + +/** + * A RuntimeProcess add runtime behaviour to the {@link Process} To protect the engine from maligious user code it + * does not extend {@link Process} directly. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface RuntimeProcess +{ + /** + * Get the associated {@link Process} + */ + Process getProcess(); + + /** + * Get the {@link TokenExecutor} for this {@link Process} + */ + TokenExecutor getTokenExecutor(); +} \ No newline at end of file Modified: jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -49,10 +49,10 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.client.internal.EmbeddedBeansDeployer; -import org.jboss.bpm.model.BPMNElement; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.internal.BPMNElement; public abstract class AbstractAPITestCase extends TestCase { Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -58,41 +58,41 @@ import org.jboss.bpm.dialect.api10.model.JAXBStartEvent; import org.jboss.bpm.dialect.api10.model.JAXBTask; import org.jboss.bpm.dialect.api10.model.ObjectFactory; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.ComplexGateway; -import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.Constants; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.ExclusiveGateway; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.InclusiveGateway; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.IntermediateEvent; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageEventDetail; -import org.jboss.bpm.model.MessageFlow; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.ParallelGateway; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.ReceiveTask; -import org.jboss.bpm.model.SendTask; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SignalEventDetail; -import org.jboss.bpm.model.StartEvent; -import org.jboss.bpm.model.Task; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.ComplexGateway; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.ExclusiveGateway; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.InclusiveGateway; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.MessageEventDetail; +import org.jboss.bpm.model.internal.MessageFlow; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.ParallelGateway; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.ReceiveTask; +import org.jboss.bpm.model.internal.SendTask; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SignalEventDetail; +import org.jboss.bpm.model.internal.StartEvent; +import org.jboss.bpm.model.internal.Task; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.HandlerSupport; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.bpm.runtime.internal.HandlerSupport; /** * A JAXB marshaller for a Process Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -82,8 +82,8 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.SequenceFlow.ConditionType; -import org.jboss.bpm.runtime.Handler; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; +import org.jboss.bpm.runtime.internal.Handler; /** * A JAXB unmarshaller for a Process Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -27,12 +27,12 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; /** * An Assignment, which is used in the definition of attributes for {@link Process}, Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; /** * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/include/ProcessIncludeTest.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -26,7 +26,7 @@ import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.ReceiveTask; +import org.jboss.bpm.model.internal.ReceiveTask; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -33,8 +33,8 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.ReceiveTask; import org.jboss.bpm.model.TaskBuilder; +import org.jboss.bpm.model.internal.ReceiveTask; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) @@ -33,7 +33,7 @@ <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry> Modified: jbossbpm/spec/branches/tdiesler/modules/dialects/stp/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) @@ -31,7 +31,7 @@ <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry> Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -29,26 +29,26 @@ import org.jboss.bpm.client.ExecutionManager; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Constants.AssignTime; import org.jboss.bpm.model.Process.ProcessStatus; import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.Expression; import org.jboss.bpm.model.internal.ExpressionEvaluator; import org.jboss.bpm.model.internal.ProcessImpl; import org.jboss.bpm.model.internal.RuntimeProcessImpl; import org.jboss.bpm.model.internal.SequenceFlowImpl; +import org.jboss.bpm.model.internal.StartEvent; import org.jboss.bpm.model.internal.TokenExecutorImpl; import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.ExecutionContext; -import org.jboss.bpm.runtime.RuntimeProcess; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.internal.DelegatingToken; import org.jboss.bpm.runtime.internal.MutableToken; +import org.jboss.bpm.runtime.internal.RuntimeProcess; import org.jboss.bpm.runtime.internal.TokenImpl; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -26,7 +26,6 @@ import java.util.Map; import org.jboss.bpm.client.DialectHandler; -import org.jboss.bpm.client.DialectRegistry; import org.jboss.bpm.client.ProcessManager; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/client/internal/RunnableToken.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -25,19 +25,19 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Process.ProcessStatus; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; import org.jboss.bpm.model.internal.FlowObjectImpl; import org.jboss.bpm.model.internal.ProcessImpl; -import org.jboss.bpm.runtime.HandlerSupport; -import org.jboss.bpm.runtime.RuntimeProcess; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.Token.TokenStatus; import org.jboss.bpm.runtime.internal.DelegatingToken; +import org.jboss.bpm.runtime.internal.HandlerSupport; import org.jboss.bpm.runtime.internal.MutableToken; +import org.jboss.bpm.runtime.internal.RuntimeProcess; /** * The RunnableToken implements the logic to move the token from one FlowObject to the next. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.ActivityBuilder; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.ActivityBuilder; /** * The ActivityBuilder can be used to build an {@link Activity} dynamically. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -29,18 +29,18 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.ExecutionContext; -import org.jboss.bpm.runtime.MutablePropertySupport; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; import org.jboss.bpm.runtime.internal.MutableToken; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.Expression; /** * An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/BPMNElementImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -26,12 +26,12 @@ import javax.management.ObjectName; import org.jboss.bpm.client.ObjectNameFactory; -import org.jboss.bpm.model.BPMNElement; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.internal.BPMNElement; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.Task; import org.jboss.util.id.UID; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -24,9 +24,9 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.ComplexGateway; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.internal.ComplexGateway; +import org.jboss.bpm.model.internal.Expression; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -30,13 +30,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.MessageEventDetail; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.MessageEventDetail; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EntityImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Entity; +import org.jboss.bpm.model.internal.Entity; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -24,15 +24,15 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.Event; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.IntermediateEvent; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.StartEvent; /** * The EventBuilder can be used to build an {@link Event} dynamically. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventDetailImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Event; -import org.jboss.bpm.model.EventDetail; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.EventDetail; /** * The base of all supported event details. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Event; +import org.jboss.bpm.model.internal.Event; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayDataBasedImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.ExclusiveGatewayDataBased; +import org.jboss.bpm.model.internal.ExclusiveGatewayDataBased; /** * A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -28,14 +28,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.ExclusiveGateway; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.ExclusiveGateway; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.internal.Expression; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.Attachments.Key; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.internal.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; /** * A Flow is a graphical line connecting two objects in a BPD. There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -27,18 +27,18 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NameNotUniqueException; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.MultipleInFlowSupport; -import org.jboss.bpm.model.MultipleOutFlowSupport; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SingleInFlowSupport; -import org.jboss.bpm.model.SingleOutFlowSupport; import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.MultipleInFlowSupport; +import org.jboss.bpm.model.internal.MultipleOutFlowSupport; +import org.jboss.bpm.model.internal.SingleInFlowSupport; +import org.jboss.bpm.model.internal.SingleOutFlowSupport; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GateImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -26,12 +26,12 @@ import java.util.List; import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; /** * A {@link Gate} associated with a {@link Gateway}. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,11 +23,11 @@ //$Id$ -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; /** * The GatewayBuilder can be used to build a {@link Gateway} dynamically. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -30,12 +30,12 @@ import java.util.Map; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.Gateway; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/GraphicalElementImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.GraphicalElement; +import org.jboss.bpm.model.internal.GraphicalElement; /** * Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.runtime.Handler; +import org.jboss.bpm.runtime.internal.Handler; /** * Base implementation of all handlers Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/HandlerSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.HandlerSupport; import org.jboss.bpm.runtime.SignalHandler; +import org.jboss.bpm.runtime.internal.HandlerSupport; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -30,14 +30,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.GraphicalElement; -import org.jboss.bpm.model.InclusiveGateway; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.SequenceFlow.ConditionType; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.GraphicalElement; +import org.jboss.bpm.model.internal.InclusiveGateway; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/InputSetImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; -import org.jboss.bpm.model.ArtifactInput; -import org.jboss.bpm.model.InputSet; import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.model.internal.ArtifactInput; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; /** * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/IntermediateEventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -28,11 +28,11 @@ import java.util.List; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.IntermediateEvent; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.IntermediateEvent; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Event; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageEventDetail; import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.internal.Event; +import org.jboss.bpm.model.internal.MessageEventDetail; /** * The message event detail Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageFlowImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -25,7 +25,7 @@ import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageFlow; +import org.jboss.bpm.model.internal.MessageFlow; /** * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to send and receive them. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -27,11 +27,11 @@ import javax.management.ObjectName; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageSender.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -27,13 +27,13 @@ import org.jboss.bpm.client.MessageManager; import org.jboss.bpm.client.ObjectNameFactory; -import org.jboss.bpm.model.Entity; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.MessageBuilderFactory; -import org.jboss.bpm.model.Participant; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.Entity; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Participant; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleInFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.MultipleInFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.MultipleInFlowSupport; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/MultipleOutFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.MultipleOutFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.MultipleOutFlowSupport; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/OutputSetImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; -import org.jboss.bpm.model.ArtifactOutput; -import org.jboss.bpm.model.OutputSet; import org.jboss.bpm.model.Property; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.model.internal.ArtifactOutput; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; /** * An OuputSet, which is used in the definition of common attributes for Activities and for attributes of a Process Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -28,11 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Gate; -import org.jboss.bpm.model.ParallelGateway; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.Gate; +import org.jboss.bpm.model.internal.ParallelGateway; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.internal.TokenImpl; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParticipantImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,9 +21,9 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Entity; -import org.jboss.bpm.model.Participant; -import org.jboss.bpm.model.Role; +import org.jboss.bpm.model.internal.Entity; +import org.jboss.bpm.model.internal.Participant; +import org.jboss.bpm.model.internal.Role; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -25,8 +25,6 @@ import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; @@ -38,6 +36,8 @@ import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Constants.TaskType; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.Gateway; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; import org.jboss.bpm.runtime.SignalHandler; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -41,17 +41,17 @@ import org.jboss.bpm.ProcessTimeoutException; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.internal.ProcessManagerImpl; -import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.InputSet; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.OutputSet; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.StartEvent; +import org.jboss.bpm.model.internal.Assignment; +import org.jboss.bpm.model.internal.EndEvent; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.StartEvent; import org.jboss.bpm.runtime.Attachments; -import org.jboss.bpm.runtime.MutablePropertySupport; +import org.jboss.bpm.runtime.internal.MutablePropertySupport; /** * A Process is any Activity performed within a company or organization. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderFactoryImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.PropertyBuilder; -import org.jboss.bpm.model.PropertyBuilderFactory; +import org.jboss.bpm.model.internal.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilderFactory; /** * A Factory for the {@link PropertyBuilder}. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilder; /** * A PropertyBuilder can be used to build a {@link Property} dynamically. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/PropertyImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.Expression; /** * A Property, which is used in the definition of attributes for a Process and common activity attributes Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -32,9 +32,9 @@ import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.ReceiveTask; import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; +import org.jboss.bpm.model.internal.ReceiveTask; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RoleImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Role; +import org.jboss.bpm.model.internal.Role; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/RuntimeProcessImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -25,7 +25,7 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.runtime.TokenExecutor; -import org.jboss.bpm.runtime.RuntimeProcess; +import org.jboss.bpm.runtime.internal.RuntimeProcess; /** * A RuntimeProcess add runtime behaviour to the {@link Process} Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -27,9 +27,9 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SendTask; import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; +import org.jboss.bpm.model.internal.SendTask; import org.jboss.bpm.runtime.Token; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SequenceFlowImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.Expression; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.SequenceFlow; /** * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -24,8 +24,8 @@ //$Id$ import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SignalEventDetail; import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.internal.SignalEventDetail; /** * The Signal event detail Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleInFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,10 +21,10 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.SingleInFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SingleInFlowSupport; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SingleOutFlowSetterSupport.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -21,10 +21,10 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.SingleOutFlowSupport; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SingleOutFlowSupport; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/StartEventImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -32,17 +32,17 @@ import org.jboss.bpm.client.ExecutionManager; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SignalEventDetail; -import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Process.ProcessStatus; -import org.jboss.bpm.runtime.RuntimeProcess; +import org.jboss.bpm.model.internal.EventDetail; +import org.jboss.bpm.model.internal.SequenceFlow; +import org.jboss.bpm.model.internal.SignalEventDetail; +import org.jboss.bpm.model.internal.StartEvent; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; +import org.jboss.bpm.runtime.internal.RuntimeProcess; import org.jboss.bpm.runtime.internal.TokenImpl; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SubProcessImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -25,7 +25,7 @@ import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.SubProcess; +import org.jboss.bpm.model.internal.SubProcess; import org.jboss.bpm.runtime.SignalHandler; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/SupportingElementImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.SupportingElement; +import org.jboss.bpm.model.internal.SupportingElement; /** * Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskBuilderImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Task; import org.jboss.bpm.model.TaskBuilder; +import org.jboss.bpm.model.internal.Task; /** * The TaskBuilder can be used to dynamically build {@link Task}. Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,8 +23,8 @@ import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Task; import org.jboss.bpm.model.Constants.TaskType; +import org.jboss.bpm.model.internal.Task; import org.jboss.bpm.runtime.SignalHandler; //$Id$ Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/model/internal/TokenExecutorImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -34,16 +34,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.internal.RunnableToken; -import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Process.ProcessStatus; +import org.jboss.bpm.model.internal.ConnectingObject; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.FlowHandler; -import org.jboss.bpm.runtime.RuntimeProcess; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.Token.TokenStatus; import org.jboss.bpm.runtime.internal.MutableToken; +import org.jboss.bpm.runtime.internal.RuntimeProcess; /** * The {@link FlowHandler} invokes the TokenExecutor to schedule Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingExecutionContext.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.FlowObject; import org.jboss.bpm.runtime.ExecutionContext; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,11 +23,11 @@ //$Id$ -import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.Activity; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/MutableToken.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.Token; /** Modified: jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/TokenImpl.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.FlowObject; -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.internal.FlowObject; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.SequenceFlow; import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AvailabilityHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,10 +23,10 @@ // $Id$ -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.PropertyBuilder; -import org.jboss.bpm.model.PropertyBuilderFactory; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilderFactory; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/ValidationHandler.java 2008-08-18 10:40:03 UTC (rev 1919) @@ -23,10 +23,10 @@ // $Id$ -import org.jboss.bpm.model.InputSet; -import org.jboss.bpm.model.OutputSet; -import org.jboss.bpm.model.PropertyBuilder; -import org.jboss.bpm.model.PropertyBuilderFactory; +import org.jboss.bpm.model.internal.InputSet; +import org.jboss.bpm.model.internal.OutputSet; +import org.jboss.bpm.model.internal.PropertyBuilder; +import org.jboss.bpm.model.internal.PropertyBuilderFactory; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) @@ -35,7 +35,7 @@ <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry> Modified: jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-18 09:57:17 UTC (rev 1918) +++ jbossbpm/spec/branches/tdiesler/modules/testsuite/src/test/resources/jbpm-beans.xml 2008-08-18 10:40:03 UTC (rev 1919) @@ -39,7 +39,7 @@ <bean name="jBPMDialectHandlerXPDL21" class="org.jboss.bpm.dialect.xpdl21.DialectHandlerImpl"/>  - <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.internal.DialectRegistry"> <property name="registry"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1918 - jbossbpm/spec/branches.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 05:57:17 -0400 (Mon, 18 Aug 2008) New Revision: 1918 Added: jbossbpm/spec/branches/tdiesler/ Log: Recreate userbranch Copied: jbossbpm/spec/branches/tdiesler (from rev 1917, jbossbpm/spec/trunk)

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1917 - jbossbpm/spec/branches.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 05:56:59 -0400 (Mon, 18 Aug 2008) New Revision: 1917 Removed: jbossbpm/spec/branches/tdiesler/ Log: Recreate userbranch

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1916 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 22 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 05:53:44 -0400 (Mon, 18 Aug 2008) New Revision: 1916 Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Activity.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Artifact.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ArtifactsContainer.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Association.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/BpmnDiagram.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Graph.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Group.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Identifiable.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/IdentifiableNode.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Lane.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Pool.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SubProcess.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Vertex.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EAnnotation.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EClass.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EEnum.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EModelElement.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EObject.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EOperation.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EPackage.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EReference.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EStringToStringMapEntry.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ETypedElement.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Add.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Any.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Difference.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Documentation.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Extension.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/PackageReference.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Replace.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/XMI.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java Log: Organize imports Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -21,7 +21,6 @@ */ package org.jboss.bpm.model; -import org.jboss.bpm.model.Constants.ExpressionLanguage; //$Id$ Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -23,7 +23,6 @@ //$Id$ -import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.Signal.SignalType; /** Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -93,19 +93,19 @@ EventBuilder addEndEvent(String name); /** - * Add a {@link Task} of {@link Constants.TaskType} NONE with a given name + * Add a {@link Task} of {@link TaskType} NONE with a given name */ TaskBuilder addTask(String name); /** * Add a {@link Task} with a given name and type */ - TaskBuilder addTask(String name, Constants.TaskType type); + TaskBuilder addTask(String name, TaskType type); /** * Add an {@link ExclusiveGateway} with a given name */ - GatewayBuilder addGateway(String name, Constants.GatewayType type); + GatewayBuilder addGateway(String name, GatewayType type); /** * Add a {@link Message} with a given name. @@ -120,7 +120,7 @@ /** * Add an {@link Assignment} to the {@link Process} or the current {@link FlowObject}. */ - ProcessBuilder addAssignment(Constants.AssignTime time, Constants.ExpressionLanguage lang, String fromExpr, String toProp); + ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); /** * Add an {@link ExecutionHandler} with a given Class Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -60,13 +60,13 @@ import org.jboss.bpm.dialect.api10.model.ObjectFactory; import org.jboss.bpm.model.Assignment; import org.jboss.bpm.model.ComplexGateway; +import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.ExclusiveGateway; import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.Gateway; @@ -88,7 +88,6 @@ import org.jboss.bpm.model.SignalEventDetail; import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Task; -import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -82,8 +82,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.Handler; Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlType; import org.jboss.bpm.model.Activity; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.Gateway; @@ -47,7 +46,7 @@ { JAXBProperty to; JAXBExpression from; - Constants.AssignTime assignTime; + AssignTime assignTime; public JAXBProperty getTo() { @@ -71,13 +70,13 @@ this.from = from; } - public Constants.AssignTime getAssignTime() + public AssignTime getAssignTime() { return assignTime; } @XmlAttribute(name = "time") - public void setAssignTime(Constants.AssignTime assignTime) + public void setAssignTime(AssignTime assignTime) { this.assignTime = assignTime; } Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlValue; import org.jboss.bpm.model.Constants; -import org.jboss.bpm.model.Constants.ExpressionLanguage; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -32,7 +32,6 @@ import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; //$Id$ Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -35,7 +35,6 @@ import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.ReceiveTask; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -38,8 +38,6 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.runtime.ExecutionHandler; /** Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; @@ -17,6 +18,7 @@ import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; @@ -17,6 +18,7 @@ import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -11,6 +11,7 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; @@ -17,6 +18,7 @@ import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; @@ -19,6 +20,7 @@ import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,12 +10,14 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -46,8 +46,6 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.Constants.TaskType; import org.jboss.util.xml.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Activity.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Activity.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Activity.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Artifact.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Artifact.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Artifact.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ArtifactsContainer.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ArtifactsContainer.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ArtifactsContainer.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Association.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Association.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Association.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; + import org.jboss.bpm.dialect.stp.model.ecore.EModelElement; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/BpmnDiagram.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/BpmnDiagram.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/BpmnDiagram.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Graph.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Graph.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Graph.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlSeeAlso; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Group.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Group.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Group.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Identifiable.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Identifiable.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Identifiable.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; + import org.jboss.bpm.dialect.stp.model.ecore.EModelElement; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/IdentifiableNode.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/IdentifiableNode.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/IdentifiableNode.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlSchemaType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Lane.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Lane.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Lane.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Pool.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Pool.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Pool.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SubProcess.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SubProcess.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SubProcess.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Vertex.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Vertex.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Vertex.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EAnnotation.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EAnnotation.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EAnnotation.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EClass.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EClass.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EClass.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EEnum.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EEnum.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EEnum.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EModelElement.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EModelElement.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EModelElement.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,10 +10,12 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; + import org.jboss.bpm.dialect.stp.model.Association; import org.jboss.bpm.dialect.stp.model.Identifiable; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EObject.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EObject.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EObject.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -22,6 +23,7 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; + import org.jboss.bpm.dialect.stp.model.xmi.Extension; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EOperation.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EOperation.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EOperation.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EPackage.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EPackage.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EPackage.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EReference.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EReference.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EReference.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EStringToStringMapEntry.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EStringToStringMapEntry.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EStringToStringMapEntry.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -21,6 +22,7 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; + import org.jboss.bpm.dialect.stp.model.xmi.Extension; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ETypedElement.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ETypedElement.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ETypedElement.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Add.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Add.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Add.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Any.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Any.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Any.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -12,12 +12,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyAttribute; import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Difference.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Difference.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Difference.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -12,6 +12,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -25,6 +26,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Documentation.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Documentation.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Documentation.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Extension.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Extension.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Extension.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; @@ -18,6 +19,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; + import org.w3c.dom.Element; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/PackageReference.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/PackageReference.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/PackageReference.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Replace.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Replace.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Replace.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/XMI.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/XMI.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/XMI.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyElement; Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -30,7 +30,6 @@ import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Signal; @@ -120,7 +119,7 @@ ExecutionContext exContext = token.getExecutionContext(); for (Assignment ass : proc.getAssignments()) { - if (ass.getAssignTime() == Constants.AssignTime.Start) + if (ass.getAssignTime() == AssignTime.Start) { Expression expr = ass.getFrom(); ExpressionEvaluator exprEvaluator = new ExpressionEvaluator(expr); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -25,7 +25,6 @@ import org.jboss.bpm.model.Activity; import org.jboss.bpm.model.ActivityBuilder; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.Constants.ExpressionLanguage; @@ -73,7 +72,7 @@ return this; } - public ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang) + public ActivityBuilder addIORule(String body, ExpressionLanguage lang) { ExpressionImpl expr = new ExpressionImpl(lang, body); getActivity().addIORule(expr); @@ -82,7 +81,7 @@ public ActivityBuilder addProperty(String name, String value) { - Property prop = new PropertyImpl(name, new ExpressionImpl(Constants.ExpressionLanguage.String, value)); + Property prop = new PropertyImpl(name, new ExpressionImpl(ExpressionLanguage.String, value)); getActivity().addProperty(prop); return this; } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -24,9 +24,9 @@ //$Id$ import org.jboss.bpm.model.Assignment; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Property; +import org.jboss.bpm.model.Constants.AssignTime; /** * An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates. @@ -37,18 +37,18 @@ @SuppressWarnings("serial") public class AssignmentImpl extends SupportingElementImpl implements Assignment { - private Constants.AssignTime assignTime; + private AssignTime assignTime; private Expression from; private Property to; - public AssignmentImpl(Constants.AssignTime assignTime, Expression from, Property to) + public AssignmentImpl(AssignTime assignTime, Expression from, Property to) { this.assignTime = assignTime; this.from = from; this.to = to; } - public Constants.AssignTime getAssignTime() + public AssignTime getAssignTime() { return assignTime; } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -25,8 +25,8 @@ import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.model.ComplexGateway; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; @@ -46,9 +46,9 @@ super(name); } - public Constants.GatewayType getGatewayType() + public GatewayType getGatewayType() { - return Constants.GatewayType.Complex; + return GatewayType.Complex; } public Expression getIncommingCondition() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.MessageEventDetail; @@ -95,7 +94,7 @@ for (EventDetail eventDetail : getResult()) { - if (eventDetail.getEventDetailType() == Constants.EventDetailType.Message) + if (eventDetail.getEventDetailType() == EventDetailType.Message) { MessageEventDetail msgEventDetail = (MessageEventDetail)eventDetail; MessageSender messageSender = new MessageSender(this, msgEventDetail.getMessageRef()); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -24,7 +24,6 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.EventBuilder; @@ -50,38 +49,38 @@ super(proc, flowObject); } - public EventBuilder addEventDetail(Constants.EventDetailType detailType) + public EventBuilder addEventDetail(EventDetailType detailType) { - if (detailType == Constants.EventDetailType.Message) + if (detailType == EventDetailType.Message) { eventDetail = new MessageEventDetailImpl(); addEventDetail(getEvent(), eventDetail); } - else if (detailType == Constants.EventDetailType.Timer) + else if (detailType == EventDetailType.Timer) { throw new NotImplementedException("JBPM-1663", "EventDetail Timer"); } - else if (detailType == Constants.EventDetailType.Error) + else if (detailType == EventDetailType.Error) { throw new NotImplementedException("JBPM-1664", "EventDetail Error"); } - else if (detailType == Constants.EventDetailType.Cancel) + else if (detailType == EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1665", "EventDetail Cancel"); } - else if (detailType == Constants.EventDetailType.Compensation) + else if (detailType == EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1666", "EventDetail Compensation"); } - else if (detailType == Constants.EventDetailType.Conditional) + else if (detailType == EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1667", "EventDetail Conditional"); } - else if (detailType == Constants.EventDetailType.Link) + else if (detailType == EventDetailType.Link) { throw new NotImplementedException("JBPM-1668", "EventDetail Link"); } - else if (detailType == Constants.EventDetailType.Signal) + else if (detailType == EventDetailType.Signal) { eventDetail = new SignalEventDetailImpl(); addEventDetail(getEvent(), eventDetail); @@ -120,26 +119,26 @@ private void addEventDetail(EventImpl event, EventDetail trigger) { - Constants.EventDetailType detailType = trigger.getEventDetailType(); + EventDetailType detailType = trigger.getEventDetailType(); if (event instanceof StartEvent) { StartEventImpl start = (StartEventImpl)event; if (start.getTrigger().size() > 0) throw new NotImplementedException("JBPM-1660", "StartEvent Multiple Trigger"); - if (detailType == Constants.EventDetailType.Message) + if (detailType == EventDetailType.Message) { throw new NotImplementedException("JBPM-1657", "StartEvent Message Trigger"); } - else if (detailType == Constants.EventDetailType.Timer) + else if (detailType == EventDetailType.Timer) { throw new NotImplementedException("JBPM-1658", "StartEvent Timer Trigger"); } - else if (detailType == Constants.EventDetailType.Conditional) + else if (detailType == EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1659", "StartEvent Conditional Trigger"); } - else if (detailType == Constants.EventDetailType.Signal) + else if (detailType == EventDetailType.Signal) { start.addTrigger(eventDetail); } @@ -154,35 +153,35 @@ if (intermediate.getTrigger().size() > 0) throw new NotImplementedException("JBPM-1682", "IntermediateEvent Multiple Trigger"); - if (detailType == Constants.EventDetailType.Message) + if (detailType == EventDetailType.Message) { throw new NotImplementedException("JBPM-1669", "IntermediateEvent Message Trigger"); } - else if (detailType == Constants.EventDetailType.Timer) + else if (detailType == EventDetailType.Timer) { throw new NotImplementedException("JBPM-1670", "IntermediateEvent Timer Trigger"); } - else if (detailType == Constants.EventDetailType.Error) + else if (detailType == EventDetailType.Error) { throw new NotImplementedException("JBPM-1671", "IntermediateEvent Error Trigger"); } - else if (detailType == Constants.EventDetailType.Cancel) + else if (detailType == EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1672", "IntermediateEvent Cancel Trigger"); } - else if (detailType == Constants.EventDetailType.Compensation) + else if (detailType == EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1673", "IntermediateEvent Compensation Trigger"); } - else if (detailType == Constants.EventDetailType.Conditional) + else if (detailType == EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1674", "IntermediateEvent Conditional Trigger"); } - else if (detailType == Constants.EventDetailType.Link) + else if (detailType == EventDetailType.Link) { throw new NotImplementedException("JBPM-1675", "IntermediateEvent Link Trigger"); } - else if (detailType == Constants.EventDetailType.Signal) + else if (detailType == EventDetailType.Signal) { throw new NotImplementedException("JBPM-1650", "IntermediateEvent Signal Trigger"); } @@ -197,27 +196,27 @@ if (end.getResult().size() > 0) throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result"); - if (detailType == Constants.EventDetailType.Message) + if (detailType == EventDetailType.Message) { end.addResult(eventDetail); } - else if (detailType == Constants.EventDetailType.Error) + else if (detailType == EventDetailType.Error) { throw new NotImplementedException("JBPM-1677", "EndEvent Error Result"); } - else if (detailType == Constants.EventDetailType.Cancel) + else if (detailType == EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result"); } - else if (detailType == Constants.EventDetailType.Compensation) + else if (detailType == EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result"); } - else if (detailType == Constants.EventDetailType.Signal) + else if (detailType == EventDetailType.Signal) { throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result"); } - else if (detailType == Constants.EventDetailType.Terminate) + else if (detailType == EventDetailType.Terminate) { throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result"); } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -29,12 +29,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.ExclusiveGateway; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; @@ -60,9 +60,9 @@ super(name); } - public Constants.GatewayType getGatewayType() + public GatewayType getGatewayType() { - return Constants.GatewayType.Exclusive; + return GatewayType.Exclusive; } @Override Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.runtime.ExecutionContext; @@ -57,8 +56,8 @@ */ public Object evaluateExpression(Token token) { - Constants.ExpressionLanguage exprLang = expr.getExpressionLanguage(); - if (exprLang == Constants.ExpressionLanguage.MVEL) + ExpressionLanguage exprLang = expr.getExpressionLanguage(); + if (exprLang == ExpressionLanguage.MVEL) { String mvel = expr.getExpressionBody(); ExecutionContext exContext = token.getExecutionContext(); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; +import org.jboss.bpm.model.Constants.ExpressionLanguage; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, @@ -37,22 +37,22 @@ public class ExpressionImpl extends SupportingElementImpl implements Expression { private Object body; - private Constants.ExpressionLanguage lang; + private ExpressionLanguage lang; public ExpressionImpl(Object body) { this.body = body; - this.lang = (body instanceof String ? Constants.ExpressionLanguage.String : Constants.ExpressionLanguage.Object); + this.lang = (body instanceof String ? ExpressionLanguage.String : ExpressionLanguage.Object); } - public ExpressionImpl(Constants.ExpressionLanguage lang, Object body) + public ExpressionImpl(ExpressionLanguage lang, Object body) { this.body = body; this.lang = lang; } - public Constants.ExpressionLanguage getExpressionLanguage() + public ExpressionLanguage getExpressionLanguage() { return lang; } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -29,7 +29,6 @@ import org.jboss.bpm.NameNotUniqueException; import org.jboss.bpm.model.Assignment; import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Gate; @@ -133,7 +132,7 @@ // Start Time Assignments for (Assignment ass : getAssignments()) { - if (ass.getAssignTime() == Constants.AssignTime.Start) + if (ass.getAssignTime() == AssignTime.Start) processAssignment(ass, token); } @@ -151,7 +150,7 @@ // End Time Assignments for (Assignment ass : getAssignments()) { - if (ass.getAssignTime() == Constants.AssignTime.End) + if (ass.getAssignTime() == AssignTime.End) processAssignment(ass, token); } } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -23,7 +23,6 @@ //$Id$ -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; @@ -52,7 +51,7 @@ return this; } - public GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage lang, String body) + public GatewayBuilder addConditionalGate(String targetName, ExpressionLanguage lang, String body) { gate = new GateImpl(targetName, ConditionType.Expression, new ExpressionImpl(lang, body)); getGateway().addGate(gate); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -30,13 +30,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.GraphicalElement; import org.jboss.bpm.model.InclusiveGateway; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; @@ -63,9 +63,9 @@ super(name); } - public Constants.GatewayType getGatewayType() + public GatewayType getGatewayType() { - return Constants.GatewayType.Inclusive; + return GatewayType.Inclusive; } @Override @@ -111,7 +111,7 @@ if (seqFlow.getConditionType() == ConditionType.Expression) { Expression expr = seqFlow.getConditionExpression(); - if (expr.getExpressionLanguage() == Constants.ExpressionLanguage.MVEL) + if (expr.getExpressionLanguage() == ExpressionLanguage.MVEL) { String mvel = expr.getExpressionBody(); ExecutionContext exContext = token.getExecutionContext(); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -23,10 +23,10 @@ //$Id$ -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageEventDetail; +import org.jboss.bpm.model.Constants.EventDetailType; /** * The message event detail @@ -39,9 +39,9 @@ { private Message messageRef; - public Constants.EventDetailType getEventDetailType() + public EventDetailType getEventDetailType() { - return Constants.EventDetailType.Message; + return EventDetailType.Message; } public Message.Implementation getImplementation() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model.internal; -import org.jboss.bpm.model.Constants; +import org.jboss.bpm.model.Constants.TaskType; //$Id$ @@ -41,8 +41,8 @@ } @Override - public Constants.TaskType getTaskType() + public TaskType getTaskType() { - return Constants.TaskType.None; + return TaskType.None; } } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -29,10 +29,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.model.ConnectingObject; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.ParallelGateway; import org.jboss.bpm.model.SequenceFlow; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; import org.jboss.bpm.runtime.internal.TokenImpl; @@ -58,9 +58,9 @@ super(name); } - public Constants.GatewayType getGatewayType() + public GatewayType getGatewayType() { - return Constants.GatewayType.Parallel; + return GatewayType.Parallel; } @Override Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -24,7 +24,6 @@ //$Id$ import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Gateway; @@ -151,43 +150,43 @@ public TaskBuilder addTask(String name) { - return addTask(name, Constants.TaskType.None); + return addTask(name, TaskType.None); } - public TaskBuilder addTask(String name, Constants.TaskType type) + public TaskBuilder addTask(String name, TaskType type) { flowObject = (FlowObjectImpl)getProcessInternal().getFlowObject(name); if (flowObject == null) { - if (type == Constants.TaskType.None || type == null) + if (type == TaskType.None || type == null) { flowObject = new NoneTaskImpl(name); } - else if (type == Constants.TaskType.Service) + else if (type == TaskType.Service) { throw new NotImplementedException("JBPM-1652", "Task Type Service"); } - else if (type == Constants.TaskType.Receive) + else if (type == TaskType.Receive) { flowObject = new ReceiveTaskImpl(name); } - else if (type == Constants.TaskType.Send) + else if (type == TaskType.Send) { flowObject = new SendTaskImpl(name); } - else if (type == Constants.TaskType.User) + else if (type == TaskType.User) { throw new NotImplementedException("JBPM-1653", "Task Type User"); } - else if (type == Constants.TaskType.Script) + else if (type == TaskType.Script) { throw new NotImplementedException("JBPM-1654", "Task Type Script"); } - else if (type == Constants.TaskType.Manual) + else if (type == TaskType.Manual) { throw new NotImplementedException("JBPM-1655", "Task Type Manual"); } - else if (type == Constants.TaskType.Reference) + else if (type == TaskType.Reference) { throw new NotImplementedException("JBPM-1656", "Task Type Reference"); } @@ -200,24 +199,24 @@ return new TaskBuilderImpl(getProcessInternal(), flowObject); } - public GatewayBuilder addGateway(String name, Constants.GatewayType type) + public GatewayBuilder addGateway(String name, GatewayType type) { flowObject = (FlowObjectImpl)getProcessInternal().getFlowObject(name); if (flowObject == null) { - if (Constants.GatewayType.Exclusive == type) + if (GatewayType.Exclusive == type) { flowObject = new ExclusiveGatewayDataBasedImpl(name); } - else if (Constants.GatewayType.Inclusive == type) + else if (GatewayType.Inclusive == type) { flowObject = new InclusiveGatewayImpl(name); } - else if (Constants.GatewayType.Parallel == type) + else if (GatewayType.Parallel == type) { flowObject = new ParallelGatewayImpl(name); } - else if (Constants.GatewayType.Complex == type) + else if (GatewayType.Complex == type) { flowObject = new ComplexGatewayImpl(name); } @@ -240,7 +239,7 @@ return this; } - public ProcessBuilder addAssignment(Constants.AssignTime time, Constants.ExpressionLanguage lang, String fromExpr, String toProp) + public ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp) { ExpressionImpl from = new ExpressionImpl(lang, fromExpr); PropertyImpl to = new PropertyImpl(toProp, null); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -29,11 +29,11 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.client.MessageListener; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.ReceiveTask; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; @@ -66,9 +66,9 @@ } @Override - public Constants.TaskType getTaskType() + public TaskType getTaskType() { - return Constants.TaskType.Receive; + return TaskType.Receive; } public Message.Implementation getImplementation() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -25,10 +25,10 @@ import org.jboss.bpm.InvalidProcessException; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SendTask; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; import org.jboss.bpm.runtime.Token; @@ -51,9 +51,9 @@ } @Override - public Constants.TaskType getTaskType() + public TaskType getTaskType() { - return Constants.TaskType.Send; + return TaskType.Send; } public Message.Implementation getImplementation() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SignalEventDetail; +import org.jboss.bpm.model.Constants.EventDetailType; /** * The Signal event detail @@ -38,9 +38,9 @@ { private Signal signalRef; - public Constants.EventDetailType getEventDetailType() + public EventDetailType getEventDetailType() { - return Constants.EventDetailType.Signal; + return EventDetailType.Signal; } public Signal getSignalRef() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -22,9 +22,9 @@ package org.jboss.bpm.model.internal; import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.runtime.SignalHandler; //$Id$ @@ -51,7 +51,7 @@ return ActivityType.Task; } - public abstract Constants.TaskType getTaskType(); + public abstract TaskType getTaskType(); public SignalHandler getSignalHandler() { Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/runtime/internal/DelegatingToken.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -23,6 +23,7 @@ //$Id$ +import org.jboss.bpm.model.Activity; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.InputSet; import org.jboss.bpm.model.OutputSet; Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -31,9 +31,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; -import org.jboss.bpm.model.Constants.TaskType; /** * Test the Airticket sample application Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -34,7 +34,6 @@ import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -33,8 +33,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -32,8 +32,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -34,8 +34,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -32,8 +32,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -33,8 +33,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -31,7 +31,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -37,8 +37,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -27,7 +27,6 @@ import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -30,8 +30,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Constants.AssignTime; -import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -32,8 +32,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -32,8 +32,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.ExpressionLanguage; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -31,7 +31,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -34,8 +34,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-18 09:37:43 UTC (rev 1915) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-18 09:53:44 UTC (rev 1916) @@ -33,8 +33,6 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Constants.EventDetailType; -import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler;

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1915 - in jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm: api and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-08-18 05:37:43 -0400 (Mon, 18 Aug 2008) New Revision: 1915 Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/TxTests.java Removed: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/tx/ Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java Log: added transaction test to the check-in test suite Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java 2008-08-18 09:34:17 UTC (rev 1914) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java 2008-08-18 09:37:43 UTC (rev 1915) @@ -27,6 +27,7 @@ import org.jbpm.pvm.api.db.continuation.ContinuationTests; import org.jbpm.pvm.api.db.svc.DbSvcTests; import org.jbpm.pvm.api.spring.SpringTests; +import org.jbpm.pvm.api.tx.TxTests; import org.jbpm.pvm.internal.db.langext.DbLangExtTests; import org.jbpm.pvm.internal.db.model.DbModelTests; import org.jbpm.pvm.internal.jobexecutor.JobExecutorTests; @@ -47,6 +48,7 @@ defaultConfigTests.addTest(DbSvcTests.suite()); defaultConfigTests.addTest(JobExecutorTests.suite()); defaultConfigTests.addTest(ContinuationTests.suite()); + defaultConfigTests.addTest(TxTests.suite()); suite.addTest(new EnvironmentFactoryTestSetup(defaultConfigTests, "environment.cfg.xml")); suite.addTest(new EnvironmentFactoryTestSetup(DbLangExtTests.suite(), "org/jbpm/pvm/internal/db/langext/environment.cfg.xml")); Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java (from rev 1887, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/db/tx/BasicTransactionTest.java) =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java (rev 0) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-08-18 09:37:43 UTC (rev 1915) @@ -0,0 +1,199 @@ +/* + * 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.api.tx; + +import java.util.List; + +import javax.transaction.Synchronization; + +import org.hibernate.Session; +import org.jbpm.pvm.PvmException; +import org.jbpm.pvm.env.Environment; +import org.jbpm.pvm.env.Transaction; +import org.jbpm.pvm.internal.cmd.Command; +import org.jbpm.pvm.internal.model.CommentImpl; +import org.jbpm.pvm.internal.type.variable.StringVariable; +import org.jbpm.pvm.test.base.DbTestCase; + +/** + * @author Tom Baeyens + */ +public class BasicTransactionTest extends DbTestCase { + + public void testCommit() { + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + session.save(new CommentImpl("if i only had the time to write code")); + return null; + } + }); + + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + List<CommentImpl> comments = session.createQuery("from "+CommentImpl.class.getName()).list(); + assertEquals("if i only had the time to write code", comments.get(0).getMessage()); + return null; + } + }); + } + + + public static class MyOwnRuntimeException extends RuntimeException { + } + + public void testRollbackRuntimeException() { + try { + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + session.save(new CommentImpl("if i only had the time to write code")); + throw new MyOwnRuntimeException(); + } + }); + fail("expected exception"); + } catch (MyOwnRuntimeException e) { + // OK + } + + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + List<CommentImpl> comments = session.createQuery("from "+CommentImpl.class.getName()).list(); + assertEquals(0, comments.size()); + return null; + } + }); + } + + public static class MyOwnCheckedException extends Exception { + } + + public void testRollbackCheckedException() { + try { + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); + session.save(new CommentImpl("if i only had the time to write code")); + throw new MyOwnCheckedException(); + } + }); + fail("expected exception"); + } catch (PvmException e) { + // OK + assertSame(MyOwnCheckedException.class, e.getCause().getClass()); + } + + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + List<CommentImpl> comments = session.createQuery("from "+CommentImpl.class.getName()).list(); + assertEquals(0, comments.size()); + return null; + } + }); + } + + + public static class SuccessfulSynchronization implements Synchronization { + public void beforeCompletion() { + Environment environment = Environment.getCurrent(); + Session session = environment.get(Session.class); + StringVariable stringVariable = new StringVariable(); + stringVariable.setValue("hello"); + session.save(stringVariable); + } + public void afterCompletion(int arg0) { + } + } + + public void testSuccessfulSynchronization() { + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); + session.save(new CommentImpl("if i only had the time to write code")); + Transaction transaction = environment.get(Transaction.class); + SuccessfulSynchronization successfulSynchronization = new SuccessfulSynchronization(); + transaction.registerSynchronization(successfulSynchronization); + return null; + } + }); + + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + List<CommentImpl> comments = session.createQuery("from "+CommentImpl.class.getName()).list(); + assertEquals("if i only had the time to write code", comments.get(0).getMessage()); + List<StringVariable> stringVariables = session.createQuery("from "+StringVariable.class.getName()).list(); + assertEquals("hello", stringVariables.get(0).getValue()); + return null; + } + }); + } + + public static class UnsuccessfulSynchronization implements Synchronization { + public void beforeCompletion() { + Environment environment = Environment.getCurrent(); + Session session = environment.get(Session.class); + StringVariable stringVariable = new StringVariable(); + stringVariable.setValue("hello"); + session.save(stringVariable); + throw new MyOwnRuntimeException(); + } + public void afterCompletion(int arg0) { + } + } + + public void testUnsuccessfulSynchronization() { + try { + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); + session.save(new CommentImpl("if i only had the time to write code")); + Transaction transaction = environment.get(Transaction.class); + UnsuccessfulSynchronization unsuccessfulSynchronization = new UnsuccessfulSynchronization(); + transaction.registerSynchronization(unsuccessfulSynchronization); + return null; + } + }); + fail("expected exception"); + } catch (MyOwnRuntimeException e) { + // OK + } + + // the exception in the beforeCompletion in the synchronization should have caused + // the previous transaction to rollback + + commandService.execute(new Command<Object>(){ + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + List<CommentImpl> comments = session.createQuery("from "+CommentImpl.class.getName()).list(); + assertEquals(0, comments.size()); + List<StringVariable> stringVariables = session.createQuery("from "+StringVariable.class.getName()).list(); + assertEquals(0, stringVariables.size()); + return null; + } + }); + } + +} Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java ___________________________________________________________________ Name: svn:mergeinfo + Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/TxTests.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/TxTests.java (rev 0) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/tx/TxTests.java 2008-08-18 09:37:43 UTC (rev 1915) @@ -0,0 +1,41 @@ +/* + * 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.api.tx; + +import junit.framework.Test; +import junit.framework.TestSuite; + + +/** + * @author Tom Baeyens + */ +public class TxTests { + + public static Test suite() { + TestSuite suite = new TestSuite("org.jbpm.pvm.api.tx"); + //$JUnit-BEGIN$ + suite.addTestSuite(BasicTransactionTest.class); + //$JUnit-END$ + return suite; + } + +}

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1914 - in jbossbpm/spec/trunk/modules: dialects/api10/src/main/java/org/jboss/bpm/dialect/api10 and 18 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 05:34:17 -0400 (Mon, 18 Aug 2008) New Revision: 1914 Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java Log: Move enums to Constants Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ActivityBuilder.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.model; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants.ExpressionLanguage; //$Id$ @@ -56,7 +56,7 @@ /** * Add an IORule {@link Expression} */ - ActivityBuilder addIORule(String body, ExpressionLanguage lang); + ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang); /** * Add an activity property Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Assignment.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -21,6 +21,8 @@ */ package org.jboss.bpm.model; +import org.jboss.bpm.model.Constants.AssignTime; + //$Id$ /** @@ -32,11 +34,6 @@ */ public interface Assignment extends SupportingElement { - public enum AssignTime - { - Start, End - } - /** * The target for the Assignment MUST be a Property of the Process or the activity * itself. Added: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java (rev 0) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -0,0 +1,70 @@ +/* + * 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.jboss.bpm.model; + +//$Id$ + + +/** + * A Process is any {@link Activity} performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Constants +{ + + public enum AssignTime + { + Start, End + } + + /** + * Defines the type of an {@link Event} + */ + public enum EventDetailType + { + Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate + } + + public enum ExpressionLanguage + { + MVEL, String, Object + } + + /** + * The GatewayType + * + */ + public enum GatewayType + { + Exclusive, Inclusive, Complex, Parallel + } + + /** + * The TaskType + */ + public enum TaskType + { + Service, Receive, Send, User, Script, Manual, Reference, None + } +} \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Constants.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventBuilder.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.Signal.SignalType; /** @@ -37,7 +37,7 @@ /** * Add an event detail to the last added {@link Event} */ - EventBuilder addEventDetail(EventDetailType detailType); + EventBuilder addEventDetail(Constants.EventDetailType detailType); /** * Add a signal ref to the last added {@link EventDetail} Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/EventDetail.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -21,6 +21,8 @@ */ package org.jboss.bpm.model; +import org.jboss.bpm.model.Constants.EventDetailType; + //$Id$ /** @@ -32,14 +34,6 @@ public interface EventDetail extends SupportingElement { /** - * Defines the type of an {@link Event} - */ - public enum EventDetailType - { - Message, Timer, Error, Conditional, Link, Signal, Compensation, Cancel, Terminate - }; - - /** * The EventDetailType attribute defines the type of trigger expected for an Event. The * set of types includes Message, Timer, Error, Conditional, Link, Signal, Compensate, * Cancel, and Terminate. The EventTypes (Start, Intermediate, and End) will each Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Expression.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -21,6 +21,8 @@ */ package org.jboss.bpm.model; +import org.jboss.bpm.model.Constants.ExpressionLanguage; + //$Id$ /** @@ -32,11 +34,6 @@ */ public interface Expression extends SupportingElement { - public enum ExpressionLanguage - { - MVEL, String, Object - } - /** * An ExpressionBody MUST be entered to provide the text of the expression, which * will be written in the language defined by the ExpressionLanguage attribute. Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -23,6 +23,8 @@ import java.util.List; +import org.jboss.bpm.model.Constants.GatewayType; + //$Id$ /** @@ -38,15 +40,6 @@ public interface Gateway extends FlowObject, MultipleInFlowSupport { /** - * The GatewayType - * - */ - enum GatewayType - { - Exclusive, Inclusive, Complex, Parallel - } - - /** * GatewayType is by default Exclusive. The GatewayType MAY be set to Inclusive, Complex, or Parallel. The GatewayType will determine the behavior of the Gateway, * both for incoming and outgoing Sequence Flow */ Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/GatewayBuilder.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -34,7 +34,7 @@ { GatewayBuilder addDefaultGate(String targetName); - GatewayBuilder addConditionalGate(String targetName, Expression.ExpressionLanguage exprLang, String exprBody); + GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage exprLang, String exprBody); GatewayBuilder addGate(String targetName); } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -22,10 +22,10 @@ package org.jboss.bpm.model; import org.jboss.bpm.client.DialectHandler; -import org.jboss.bpm.model.Assignment.AssignTime; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; import org.jboss.bpm.runtime.SignalHandler; @@ -93,19 +93,19 @@ EventBuilder addEndEvent(String name); /** - * Add a {@link Task} of {@link TaskType} NONE with a given name + * Add a {@link Task} of {@link Constants.TaskType} NONE with a given name */ TaskBuilder addTask(String name); /** * Add a {@link Task} with a given name and type */ - TaskBuilder addTask(String name, TaskType type); + TaskBuilder addTask(String name, Constants.TaskType type); /** * Add an {@link ExclusiveGateway} with a given name */ - GatewayBuilder addGateway(String name, GatewayType type); + GatewayBuilder addGateway(String name, Constants.GatewayType type); /** * Add a {@link Message} with a given name. @@ -120,7 +120,7 @@ /** * Add an {@link Assignment} to the {@link Process} or the current {@link FlowObject}. */ - ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); + ProcessBuilder addAssignment(Constants.AssignTime time, Constants.ExpressionLanguage lang, String fromExpr, String toProp); /** * Add an {@link ExecutionHandler} with a given Class Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -37,14 +37,6 @@ public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport { /** - * The TaskType - */ - public enum TaskType - { - Service, Receive, Send, User, Script, Manual, Reference, None - } - - /** * TaskType is an attribute that has a default of None, but MAY be set to Send, * Receive, User, Script, Manual, Reference, or Service. The TaskType will be * impacted by the Message Flow to and/or from the Task, if Message Flow are @@ -53,5 +45,5 @@ * Script or Manual MUST NOT have an incoming or an outgoing Message Flow. * The TaskType list MAY be extended to include new types. */ - TaskType getTaskType(); + Constants.TaskType getTaskType(); } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -60,6 +60,7 @@ import org.jboss.bpm.dialect.api10.model.ObjectFactory; import org.jboss.bpm.model.Assignment; import org.jboss.bpm.model.ComplexGateway; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.EventDetail; @@ -87,7 +88,7 @@ import org.jboss.bpm.model.SignalEventDetail; import org.jboss.bpm.model.StartEvent; import org.jboss.bpm.model.Task; -import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; @@ -181,20 +182,20 @@ for (EventDetail trigger : start.getTrigger()) { - EventDetailType detailType = trigger.getEventDetailType(); - if (detailType == EventDetailType.Message) + Constants.EventDetailType detailType = trigger.getEventDetailType(); + if (detailType == Constants.EventDetailType.Message) { throw new NotImplementedException("JBPM-1657", "StartTrigger Message"); } - else if (detailType == EventDetailType.Timer) + else if (detailType == Constants.EventDetailType.Timer) { throw new NotImplementedException("JBPM-1658", "StartTrigger Timer"); } - else if (detailType == EventDetailType.Conditional) + else if (detailType == Constants.EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1659", "StartTrigger Conditional"); } - else if (detailType == EventDetailType.Signal) + else if (detailType == Constants.EventDetailType.Signal) { SignalEventDetail signalTrigger = (SignalEventDetail)trigger; Signal signal = signalTrigger.getSignalRef(); @@ -224,8 +225,8 @@ for (EventDetail result : end.getResult()) { - EventDetailType detailType = result.getEventDetailType(); - if (detailType == EventDetailType.Message) + Constants.EventDetailType detailType = result.getEventDetailType(); + if (detailType == Constants.EventDetailType.Message) { MessageEventDetail msgEventDetail = (MessageEventDetail)result; Message message = msgEventDetail.getMessageRef(); @@ -234,23 +235,23 @@ jaxbResult.setMessageRef(jaxbMessageRef); jaxbEnd.getResult().add(jaxbResult); } - else if (detailType == EventDetailType.Error) + else if (detailType == Constants.EventDetailType.Error) { throw new NotImplementedException("JBPM-1677", "EndEvent Error Result"); } - else if (detailType == EventDetailType.Cancel) + else if (detailType == Constants.EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result"); } - else if (detailType == EventDetailType.Compensation) + else if (detailType == Constants.EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result"); } - else if (detailType == EventDetailType.Signal) + else if (detailType == Constants.EventDetailType.Signal) { throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result"); } - else if (detailType == EventDetailType.Terminate) + else if (detailType == Constants.EventDetailType.Terminate) { throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result"); } Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -74,6 +74,7 @@ import org.jboss.bpm.dialect.api10.model.JAXBTerminateEventDetail; import org.jboss.bpm.dialect.api10.model.JAXBTimerEventDetail; import org.jboss.bpm.dialect.api10.model.ObjectFactory; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.MessageBuilder; @@ -81,8 +82,8 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.EventDetail.EventDetailType; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.Handler; @@ -245,7 +246,7 @@ { JAXBSignalEventDetail jaxbSignalTrigger = (JAXBSignalEventDetail)jaxbTrigger; JAXBSignal jaxbSignal = jaxbSignalTrigger.getSignal(); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(jaxbSignal.getType(), + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(jaxbSignal.getType(), jaxbSignal.getMessage()); } else @@ -271,7 +272,7 @@ if (jaxbResult instanceof JAXBMessageEventDetail) { JAXBMessageEventDetail jaxbMessageResult = (JAXBMessageEventDetail)jaxbResult; - eventBuilder.addEventDetail(EventDetailType.Message); + eventBuilder.addEventDetail(Constants.EventDetailType.Message); JAXBMessageRef jaxbMsg = jaxbMessageResult.getMessageRef(); eventBuilder.addMessageRef(jaxbMsg.getNameRef()); } @@ -351,19 +352,19 @@ GatewayBuilder gwBuilder; if (jaxb instanceof JAXBExclusiveGateway) { - gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Exclusive); + gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Exclusive); } else if (jaxb instanceof JAXBInclusiveGateway) { - gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Inclusive); + gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Inclusive); } else if (jaxb instanceof JAXBComplexGateway) { - gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Complex); + gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Complex); } else if (jaxb instanceof JAXBParallelGateway) { - gwBuilder = procBuilder.addGateway(jaxb.getName(), GatewayType.Parallel); + gwBuilder = procBuilder.addGateway(jaxb.getName(), Constants.GatewayType.Parallel); } else { Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -28,11 +28,12 @@ import javax.xml.bind.annotation.XmlType; import org.jboss.bpm.model.Activity; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.Constants.AssignTime; /** * An Assignment, which is used in the definition of attributes for {@link Process}, @@ -46,7 +47,7 @@ { JAXBProperty to; JAXBExpression from; - AssignTime assignTime; + Constants.AssignTime assignTime; public JAXBProperty getTo() { @@ -70,13 +71,13 @@ this.from = from; } - public AssignTime getAssignTime() + public Constants.AssignTime getAssignTime() { return assignTime; } @XmlAttribute(name = "time") - public void setAssignTime(AssignTime assignTime) + public void setAssignTime(Constants.AssignTime assignTime) { this.assignTime = assignTime; } Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -27,7 +27,8 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants; +import org.jboss.bpm.model.Constants.ExpressionLanguage; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, @@ -40,16 +41,16 @@ @XmlType(name = "Expression") public class JAXBExpression { - private ExpressionLanguage lang; + private Constants.ExpressionLanguage lang; private String body; - public ExpressionLanguage getLang() + public Constants.ExpressionLanguage getLang() { return lang; } @XmlAttribute(required = true) - public void setLang(ExpressionLanguage lang) + public void setLang(Constants.ExpressionLanguage lang) { this.lang = lang; } Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -30,9 +30,10 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Message.Implementation; -import org.jboss.bpm.model.Task.TaskType; //$Id$ @@ -49,7 +50,7 @@ "messageRef", "inputSets", "outputSets" }) public class JAXBTask extends JAXBActivity { - private TaskType taskType; + private Constants.TaskType taskType; private Implementation implementation; private List<JAXBInputSet> inputSets = new ArrayList<JAXBInputSet>(); private List<JAXBOutputSet> outputSets = new ArrayList<JAXBOutputSet>(); @@ -76,13 +77,13 @@ this.outFlow = outFlow; } - public TaskType getTaskType() + public Constants.TaskType getTaskType() { return taskType; } @XmlAttribute - public void setTaskType(TaskType taskType) + public void setTaskType(Constants.TaskType taskType) { this.taskType = taskType; } Modified: jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/api10/src/test/java/org/jboss/bpm/dialect/api10/message/ProcessMessageTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -27,6 +27,7 @@ import org.jboss.bpm.client.DialectHandler; import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.Process; @@ -34,7 +35,7 @@ import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.ReceiveTask; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -70,7 +71,7 @@ procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("A"); MessageBuilder msgBuilder = procBuilder.addMessage("FooMsg"); msgBuilder.addProperty("foo", "bar"); - TaskBuilder taskBuilder = procBuilder.addTask("A", TaskType.Receive); + TaskBuilder taskBuilder = procBuilder.addTask("A", Constants.TaskType.Receive); taskBuilder.addMessageRef("FooMsg"); procBuilder.addSequenceFlow("End").addEndEvent("End"); Process expProc = procBuilder.getProcess(); Modified: jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -34,11 +34,12 @@ import org.jboss.bpm.dialect.jpdl32.model.JPDL32StartState; import org.jboss.bpm.dialect.jpdl32.model.JPDL32State; import org.jboss.bpm.dialect.jpdl32.model.JPDL32Transition; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.runtime.ExecutionHandler; /** @@ -95,7 +96,7 @@ private void adaptState(ProcessBuilder builder, JPDL32State jpdlState) { - builder.addTask(jpdlState.getName(), TaskType.None); + builder.addTask(jpdlState.getName(), Constants.TaskType.None); adaptTransitions(builder, jpdlState.getDescriptionOrEventOrExceptionHandler()); for (Object jpdlObj : jpdlState.getDescriptionOrEventOrExceptionHandler()) @@ -124,7 +125,7 @@ private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj) { - builder.addGateway(jpdlObj.getName(), GatewayType.Parallel); + builder.addGateway(jpdlObj.getName(), Constants.GatewayType.Parallel); adaptTransitions(builder, jpdlObj.getScriptOrDescriptionOrEvent()); } Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java =================================================================== --- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -42,11 +42,12 @@ import org.jboss.bpm.dialect.stp.model.ObjectFactory; import org.jboss.bpm.dialect.stp.model.Pool; import org.jboss.bpm.dialect.stp.model.SequenceEdge; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.util.xml.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -169,11 +170,11 @@ { String name = stpActivity.getLabel(); - TaskType taskType = TaskType.None; + Constants.TaskType taskType = Constants.TaskType.None; if (name.startsWith("Send")) - taskType = TaskType.Send; + taskType = Constants.TaskType.Send; if (name.startsWith("Receive")) - taskType = TaskType.Receive; + taskType = Constants.TaskType.Receive; builder.addTask(name, taskType); adaptOutgoingEdges(builder, stpActivity); @@ -181,13 +182,13 @@ else if (activityType == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE) { String name = stpActivity.getLabel(); - builder.addGateway(name, GatewayType.Exclusive); + builder.addGateway(name, Constants.GatewayType.Exclusive); adaptOutgoingEdges(builder, stpActivity); } else if (activityType == ActivityType.GATEWAY_PARALLEL) { String name = stpActivity.getLabel(); - builder.addGateway(name, GatewayType.Parallel); + builder.addGateway(name, Constants.GatewayType.Parallel); adaptOutgoingEdges(builder, stpActivity); } else Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -30,11 +30,12 @@ import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Assignment; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.StartEvent; -import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.Constants.AssignTime; import org.jboss.bpm.model.Process.ProcessStatus; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.model.internal.ExpressionEvaluator; @@ -119,7 +120,7 @@ ExecutionContext exContext = token.getExecutionContext(); for (Assignment ass : proc.getAssignments()) { - if (ass.getAssignTime() == AssignTime.Start) + if (ass.getAssignTime() == Constants.AssignTime.Start) { Expression expr = ass.getFrom(); ExpressionEvaluator exprEvaluator = new ExpressionEvaluator(expr); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityBuilderImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -25,8 +25,9 @@ import org.jboss.bpm.model.Activity; import org.jboss.bpm.model.ActivityBuilder; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Property; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants.ExpressionLanguage; /** * The ActivityBuilder can be used to build an {@link Activity} dynamically. @@ -72,7 +73,7 @@ return this; } - public ActivityBuilder addIORule(String body, ExpressionLanguage lang) + public ActivityBuilder addIORule(String body, Constants.ExpressionLanguage lang) { ExpressionImpl expr = new ExpressionImpl(lang, body); getActivity().addIORule(expr); @@ -81,7 +82,7 @@ public ActivityBuilder addProperty(String name, String value) { - Property prop = new PropertyImpl(name, new ExpressionImpl(ExpressionLanguage.String, value)); + Property prop = new PropertyImpl(name, new ExpressionImpl(Constants.ExpressionLanguage.String, value)); getActivity().addProperty(prop); return this; } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/AssignmentImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.bpm.model.Assignment; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Property; @@ -36,18 +37,18 @@ @SuppressWarnings("serial") public class AssignmentImpl extends SupportingElementImpl implements Assignment { - private AssignTime assignTime; + private Constants.AssignTime assignTime; private Expression from; private Property to; - public AssignmentImpl(AssignTime assignTime, Expression from, Property to) + public AssignmentImpl(Constants.AssignTime assignTime, Expression from, Property to) { this.assignTime = assignTime; this.from = from; this.to = to; } - public AssignTime getAssignTime() + public Constants.AssignTime getAssignTime() { return assignTime; } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ComplexGatewayImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -25,6 +25,7 @@ import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.model.ComplexGateway; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; @@ -45,9 +46,9 @@ super(name); } - public GatewayType getGatewayType() + public Constants.GatewayType getGatewayType() { - return GatewayType.Complex; + return Constants.GatewayType.Complex; } public Expression getIncommingCondition() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EndEventImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -30,13 +30,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.MessageEventDetail; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.runtime.SignalHandler; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.TokenExecutor; @@ -94,7 +95,7 @@ for (EventDetail eventDetail : getResult()) { - if (eventDetail.getEventDetailType() == EventDetailType.Message) + if (eventDetail.getEventDetailType() == Constants.EventDetailType.Message) { MessageEventDetail msgEventDetail = (MessageEventDetail)eventDetail; MessageSender messageSender = new MessageSender(this, msgEventDetail.getMessageRef()); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/EventBuilderImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.bpm.NotImplementedException; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.EventBuilder; @@ -31,7 +32,7 @@ import org.jboss.bpm.model.IntermediateEvent; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.StartEvent; -import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.model.Signal.SignalType; /** @@ -49,38 +50,38 @@ super(proc, flowObject); } - public EventBuilder addEventDetail(EventDetailType detailType) + public EventBuilder addEventDetail(Constants.EventDetailType detailType) { - if (detailType == EventDetailType.Message) + if (detailType == Constants.EventDetailType.Message) { eventDetail = new MessageEventDetailImpl(); addEventDetail(getEvent(), eventDetail); } - else if (detailType == EventDetailType.Timer) + else if (detailType == Constants.EventDetailType.Timer) { throw new NotImplementedException("JBPM-1663", "EventDetail Timer"); } - else if (detailType == EventDetailType.Error) + else if (detailType == Constants.EventDetailType.Error) { throw new NotImplementedException("JBPM-1664", "EventDetail Error"); } - else if (detailType == EventDetailType.Cancel) + else if (detailType == Constants.EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1665", "EventDetail Cancel"); } - else if (detailType == EventDetailType.Compensation) + else if (detailType == Constants.EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1666", "EventDetail Compensation"); } - else if (detailType == EventDetailType.Conditional) + else if (detailType == Constants.EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1667", "EventDetail Conditional"); } - else if (detailType == EventDetailType.Link) + else if (detailType == Constants.EventDetailType.Link) { throw new NotImplementedException("JBPM-1668", "EventDetail Link"); } - else if (detailType == EventDetailType.Signal) + else if (detailType == Constants.EventDetailType.Signal) { eventDetail = new SignalEventDetailImpl(); addEventDetail(getEvent(), eventDetail); @@ -119,26 +120,26 @@ private void addEventDetail(EventImpl event, EventDetail trigger) { - EventDetailType detailType = trigger.getEventDetailType(); + Constants.EventDetailType detailType = trigger.getEventDetailType(); if (event instanceof StartEvent) { StartEventImpl start = (StartEventImpl)event; if (start.getTrigger().size() > 0) throw new NotImplementedException("JBPM-1660", "StartEvent Multiple Trigger"); - if (detailType == EventDetailType.Message) + if (detailType == Constants.EventDetailType.Message) { throw new NotImplementedException("JBPM-1657", "StartEvent Message Trigger"); } - else if (detailType == EventDetailType.Timer) + else if (detailType == Constants.EventDetailType.Timer) { throw new NotImplementedException("JBPM-1658", "StartEvent Timer Trigger"); } - else if (detailType == EventDetailType.Conditional) + else if (detailType == Constants.EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1659", "StartEvent Conditional Trigger"); } - else if (detailType == EventDetailType.Signal) + else if (detailType == Constants.EventDetailType.Signal) { start.addTrigger(eventDetail); } @@ -153,35 +154,35 @@ if (intermediate.getTrigger().size() > 0) throw new NotImplementedException("JBPM-1682", "IntermediateEvent Multiple Trigger"); - if (detailType == EventDetailType.Message) + if (detailType == Constants.EventDetailType.Message) { throw new NotImplementedException("JBPM-1669", "IntermediateEvent Message Trigger"); } - else if (detailType == EventDetailType.Timer) + else if (detailType == Constants.EventDetailType.Timer) { throw new NotImplementedException("JBPM-1670", "IntermediateEvent Timer Trigger"); } - else if (detailType == EventDetailType.Error) + else if (detailType == Constants.EventDetailType.Error) { throw new NotImplementedException("JBPM-1671", "IntermediateEvent Error Trigger"); } - else if (detailType == EventDetailType.Cancel) + else if (detailType == Constants.EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1672", "IntermediateEvent Cancel Trigger"); } - else if (detailType == EventDetailType.Compensation) + else if (detailType == Constants.EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1673", "IntermediateEvent Compensation Trigger"); } - else if (detailType == EventDetailType.Conditional) + else if (detailType == Constants.EventDetailType.Conditional) { throw new NotImplementedException("JBPM-1674", "IntermediateEvent Conditional Trigger"); } - else if (detailType == EventDetailType.Link) + else if (detailType == Constants.EventDetailType.Link) { throw new NotImplementedException("JBPM-1675", "IntermediateEvent Link Trigger"); } - else if (detailType == EventDetailType.Signal) + else if (detailType == Constants.EventDetailType.Signal) { throw new NotImplementedException("JBPM-1650", "IntermediateEvent Signal Trigger"); } @@ -196,27 +197,27 @@ if (end.getResult().size() > 0) throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result"); - if (detailType == EventDetailType.Message) + if (detailType == Constants.EventDetailType.Message) { end.addResult(eventDetail); } - else if (detailType == EventDetailType.Error) + else if (detailType == Constants.EventDetailType.Error) { throw new NotImplementedException("JBPM-1677", "EndEvent Error Result"); } - else if (detailType == EventDetailType.Cancel) + else if (detailType == Constants.EventDetailType.Cancel) { throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result"); } - else if (detailType == EventDetailType.Compensation) + else if (detailType == Constants.EventDetailType.Compensation) { throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result"); } - else if (detailType == EventDetailType.Signal) + else if (detailType == Constants.EventDetailType.Signal) { throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result"); } - else if (detailType == EventDetailType.Terminate) + else if (detailType == Constants.EventDetailType.Terminate) { throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result"); } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExclusiveGatewayImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.model.ConnectingObject; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.ExclusiveGateway; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.FlowObject; @@ -59,9 +60,9 @@ super(name); } - public GatewayType getGatewayType() + public Constants.GatewayType getGatewayType() { - return GatewayType.Exclusive; + return Constants.GatewayType.Exclusive; } @Override Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionEvaluator.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,8 +26,9 @@ import java.util.HashMap; import java.util.Map; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; import org.jboss.bpm.runtime.Attachments.Key; @@ -56,8 +57,8 @@ */ public Object evaluateExpression(Token token) { - ExpressionLanguage exprLang = expr.getExpressionLanguage(); - if (exprLang == ExpressionLanguage.MVEL) + Constants.ExpressionLanguage exprLang = expr.getExpressionLanguage(); + if (exprLang == Constants.ExpressionLanguage.MVEL) { String mvel = expr.getExpressionBody(); ExecutionContext exContext = token.getExecutionContext(); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ExpressionImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -23,6 +23,7 @@ //$Id$ +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; /** @@ -36,22 +37,22 @@ public class ExpressionImpl extends SupportingElementImpl implements Expression { private Object body; - private ExpressionLanguage lang; + private Constants.ExpressionLanguage lang; public ExpressionImpl(Object body) { this.body = body; - this.lang = (body instanceof String ? ExpressionLanguage.String : ExpressionLanguage.Object); + this.lang = (body instanceof String ? Constants.ExpressionLanguage.String : Constants.ExpressionLanguage.Object); } - public ExpressionImpl(ExpressionLanguage lang, Object body) + public ExpressionImpl(Constants.ExpressionLanguage lang, Object body) { this.body = body; this.lang = lang; } - public ExpressionLanguage getExpressionLanguage() + public Constants.ExpressionLanguage getExpressionLanguage() { return lang; } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/FlowObjectImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -29,6 +29,7 @@ import org.jboss.bpm.NameNotUniqueException; import org.jboss.bpm.model.Assignment; import org.jboss.bpm.model.ConnectingObject; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Gate; @@ -38,7 +39,7 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SingleInFlowSupport; import org.jboss.bpm.model.SingleOutFlowSupport; -import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.Constants.AssignTime; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; @@ -132,7 +133,7 @@ // Start Time Assignments for (Assignment ass : getAssignments()) { - if (ass.getAssignTime() == AssignTime.Start) + if (ass.getAssignTime() == Constants.AssignTime.Start) processAssignment(ass, token); } @@ -150,7 +151,7 @@ // End Time Assignments for (Assignment ass : getAssignments()) { - if (ass.getAssignTime() == AssignTime.End) + if (ass.getAssignTime() == Constants.AssignTime.End) processAssignment(ass, token); } } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayBuilderImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -23,10 +23,11 @@ //$Id$ +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.model.SequenceFlow.ConditionType; /** @@ -51,7 +52,7 @@ return this; } - public GatewayBuilder addConditionalGate(String targetName, ExpressionLanguage lang, String body) + public GatewayBuilder addConditionalGate(String targetName, Constants.ExpressionLanguage lang, String body) { gate = new GateImpl(targetName, ConditionType.Expression, new ExpressionImpl(lang, body)); getGateway().addGate(gate); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/InclusiveGatewayImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -30,12 +30,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Expression; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.GraphicalElement; import org.jboss.bpm.model.InclusiveGateway; import org.jboss.bpm.model.SequenceFlow; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.model.SequenceFlow.ConditionType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; @@ -62,9 +63,9 @@ super(name); } - public GatewayType getGatewayType() + public Constants.GatewayType getGatewayType() { - return GatewayType.Inclusive; + return Constants.GatewayType.Inclusive; } @Override @@ -110,7 +111,7 @@ if (seqFlow.getConditionType() == ConditionType.Expression) { Expression expr = seqFlow.getConditionExpression(); - if (expr.getExpressionLanguage() == ExpressionLanguage.MVEL) + if (expr.getExpressionLanguage() == Constants.ExpressionLanguage.MVEL) { String mvel = expr.getExpressionBody(); ExecutionContext exContext = token.getExecutionContext(); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/MessageEventDetailImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -23,6 +23,7 @@ //$Id$ +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Event; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageEventDetail; @@ -38,9 +39,9 @@ { private Message messageRef; - public EventDetailType getEventDetailType() + public Constants.EventDetailType getEventDetailType() { - return EventDetailType.Message; + return Constants.EventDetailType.Message; } public Message.Implementation getImplementation() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/NoneTaskImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -21,7 +21,9 @@ */ package org.jboss.bpm.model.internal; +import org.jboss.bpm.model.Constants; + //$Id$ /** @@ -39,8 +41,8 @@ } @Override - public TaskType getTaskType() + public Constants.TaskType getTaskType() { - return TaskType.None; + return Constants.TaskType.None; } } \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ParallelGatewayImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.model.ConnectingObject; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.ParallelGateway; import org.jboss.bpm.model.SequenceFlow; @@ -57,9 +58,9 @@ super(name); } - public GatewayType getGatewayType() + public Constants.GatewayType getGatewayType() { - return GatewayType.Parallel; + return Constants.GatewayType.Parallel; } @Override Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.bpm.NotImplementedException; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Gateway; @@ -34,10 +35,10 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Assignment.AssignTime; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.FlowHandler; import org.jboss.bpm.runtime.SignalHandler; @@ -150,43 +151,43 @@ public TaskBuilder addTask(String name) { - return addTask(name, TaskType.None); + return addTask(name, Constants.TaskType.None); } - public TaskBuilder addTask(String name, TaskType type) + public TaskBuilder addTask(String name, Constants.TaskType type) { flowObject = (FlowObjectImpl)getProcessInternal().getFlowObject(name); if (flowObject == null) { - if (type == TaskType.None || type == null) + if (type == Constants.TaskType.None || type == null) { flowObject = new NoneTaskImpl(name); } - else if (type == TaskType.Service) + else if (type == Constants.TaskType.Service) { throw new NotImplementedException("JBPM-1652", "Task Type Service"); } - else if (type == TaskType.Receive) + else if (type == Constants.TaskType.Receive) { flowObject = new ReceiveTaskImpl(name); } - else if (type == TaskType.Send) + else if (type == Constants.TaskType.Send) { flowObject = new SendTaskImpl(name); } - else if (type == TaskType.User) + else if (type == Constants.TaskType.User) { throw new NotImplementedException("JBPM-1653", "Task Type User"); } - else if (type == TaskType.Script) + else if (type == Constants.TaskType.Script) { throw new NotImplementedException("JBPM-1654", "Task Type Script"); } - else if (type == TaskType.Manual) + else if (type == Constants.TaskType.Manual) { throw new NotImplementedException("JBPM-1655", "Task Type Manual"); } - else if (type == TaskType.Reference) + else if (type == Constants.TaskType.Reference) { throw new NotImplementedException("JBPM-1656", "Task Type Reference"); } @@ -199,24 +200,24 @@ return new TaskBuilderImpl(getProcessInternal(), flowObject); } - public GatewayBuilder addGateway(String name, GatewayType type) + public GatewayBuilder addGateway(String name, Constants.GatewayType type) { flowObject = (FlowObjectImpl)getProcessInternal().getFlowObject(name); if (flowObject == null) { - if (GatewayType.Exclusive == type) + if (Constants.GatewayType.Exclusive == type) { flowObject = new ExclusiveGatewayDataBasedImpl(name); } - else if (GatewayType.Inclusive == type) + else if (Constants.GatewayType.Inclusive == type) { flowObject = new InclusiveGatewayImpl(name); } - else if (GatewayType.Parallel == type) + else if (Constants.GatewayType.Parallel == type) { flowObject = new ParallelGatewayImpl(name); } - else if (GatewayType.Complex == type) + else if (Constants.GatewayType.Complex == type) { flowObject = new ComplexGatewayImpl(name); } @@ -239,7 +240,7 @@ return this; } - public ProcessBuilder addAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp) + public ProcessBuilder addAssignment(Constants.AssignTime time, Constants.ExpressionLanguage lang, String fromExpr, String toProp) { ExpressionImpl from = new ExpressionImpl(lang, fromExpr); PropertyImpl to = new PropertyImpl(toProp, null); Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -29,6 +29,7 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NotImplementedException; import org.jboss.bpm.client.MessageListener; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Property; @@ -65,9 +66,9 @@ } @Override - public TaskType getTaskType() + public Constants.TaskType getTaskType() { - return TaskType.Receive; + return Constants.TaskType.Receive; } public Message.Implementation getImplementation() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SendTaskImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -25,6 +25,7 @@ import org.jboss.bpm.InvalidProcessException; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SendTask; @@ -50,9 +51,9 @@ } @Override - public TaskType getTaskType() + public Constants.TaskType getTaskType() { - return TaskType.Send; + return Constants.TaskType.Send; } public Message.Implementation getImplementation() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/SignalEventDetailImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -23,6 +23,7 @@ //$Id$ +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SignalEventDetail; @@ -37,9 +38,9 @@ { private Signal signalRef; - public EventDetailType getEventDetailType() + public Constants.EventDetailType getEventDetailType() { - return EventDetailType.Signal; + return Constants.EventDetailType.Signal; } public Signal getSignalRef() Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/TaskImpl.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -22,6 +22,7 @@ package org.jboss.bpm.model.internal; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.Task; import org.jboss.bpm.runtime.SignalHandler; @@ -50,7 +51,7 @@ return ActivityType.Task; } - public abstract TaskType getTaskType(); + public abstract Constants.TaskType getTaskType(); public SignalHandler getSignalHandler() { Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -25,14 +25,15 @@ import javax.management.ObjectName; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; +import org.jboss.bpm.model.Constants.TaskType; /** * Test the Airticket sample application @@ -101,7 +102,7 @@ procBuilder.addStartEvent("Start").addSequenceFlow(TASK_RECEIVE_REQUEST); // Build the ReceiveReqTask - TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, TaskType.Receive); + TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Constants.TaskType.Receive); taskBuilder.addMessageRef(MESSAGE_REQ_DATA). addSequenceFlow(TASK_VALIDATE); @@ -119,8 +120,8 @@ addSequenceFlow(GATEWAY_IS_VALID); // Build the ValidateGateway - GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, GatewayType.Exclusive); - gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, ExpressionLanguage.MVEL, "isReqDataValid == true"). + GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Constants.GatewayType.Exclusive); + gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Constants.ExpressionLanguage.MVEL, "isReqDataValid == true"). addDefaultGate(TASK_SEND_INVALID); // Build the CheckAvailabilityTask @@ -137,37 +138,37 @@ addSequenceFlow(GATEWAY_IS_AVAILABLE); // Build the SendInvalidTask - taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, TaskType.Send); + taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Constants.TaskType.Send); taskBuilder.addMessageRef(MESSAGE_INVALID_DATA). addSequenceFlow(TASK_RECEIVE_REQUEST); // Build the AvailabilityGateway - gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, GatewayType.Exclusive); - gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, ExpressionLanguage.MVEL, "isAvailable == true"). + gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Constants.GatewayType.Exclusive); + gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Constants.ExpressionLanguage.MVEL, "isAvailable == true"). addDefaultGate(TASK_SEND_NOT_AVAILABLE); // Build the SendOfferTask - taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, TaskType.Send); + taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Constants.TaskType.Send); taskBuilder.addMessageRef(MESSAGE_OFFER). addSequenceFlow(TASK_RECEIVE_ORDER); // Build the SendNotAvailableTask - taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, TaskType.Send); + taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Constants.TaskType.Send); taskBuilder.addMessageRef(MESSAGE_NOT_AVAILABLE). addSequenceFlow(TASK_RECEIVE_REQUEST); // Build the ReceiveReqTask - taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, TaskType.Receive); + taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Constants.TaskType.Receive); taskBuilder.addMessageRef(MESSAGE_ACCEPT_OFFER). addSequenceFlow(GATEWAY_IS_ACCEPTED); // Build the AcceptOfferGateway - gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, GatewayType.Exclusive); - gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, ExpressionLanguage.MVEL, "isOfferAccepted == true"). + gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Constants.GatewayType.Exclusive); + gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Constants.ExpressionLanguage.MVEL, "isOfferAccepted == true"). addDefaultGate(TASK_RECEIVE_REQUEST); // Build the AcceptOfferGateway - gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, GatewayType.Parallel); + gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Constants.GatewayType.Parallel); gatewayBuilder.addGate(TASK_CREDIT_CARD). addGate(TASK_BOOKING); @@ -190,11 +191,11 @@ addSequenceFlow(GATEWAY_SYNC_JOIN); // Build the SynchronizedJoinGateway - gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, GatewayType.Parallel); + gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Constants.GatewayType.Parallel); gatewayBuilder.addGate(TASK_SEND_CONFIRM); // Build the SendConfirmTask - taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, TaskType.Send); + taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Constants.TaskType.Send); taskBuilder.addMessageRef(MESSAGE_CONFIRM). addSequenceFlow(EVENT_END); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.Collection; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.Process; @@ -33,7 +34,7 @@ import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Property; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.model.Constants.EventDetailType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; @@ -78,7 +79,7 @@ msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true).addProperty("attKeys", null, true); TaskBuilder taskBuilder = procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class); taskBuilder.addProperty("foo", "bar").addSequenceFlow("End"); - procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEvent("End").addEventDetail(Constants.EventDetailType.Message).addMessageRef("EndMessage"); Process proc = procBuilder.getProcess(); return proc; } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -27,13 +27,14 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; @@ -134,12 +135,12 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("TaskC"); + procBuilder.addGateway("Merge", Constants.GatewayType.Exclusive).addSequenceFlow("TaskC"); procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,13 +26,14 @@ import java.io.IOException; import java.util.List; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -95,9 +96,9 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive); - gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive); + gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo > 10"); procBuilder.addEndEvent("EndA").addEndEvent("EndB"); Process proc = procBuilder.getProcess(); return proc; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -28,13 +28,14 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -72,10 +73,10 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("Merge"); + procBuilder.addGateway("Merge", Constants.GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); return proc; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,13 +26,14 @@ import java.io.IOException; import java.util.List; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -76,9 +77,9 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess("InclusiveGatewaySplitTest").addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Inclusive); - gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive); + gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo < 20"); procBuilder.addEndEvent("EndA").addEndEvent("EndB"); Process proc = procBuilder.getProcess(); return proc; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -27,13 +27,14 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; @@ -135,12 +136,12 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC"); + procBuilder.addGateway("Merge", Constants.GatewayType.Parallel).addSequenceFlow("TaskC"); procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,11 +26,12 @@ import java.io.IOException; import java.util.List; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -60,7 +61,7 @@ public Process getProcess() throws IOException { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel). + Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.GatewayType.Parallel). addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess(); return proc; } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -24,13 +24,9 @@ // $Id$ import org.jboss.bpm.InvalidProcessException; -import org.jboss.bpm.model.EndEvent; -import org.jboss.bpm.model.FlowObject; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.StartEvent; -import org.jboss.bpm.model.Task; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -48,16 +44,6 @@ Process proc = builder.addProcess(null).addStartEvent("Start").addSequenceFlow("taskA").addTask("taskA"). addSequenceFlow("End").addEndEvent("End").getProcess(); assertEquals("AnonymousProcess#0", proc.getName()); - - StartEvent start = (StartEvent)proc.getFlowObject("Start"); - assertNotNull("Start expected", start); - - FlowObject nfo = proc.getFlowObject("taskA"); - assertNotNull("FlowObject expected", nfo); - assertTrue("Task expected", nfo instanceof Task); - - EndEvent end = (EndEvent)proc.getFlowObject("End"); - assertNotNull(end); } public void testNoStartState() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -28,6 +28,7 @@ import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; @@ -36,9 +37,9 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.model.Signal.SignalType; -import org.jboss.bpm.model.Task.TaskType; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -53,7 +54,7 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Receive).addSequenceFlow("End").addEndEvent("End"); + procBuilder.addTask("TaskA", Constants.TaskType.Receive).addSequenceFlow("End").addEndEvent("End"); try { procBuilder.getProcess(); @@ -145,9 +146,9 @@ msgBuilder = procBuilder.addMessage("EndEventMessage"); msgBuilder.addToRef(getMessageListenerID()).addProperty("foo", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Receive).addMessageRef("ReceiveTaskMessage"); + procBuilder.addTask("TaskA", Constants.TaskType.Receive).addMessageRef("ReceiveTaskMessage"); EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End"); - eventBuilder.addEventDetail(EventDetailType.Message).addMessageRef("EndEventMessage"); + eventBuilder.addEventDetail(Constants.EventDetailType.Message).addMessageRef("EndEventMessage"); return procBuilder.getProcess(); } } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -24,9 +24,10 @@ // $Id$ import org.jboss.bpm.InvalidProcessException; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.model.Constants.TaskType; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -41,7 +42,7 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Send).addSequenceFlow("End").addEndEvent("End"); + procBuilder.addTask("TaskA", Constants.TaskType.Send).addSequenceFlow("End").addEndEvent("End"); try { procBuilder.getProcess(); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/TaskExecutionHandlerTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -25,12 +25,13 @@ import java.io.IOException; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Assignment.AssignTime; -import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Constants.AssignTime; +import org.jboss.bpm.model.Constants.ExpressionLanguage; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; import org.jboss.bpm.runtime.Token; @@ -60,11 +61,11 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess("TaskExecutionHandlerTest").addProperty("procProp", "kermit"); - procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign"); + procBuilder.addAssignment(Constants.AssignTime.Start, Constants.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign"); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); taskBuilder.addProperty("taskProp", "piggy").addExecutionHandler(TaskA.class).addSequenceFlow("End"); - taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign"); + taskBuilder.addAssignment(Constants.AssignTime.Start, Constants.ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign"); procBuilder.addEndEvent("End"); return procBuilder.getProcess(); } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,13 +26,14 @@ import java.io.IOException; import java.util.List; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -95,9 +96,9 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive); - gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Exclusive); + gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo > 10"); procBuilder.addEndEvent("EndA").addEndEvent("EndB"); Process proc = procBuilder.getProcess(); return proc; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,13 +26,14 @@ import java.io.IOException; import java.util.List; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.ExpressionLanguage; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -76,9 +77,9 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Inclusive); - gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Constants.GatewayType.Inclusive); + gatewayBuilder.addConditionalGate("EndA", Constants.ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", Constants.ExpressionLanguage.MVEL, "foo < 20"); procBuilder.addEndEvent("EndA").addEndEvent("EndB"); Process proc = procBuilder.getProcess(); return proc; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -26,11 +26,12 @@ import java.io.IOException; import java.util.List; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -60,7 +61,7 @@ public Process getProcess() throws IOException { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel). + Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Constants.GatewayType.Parallel). addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess(); return proc; } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -28,13 +28,14 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -72,10 +73,10 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); - procBuilder.addSequenceFlow("Merge").addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + procBuilder.addSequenceFlow("Merge").addGateway("Merge", Constants.GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); return proc; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-18 06:56:19 UTC (rev 1913) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationTest.java 2008-08-18 09:34:17 UTC (rev 1914) @@ -27,13 +27,14 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Constants; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.EventDetail.EventDetailType; -import org.jboss.bpm.model.Gateway.GatewayType; +import org.jboss.bpm.model.Constants.EventDetailType; +import org.jboss.bpm.model.Constants.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.ExecutionHandler; @@ -135,12 +136,12 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); + eventBuilder.addEventDetail(Constants.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC"); + procBuilder.addGateway("Merge", Constants.GatewayType.Parallel).addSequenceFlow("TaskC"); procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess();

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1913 - jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-18 02:56:19 -0400 (Mon, 18 Aug 2008) New Revision: 1913 Removed: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeAPITest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitAPITest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java Log: Remove stale tests Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeAPITest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeAPITest.java 2008-08-17 21:03:51 UTC (rev 1912) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeAPITest.java 2008-08-18 06:56:19 UTC (rev 1913) @@ -1,56 +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.jboss.bpm.cts.gateway.parallel; - -//$Id$ - -import java.io.StringWriter; - -import org.jboss.bpm.client.ProcessManager; -import org.jboss.bpm.model.Process; - - -/** - * ParallelMergeTest using the API Descriptor - * - * @author thomas.diesler(a)jboss.com - * @since 06-Aug-2008 - */ -public class ParallelMergeAPITest extends ParallelMergeTest -{ - @Override - public Process getProcess() - { - Process proc = super.getProcess(); - - // Marshall the process to a string - StringWriter strwr = new StringWriter(); - marshallProcess(proc, strwr); - String procXML = strwr.toString(); - - // Recreate the process from the marshalled process - ProcessManager procManager = ProcessManager.locateProcessManager(); - proc = procManager.createProcess(procXML); - - return proc; - } -} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java 2008-08-17 21:03:51 UTC (rev 1912) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java 2008-08-18 06:56:19 UTC (rev 1913) @@ -1,203 +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.jboss.bpm.cts.gateway.parallel; - -// $Id$ - -import org.jboss.bpm.client.SignalListener; -import org.jboss.bpm.client.SignalManager; -import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.ProcessBuilder; -import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Signal.SignalType; -import org.jboss.bpm.runtime.ExecutionContext; -import org.jboss.bpm.runtime.ExecutionHandler; -import org.jboss.bpm.runtime.Token; -import org.jboss.bpm.test.DefaultEngineTestCase; - -/** - * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow - * is stored in the gateway until a token has arrived from each incoming sequence flow. The tokens are merged together - * and leave the gateway as a one. - * - * @author thomas.diesler(a)jboss.com - * @since 06-Aug-2008 - */ -public class ParallelMergeTest extends DefaultEngineTestCase -{ - public void testParallelMerge() throws Exception - { - Process proc = getProcess(); - proc.startProcess(); - - // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger)); - - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - - // Wait for the process to end - proc.waitForEnd(); - - // Verify the result - assertEquals("TaskA:TaskB", TaskC.taskValue); - } - - public void testMergeTimeout() throws Exception - { - Process proc = getProcess(); - proc.startProcess(); - - // Send start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - - // Wait for the process to end - try - { - proc.waitForEnd(1000); - fail("timeout expected"); - } - catch (RuntimeException rte) - { - // expected - } - } - - public void testInvalidToken() throws Exception - { - Process proc = getProcess(); - proc.startProcess(); - - // Add a signal listener that sends the other start trigger signal - SignalManager signalManager = SignalManager.locateSignalManager(); - Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"); - signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger)); - - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - - try - { - proc.waitForEnd(); - fail("Expected: Unexpected token from: SequenceFlow[TaskA->Merge]"); - } - catch (RuntimeException rte) - { - // expected - } - - // Restart the process - proc.startProcess(); - - // Add a signal listener that sends the other start trigger signal - startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B"); - signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger)); - - // Send start trigger signal - signalManager.throwSignal(proc.getName(), new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A")); - - // Wait for the process to end - proc.waitForEnd(); - - // Verify the result - assertEquals("TaskA:TaskB", TaskC.taskValue); - } - - public Process getProcess() - { - ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA").addExecutionHandler(TaskA.class).addSequenceFlow("Merge"); - eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addSignalTrigger(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskB").addExecutionHandler(TaskB.class).addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("TaskC"); - procBuilder.addTask("TaskC").addExecutionHandler(TaskC.class).addSequenceFlow("End"); - procBuilder.addEndEvent("End"); - Process proc = procBuilder.getProcess(); - return proc; - } - - public static class MergeListener implements SignalListener - { - private String fromRef; - private Signal nextSignal; - - public MergeListener(String fromRef, Signal nextSignal) - { - this.fromRef = fromRef; - this.nextSignal = nextSignal; - } - - public void catchSignal(Signal signal) - { - if (signal.getSignalType() == SignalType.SYSTEM_GATEWAY_ENTER) - { - if (nextSignal != null) - { - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.throwSignal(fromRef, nextSignal); - nextSignal = null; - } - } - } - } - - @SuppressWarnings("serial") - public static class TaskA implements ExecutionHandler - { - public void execute(Token token) - { - ExecutionContext exContext = token.getExecutionContext(); - exContext.addAttachment("taskA", "TaskA"); - } - } - - @SuppressWarnings("serial") - public static class TaskB implements ExecutionHandler - { - public void execute(Token token) - { - ExecutionContext exContext = token.getExecutionContext(); - exContext.addAttachment("taskB", "TaskB"); - } - } - - @SuppressWarnings("serial") - public static class TaskC implements ExecutionHandler - { - public static Object taskValue; - - public void execute(Token token) - { - ExecutionContext exContext = token.getExecutionContext(); - taskValue = exContext.getAttachment("taskA") + ":" + exContext.getAttachment("taskB"); - } - } -} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitAPITest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitAPITest.java 2008-08-17 21:03:51 UTC (rev 1912) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitAPITest.java 2008-08-18 06:56:19 UTC (rev 1913) @@ -1,55 +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.jboss.bpm.cts.gateway.parallel; - -// $Id$ - -import java.io.StringWriter; - -import org.jboss.bpm.client.ProcessManager; -import org.jboss.bpm.model.Process; - -/** - * ParallelSplitTest using the API Descriptor - * - * @author thomas.diesler(a)jboss.com - * @since 06-Aug-2008 - */ -public class ParallelSplitAPITest extends ParallelSplitTest -{ - @Override - public Process getProcess() - { - Process proc = super.getProcess(); - - // Marshall the process to a string - StringWriter strwr = new StringWriter(); - marshallProcess(proc, strwr); - String procXML = strwr.toString(); - - // Recreate the process from the marshalled process - ProcessManager procManager = ProcessManager.locateProcessManager(); - proc = procManager.createProcess(procXML); - - return proc; - } -} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java 2008-08-17 21:03:51 UTC (rev 1912) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java 2008-08-18 06:56:19 UTC (rev 1913) @@ -1,66 +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.jboss.bpm.cts.gateway.parallel; - -// $Id$ - -import java.util.List; - -import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.ProcessBuilder; -import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Gateway.GatewayType; -import org.jboss.bpm.model.Signal.SignalType; -import org.jboss.bpm.test.DefaultEngineTestCase; - -/** - * Parallel gateway that has uncontrolled outgoing sequence flows. - * All of them are taken, which leads to parallel paths of execution. - * - * @author thomas.diesler(a)jboss.com - * @since 06-Aug-2008 - */ -public class ParallelSplitTest extends DefaultEngineTestCase -{ - public void testParallelSplit() throws Exception - { - Process proc = getProcess(); - proc.startProcess(); - proc.waitForEnd(); - - // Validate received signals - List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER); - assertEquals(2, signals.size()); - String fromRefs = signals.get(0).getFromRef() + signals.get(1).getFromRef(); - assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA")); - assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB")); - } - - public Process getProcess() - { - ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel). - addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess(); - return proc; - } -}

17 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r1912 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/model and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-08-17 17:03:51 -0400 (Sun, 17 Aug 2008) New Revision: 1912 Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java Log: Sync signals Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-17 16:18:36 UTC (rev 1911) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-17 21:03:51 UTC (rev 1912) @@ -59,38 +59,47 @@ /** * Add a SignalListener for a given process */ - public synchronized void addSignalListener(String procName, SignalListener listener) + public void addSignalListener(String procName, SignalListener listener) { - log.debug("addSignalListener: " + procName + "=" + listener); - Set<SignalListener> set = listeners.get(procName); - if (set == null) + synchronized (listeners) { - set = new HashSet<SignalListener>(); - listeners.put(procName, set); + log.debug("addSignalListener: " + procName + "=" + listener); + Set<SignalListener> set = listeners.get(procName); + if (set == null) + { + set = new HashSet<SignalListener>(); + listeners.put(procName, set); + } + set.add(listener); } - set.add(listener); } /** * Remove an SignalListener for a given process */ - public synchronized void removeSignalListener(String procName, SignalListener listener) + public void removeSignalListener(String procName, SignalListener listener) { - log.debug("removeSignalListener: " + procName + "=" + listener); - Set<SignalListener> set = listeners.get(procName); - if (set != null) + synchronized (listeners) { - set.remove(listener); + log.debug("removeSignalListener: " + procName + "=" + listener); + Set<SignalListener> set = listeners.get(procName); + if (set != null) + { + set.remove(listener); + } } } /** * Remove all SignalListener for a given process */ - public synchronized void removeSignalListeners(String procName) + public void removeSignalListeners(String procName) { - log.debug("removeSignalListeners: " + procName); - listeners.remove(procName); + synchronized (listeners) + { + log.debug("removeSignalListeners: " + procName); + listeners.remove(procName); + } } /** @@ -101,26 +110,32 @@ log.debug("throwSignal: " + procName + "=" + signal); // Throw Signal to listeners associated with the process - Set<SignalListener> procListeners = listeners.get(procName); - if (procListeners != null) + Set<SignalListener> procListeners = getListenerSet(procName); + for (SignalListener listener : procListeners) { - for (SignalListener listener : procListeners) - { - failsafeThrow(listener, signal); - } + failsafeThrow(listener, signal); } // Throw Signal to listeners not associated with any process - Set<SignalListener> allProcListeners = listeners.get(null); - if (allProcListeners != null) + Set<SignalListener> allProcListeners = getListenerSet(null); + for (SignalListener listener : allProcListeners) { - for (SignalListener listener : allProcListeners) - { - failsafeThrow(listener, signal); - } + failsafeThrow(listener, signal); } } + private Set<SignalListener> getListenerSet(String procName) + { + synchronized (listeners) + { + HashSet<SignalListener> retSet = new HashSet<SignalListener>(); + Set<SignalListener> listenerSet = listeners.get(procName); + if (listenerSet != null) + retSet.addAll(listenerSet); + return retSet; + } + } + private void failsafeThrow(SignalListener listener, Signal signal) { try Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-17 16:18:36 UTC (rev 1911) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-08-17 21:03:51 UTC (rev 1912) @@ -46,7 +46,8 @@ SYSTEM_GATEWAY_ENTER, SYSTEM_GATEWAY_EXIT, SYSTEM_PROCESS_ENTER, SYSTEM_PROCESS_EXIT, SYSTEM_SUB_PROCESS_ENTER, SYSTEM_SUB_PROCESS_EXIT, - SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER + SYSTEM_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER, + USER_SIGNAL } private SignalType type; Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-17 16:18:36 UTC (rev 1911) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-17 21:03:51 UTC (rev 1912) @@ -84,7 +84,10 @@ // Setup the SignalListener SignalManager signalManager = SignalManager.locateSignalManager(); signalManager.addSignalListener(null, getSignalListener()); - signals.clear(); + synchronized (signals) + { + signals.clear(); + } // Setup the MessageListener MessageManager messageManager = MessageManager.locateMessageManager(); @@ -159,7 +162,10 @@ { public void catchSignal(Signal signal) { - signals.add(signal); + synchronized (signals) + { + signals.add(signal); + } } public String toString() @@ -173,8 +179,7 @@ public List<Signal> getSignals() { - SignalManager signalManager = SignalManager.locateSignalManager(); - synchronized (signalManager) + synchronized (signals) { return Collections.unmodifiableList(signals); } @@ -182,8 +187,7 @@ public List<Signal> getSignals(Signal.SignalType type) { - SignalManager signalManager = SignalManager.locateSignalManager(); - synchronized (signalManager) + synchronized (signals) { List<Signal> retSignals = new ArrayList<Signal>(); for (Signal sig : signals) Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-17 16:18:36 UTC (rev 1911) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-08-17 21:03:51 UTC (rev 1912) @@ -262,6 +262,9 @@ if (status == ProcessStatus.None || status == ProcessStatus.Ready) throw new IllegalStateException("Cannot wait for process in state: " + status); + if (executorThread == null) + throw new IllegalStateException("No start signal, cannot obtain excutor thread"); + // Wait a little for the process to end boolean forever = (timeout < 1); long now = System.currentTimeMillis(); @@ -270,27 +273,27 @@ { while (forever || now < until) { - if (status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted) + if (isProcessTerminated()) { - if (runtimeException != null) - throw new BPMException("Process aborted", runtimeException); + if (getRuntimeException() != null) + throw new BPMException("Process aborted", getRuntimeException()); break; } // Join the executor thread - executorThread.join(timeout); + getExecutorThread().join(timeout); now = System.currentTimeMillis(); } // Throw timeout exception if it took too long - if (status != ProcessStatus.Cancelled && status != ProcessStatus.Completed && status != ProcessStatus.Aborted) + if (isProcessTerminated() == false) { RuntimeException rte = new ProcessTimeoutException("Process timeout after " + timeout + "ms for: " + getID()); log.error(rte); log.error("Interrupt executor thread"); - executorThread.interrupt(); + getExecutorThread().interrupt(); throw rte; } @@ -308,6 +311,11 @@ } } + private boolean isProcessTerminated() + { + return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted; + } + public FlowObject getFlowObject(String name) { if (name == null) Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java 2008-08-17 21:03:51 UTC (rev 1912) @@ -0,0 +1,145 @@ +/* + * 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.jboss.bpm.cts.signalmanager; + +// $Id$ + +import org.jboss.bpm.client.SignalListener; +import org.jboss.bpm.client.SignalManager; +import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.test.DefaultEngineTestCase; + +/** + * Test the ProcessManager + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public class SignalManagerTest extends DefaultEngineTestCase +{ + final SignalManager sigManager = SignalManager.locateSignalManager(); + final Signal sigA = new Signal(getShortName(), SignalType.USER_SIGNAL, "A"); + final Signal sigB = new Signal(getShortName(), SignalType.USER_SIGNAL, "B"); + + private Signal gotA; + private Signal gotB; + + public void testReentrantSingleThread() throws Exception + { + SignalListener sigListener = new SignalListener() + { + public void catchSignal(Signal signal) + { + String sigMsg = signal.getMessage(); + if (signal.getSignalType() == SignalType.USER_SIGNAL) + { + if ("A".equals(sigMsg)) + { + gotA = signal; + sigManager.throwSignal(getShortName(), sigB); + } + if ("B".equals(sigMsg)) + { + gotB = signal; + } + } + } + }; + sigManager.addSignalListener(getShortName(), sigListener); + sigManager.throwSignal(getShortName(), sigA); + sigManager.removeSignalListeners(getShortName()); + + assertEquals(sigA, gotA); + assertEquals(sigB, gotB); + } + + public void testReentrantMultipleThread() throws Exception + { + SignalListener sigListener = new SignalListener() + { + public void catchSignal(Signal signal) + { + String sigMsg = signal.getMessage(); + if (signal.getSignalType() == SignalType.USER_SIGNAL) + { + if ("A".equals(sigMsg)) + { + gotA = signal; + sendThreadSignal(sigB); + } + if ("B".equals(sigMsg)) + { + gotB = signal; + } + } + } + }; + sigManager.addSignalListener(getShortName(), sigListener); + sendThreadSignal(sigA); + sigManager.removeSignalListeners(getShortName()); + + assertEquals(sigA, gotA); + assertEquals(sigB, gotB); + } + + private void sendThreadSignal(Signal sig) + { + SignalRunner sigRunner = new SignalRunner(sig); + Thread thread = new Thread(sigRunner); + thread.start(); + try + { + while (sigRunner.hasStarted() == false) + { + Thread.sleep(10); + } + thread.join(); + } + catch (InterruptedException ex) + { + ex.printStackTrace(); + } + } + + class SignalRunner implements Runnable + { + private Signal threadSig; + private boolean hasStarted; + + public SignalRunner(Signal sig) + { + this.threadSig = sig; + } + + public boolean hasStarted() + { + return hasStarted; + } + + public void run() + { + hasStarted = true; + sigManager.throwSignal(getShortName(), threadSig); + } + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/signalmanager/SignalManagerTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 8 months

1
0
0 / 0

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2008