jbpm-commits November 2008

jbpm-commits@lists.jboss.org

1 participants
422 discussions

JBoss JBPM SVN: r2924 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/model/builder and 40 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 06:11:53 -0500 (Fri, 14 Nov 2008) New Revision: 2924 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalogExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEventExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EventExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/GatewayExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/NodeExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessDefinitionExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessStructureExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEventExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/TaskExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/ExecutionService.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java Log: Cleanup API - no references to preview Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.api.model; + + +//$Id$ + +/** + * 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 +{ + /** + * Get the type od end result + */ + EventDetailType getResultType(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.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 Node +{ + /** + * Defines the type of an {@link Event} + */ + enum EventType + { + Start, End, Intermediate + }; + + /** + * Defines the type of event detail + */ + enum EventDetailType + { + None, Message, Error, Cancel, Compensation, Link, Multiple, Timer, Rule, Signal, Terminate + } + + /** + * Get the type of this event + */ + EventType getEventType(); + + /** + * Get the detail type fopr this event + */ + EventDetailType getDetailType(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.api.model; + +//$Id: $ + +import java.io.Serializable; + +/** + * An Expression, which is used in the definition of attributes for StartEvent, + * IntermediateEvent, Activity, ComplexGateway, and SequenceFlow + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Expression extends Serializable +{ + enum ExpressionLanguage + { + MVEL + } + + /** + * 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(); + + /** + * 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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.model; + +//$Id$ + +import java.util.List; + + + +/** + * 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 Node +{ + /** + * The GatewayType + * + */ + public 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 + */ + 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<SequenceFlow> getGates(); + + /** + * Get the optional default gate + * @return null if there is none + */ + SequenceFlow getDefaultGate(); + + /** + * Get the gate for the given target name + * @return null if there is none + */ + SequenceFlow getGateByName(String targetName); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,22 +23,14 @@ //$Id$ -import java.util.List; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Group; -import org.jbpm.preview.model.PropertySupport; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.SignalHandler; - /** * A Node is an abstract element with a name and an associated process * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface Node extends AbstractElement, PropertySupport +public interface Node extends AbstractElement { /** * Get the associated process definition @@ -54,28 +46,4 @@ * Get the unique name. */ String getName(); - - /** - * 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(); - - /** Get the associated Group */ - Group getGroupRef(); - - /** - * Get the associated ExecutionHandler - */ - ExecutionHandler getExecutionHandler(); - - /** - * Get the associated SignalHandler - */ - SignalHandler getSignalHandler(); - - /** - * Get the associated FlowHandler - */ - FlowHandler getFlowHandler(); } \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,18 +25,13 @@ import java.util.List; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Group; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.PropertySupport; - /** * A ProcessStructure defines the structure of a Process * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface ProcessStructure extends AbstractElement, PropertySupport +public interface ProcessStructure extends AbstractElement { /** * Get the unique name. @@ -63,34 +58,4 @@ * @return null if not found */ Node getNode(String name); - - /** - * 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(); - - /** - * 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); - - /** - * Get the list of associated {@link Group} objects. - * @return An empty list if there are none - */ - List<Group> getGroups(); - - /** - * Get an associated {@link Group} by name. - * @return null if not found - */ - Group getGroup(String grpName); } \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,7 +23,6 @@ import java.io.Serializable; -import org.jbpm.preview.model.Expression; Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.api.model; + + +// $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. + * + * There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. That is, a + * Process Instance SHALL be generated when the Start Event is triggered. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface StartEvent extends Event +{ + /** + * Get the outgoing SequenceFlow + */ + SequenceFlow getOutFlow(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.api.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 Node +{ + /** + * The TaskType + */ + public enum TaskType + { + Service, Receive, Send, User, Script, Manual, Reference, None, Wait + } + + /** + * 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. + */ + TaskType getTaskType(); + + /** + * Get the incomming SequenceFlow + */ + SequenceFlow getInFlow(); + + /** + * Get the outgoing SequenceFlow + */ + SequenceFlow getOutFlow(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.api.model; + +//$Id$ + +/** + * A WaitState is a Task that returns control to Thread that signalled the Execution + * + * @author thomas.diesler(a)jboss.com + * @since 12-Nov-2008 + */ +public interface WaitState extends Task +{ +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,8 +21,7 @@ */ package org.jbpm.api.model.builder; -import org.jbpm.preview.model.Gate; -import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Expression.ExpressionLanguage; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,8 +25,8 @@ import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.preview.model.Gateway.GatewayType; -import org.jbpm.preview.model.Task.TaskType; +import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.Task.TaskType; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -1,78 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.service; - -// $Id$ - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import org.jbpm.api.model.Process; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.StartEvent; - -/** - * The ExecutionService executes processes - * - * @author thomas.diesler(a)jboss.com - * @since 18-Jun-2008 - */ -public abstract class ExecutionService extends AbstractService -{ - private ExecutorService procExecutor = Executors.newCachedThreadPool(); - - // Hide public constructor - protected ExecutionService() - { - } - - /** - * Get the process executor service - */ - public ExecutorService getProcessExecutor() - { - return procExecutor; - } - - /** - * Start the Process from a given start event - * - * @param start The StartEvent that triggers the process - * @param att The Attachments in the ExecutionContext - */ - public abstract void startProcess(Process proc, StartEvent start, 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. - */ - public abstract ProcessStatus waitForEnd(Process proc); - - /** - * 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. - */ - public abstract ProcessStatus waitForEnd(Process proc, long timeout); -} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.service; + +// $Id$ + +import javax.management.ObjectName; + +import org.hibernate.Session; +import org.jbpm.api.client.Configuration; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; + +/** + * The persistence service. + * + * @author thomas.diesler(a)jboss.com + * @since 17-Sep-2008 + */ +public abstract class PersistenceService extends AbstractService +{ + /** + * Locate the default PersistenceService + */ + public static PersistenceService locatePersistenceService() + { + ProcessEngine engine = Configuration.getProcessEngine(); + return engine.getService(PersistenceService.class); + } + + /** + * Create a new persistence session + */ + public abstract Session createSession(); + + /** + * Save the ProcessDefinition to persistent storage + */ + public abstract ObjectName saveProcessDefinition(ProcessDefinition procDef); + + /** + * Load the ProcessDefinition from persistent storage + */ + public abstract ProcessDefinition loadProcessDefinition(ObjectName procDefID); + + /** + * Delete the ProcessDefinition from persistent storage + */ + public abstract void deleteProcessDefinition(ProcessDefinition procDef); + + /** + * Save the Process to persistent storage + */ + public abstract ObjectName saveProcess(Process proc); + + /** + * Load the Process from persistent storage + */ + public abstract Process loadProcess(ObjectName procID); + + /** + * Delete the Process from persistent storage + */ + public abstract void deleteProcess(Process proc); + + /** + * Save the Node to persistent storage + */ + public abstract ObjectName saveNode(Session session, Node node); + + /** + * Load the Node from persistent storage + */ + public abstract <T extends Node> T loadNode(Session session, Class<T> clazz, ObjectName nodeID); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -40,7 +40,6 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -36,7 +36,6 @@ import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.test; - -// $Id$ - -import junit.framework.TestCase; - -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.service.ProcessBuilderService; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.EndEvent; -import org.jbpm.preview.model.Expression; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.StartEvent; -import org.jbpm.preview.model.Task; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.ProcessBuilderExt; - -/** - * A catalog of CTS test processes - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public abstract class ProcessCatalog -{ - public static ProcessDefinition getDefaultProcess(ProcessEngine engine) - { - ProcessBuilderService pbService = engine.getService(ProcessBuilderService.class); - ProcessBuilderExt builder = (ProcessBuilderExt)pbService.getProcessBuilder(); - builder.addProcess("Proc"); - builder.addProcessProperty("proP1", "valP1").addProcessProperty("proP2", "valP2"); - builder.addProcessMessage("procMsg").addProperty("msgPropName", "msgPropVal"); - builder.addProcessAssignment(AssignTime.Start, Expression.ExpressionLanguage.MVEL, "foo==true", "fooTrue"); - builder.addStartEventExt("Start").addSequenceFlow("Task"); - builder.addTaskExt("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); - builder.addSequenceFlow("End").addEndEvent("End"); - return builder.getProcessDefinition(); - } - - public static void validateDefaultProcess(ProcessDefinition procDef) - { - TestCase.assertNotNull("Process not null", procDef); - TestCase.assertEquals("Proc", procDef.getName()); - - TestCase.assertEquals("Two proc props", 2, procDef.getPropertyNames().size()); - TestCase.assertEquals("valP1", procDef.getProperty("proP1").getValue()); - TestCase.assertEquals("valP2", procDef.getProperty("proP2").getValue()); - - Message procMsg = procDef.getMessage("procMsg"); - TestCase.assertEquals("One proc message", 1, procDef.getMessages().size()); - TestCase.assertEquals("msgPropVal", procMsg.getProperty("msgPropName").getValue()); - - TestCase.assertEquals("One proc assignment", 1, procDef.getAssignments().size()); - Assignment procAssign = procDef.getAssignments().get(0); - TestCase.assertEquals(AssignTime.Start, procAssign.getAssignTime()); - TestCase.assertEquals("foo==true", procAssign.getFrom().getExpressionBody()); - TestCase.assertEquals("fooTrue", procAssign.getTo().getName()); - - StartEvent start = (StartEvent)procDef.getNode("Start"); - Task task = (Task)procDef.getNode("Task"); - EndEvent end = (EndEvent)procDef.getNode("End"); - - TestCase.assertNotNull("Start not null", start); - TestCase.assertNotNull("Task not null", task); - TestCase.assertNotNull("End not null", end); - - TestCase.assertEquals("No start props", 0, start.getPropertyNames().size()); - TestCase.assertEquals("Two task props", 2, task.getPropertyNames().size()); - TestCase.assertEquals("No end props", 0, end.getPropertyNames().size()); - - TestCase.assertEquals("valT1", task.getProperty("proT1").getValue()); - TestCase.assertEquals("valT2", task.getProperty("proT2").getValue()); - - SequenceFlow startFlow = start.getOutFlow(); - TestCase.assertNotNull("Start flow not null", startFlow); - TestCase.assertEquals("Task", startFlow.getTargetRef()); - TestCase.assertEquals("Start", startFlow.getSourceRef()); - - SequenceFlow taskFlow = task.getOutFlow(); - TestCase.assertNotNull("Task flow not null", taskFlow); - TestCase.assertEquals("End", taskFlow.getTargetRef()); - TestCase.assertEquals("Task", taskFlow.getSourceRef()); - } -} Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.test; + +// $Id$ + +import junit.framework.TestCase; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.EndEvent; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Task; +import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.service.ProcessBuilderService; + +/** + * A catalog of CTS test processes + * + * @author thomas.diesler(a)jboss.com + * @since 24-Sep-2008 + */ +public abstract class ProcessCatalog +{ + public static ProcessDefinition getDefaultProcess(ProcessEngine engine) + { + ProcessBuilderService pbService = engine.getService(ProcessBuilderService.class); + ProcessBuilder builder = pbService.getProcessBuilder(); + builder.addProcess("Proc"); + builder.addStartEvent("Start").addSequenceFlow("Task"); + builder.addTask("Task"); + builder.addSequenceFlow("End").addEndEvent("End"); + return builder.getProcessDefinition(); + } + + public static void validateDefaultProcess(ProcessDefinition procDef) + { + TestCase.assertNotNull("Process not null", procDef); + TestCase.assertEquals("Proc", procDef.getName()); + + StartEvent start = (StartEvent)procDef.getNode("Start"); + Task task = (Task)procDef.getNode("Task"); + EndEvent end = (EndEvent)procDef.getNode("End"); + + TestCase.assertNotNull("Start not null", start); + TestCase.assertNotNull("Task not null", task); + TestCase.assertNotNull("End not null", end); + + SequenceFlow startFlow = start.getOutFlow(); + TestCase.assertNotNull("Start flow not null", startFlow); + TestCase.assertEquals("Task", startFlow.getTargetRef()); + TestCase.assertEquals("Start", startFlow.getSourceRef()); + + SequenceFlow taskFlow = task.getOutFlow(); + TestCase.assertNotNull("Task flow not null", taskFlow); + TestCase.assertEquals("End", taskFlow.getTargetRef()); + TestCase.assertEquals("Task", taskFlow.getSourceRef()); + } +} Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalogExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalogExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalogExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.test; + +// $Id$ + +import junit.framework.TestCase; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.service.ProcessBuilderService; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.EndEventExt; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.ProcessDefinitionExt; +import org.jbpm.preview.model.StartEventExt; +import org.jbpm.preview.model.TaskExt; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.ProcessBuilderExt; + +/** + * A catalog of CTS test processes + * + * @author thomas.diesler(a)jboss.com + * @since 24-Sep-2008 + */ +public abstract class ProcessCatalogExt +{ + public static ProcessDefinition getDefaultProcess(ProcessEngine engine) + { + ProcessBuilderService pbService = engine.getService(ProcessBuilderService.class); + ProcessBuilderExt builder = (ProcessBuilderExt)pbService.getProcessBuilder(); + builder.addProcess("Proc"); + builder.addProcessProperty("proP1", "valP1").addProcessProperty("proP2", "valP2"); + builder.addProcessMessage("procMsg").addProperty("msgPropName", "msgPropVal"); + builder.addProcessAssignment(AssignTime.Start, Expression.ExpressionLanguage.MVEL, "foo==true", "fooTrue"); + builder.addStartEventExt("Start").addSequenceFlow("Task"); + builder.addTaskExt("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); + builder.addSequenceFlow("End").addEndEvent("End"); + return builder.getProcessDefinition(); + } + + public static void validateDefaultProcess(ProcessDefinitionExt procDef) + { + TestCase.assertNotNull("Process not null", procDef); + TestCase.assertEquals("Proc", procDef.getName()); + + TestCase.assertEquals("Two proc props", 2, procDef.getPropertyNames().size()); + TestCase.assertEquals("valP1", procDef.getProperty("proP1").getValue()); + TestCase.assertEquals("valP2", procDef.getProperty("proP2").getValue()); + + Message procMsg = procDef.getMessage("procMsg"); + TestCase.assertEquals("One proc message", 1, procDef.getMessages().size()); + TestCase.assertEquals("msgPropVal", procMsg.getProperty("msgPropName").getValue()); + + TestCase.assertEquals("One proc assignment", 1, procDef.getAssignments().size()); + Assignment procAssign = procDef.getAssignments().get(0); + TestCase.assertEquals(AssignTime.Start, procAssign.getAssignTime()); + TestCase.assertEquals("foo==true", procAssign.getFrom().getExpressionBody()); + TestCase.assertEquals("fooTrue", procAssign.getTo().getName()); + + StartEventExt start = (StartEventExt)procDef.getNode("Start"); + TaskExt task = (TaskExt)procDef.getNode("Task"); + EndEventExt end = (EndEventExt)procDef.getNode("End"); + + TestCase.assertNotNull("Start not null", start); + TestCase.assertNotNull("Task not null", task); + TestCase.assertNotNull("End not null", end); + + TestCase.assertEquals("No start props", 0, start.getPropertyNames().size()); + TestCase.assertEquals("Two task props", 2, task.getPropertyNames().size()); + TestCase.assertEquals("No end props", 0, end.getPropertyNames().size()); + + TestCase.assertEquals("valT1", task.getProperty("proT1").getValue()); + TestCase.assertEquals("valT2", task.getProperty("proT2").getValue()); + + SequenceFlow startFlow = start.getOutFlow(); + TestCase.assertNotNull("Start flow not null", startFlow); + TestCase.assertEquals("Task", startFlow.getTargetRef()); + TestCase.assertEquals("Start", startFlow.getSourceRef()); + + SequenceFlow taskFlow = task.getOutFlow(); + TestCase.assertNotNull("Task flow not null", taskFlow); + TestCase.assertEquals("End", taskFlow.getTargetRef()); + TestCase.assertEquals("Task", taskFlow.getSourceRef()); + } +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalogExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.client; - -//$Id$ - -import javax.management.ObjectName; - -import org.jbpm.api.model.Process; -import org.jbpm.api.runtime.Attachments; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ProcessAsync extends Process -{ - /** - * Start the process asynchronously - */ - ObjectName startProcessAsync(); - - /** - * Start the process asynchronously, with a given context data - */ - ObjectName startProcessAsync(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. - */ - ProcessStatus 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. - */ - ProcessStatus waitForEnd(long timeout); -} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessExt.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.client; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.api.model.Process; +import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.ProcessStructureExt; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessExt extends Process, ProcessStructureExt +{ + /** + * Start the process asynchronously + */ + ObjectName startProcessAsync(); + + /** + * Start the process asynchronously, with a given context data + */ + ObjectName startProcessAsync(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. + */ + ProcessStatus 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. + */ + ProcessStatus waitForEnd(long timeout); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,8 +23,10 @@ import java.io.Serializable; +import org.jbpm.api.model.Expression; + //$Id$ /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,7 +21,10 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.Gateway; + // $Id$ /** Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.preview.model; - -import org.jbpm.preview.model.Event.EventDetailType; - - -//$Id$ - -/** - * 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 -{ - /** - * Get the type od end result - */ - EventDetailType getResultType(); -} \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEventExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEventExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEventExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.EndEvent; + +//$Id$ + +/** + * 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 EndEventExt extends EndEvent, EventExt +{ +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEventExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; - -import org.jbpm.api.model.Node; - - -//$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 Node -{ - /** - * Defines the type of an {@link Event} - */ - enum EventType - { - Start, End, Intermediate - }; - - /** - * Defines the type of event detail - */ - enum EventDetailType - { - None, Message, Error, Cancel, Compensation, Link, Multiple, Timer, Rule, Signal, Terminate - } - - /** - * Get the type of this event - */ - EventType getEventType(); - - /** - * Get the detail type fopr this event - */ - EventDetailType getDetailType(); - - /** - * Get the associated signal ref - */ - Signal getSignalRef(); - - /** - * Get the associated message ref - */ - Message getMessageRef(); -} \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EventExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EventExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EventExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.Event; + +//$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 EventExt extends Event, NodeExt +{ + /** + * Get the associated signal ref + */ + Signal getSignalRef(); + + /** + * Get the associated message ref + */ + Message getMessageRef(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EventExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,7 +21,9 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Gateway; + //$Id$ /** Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; - -import java.io.Serializable; - -//$Id$ - -/** - * An Expression, which is used in the definition of attributes for StartEvent, - * IntermediateEvent, Activity, ComplexGateway, and SequenceFlow - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Expression extends Serializable -{ - enum ExpressionLanguage - { - MVEL - } - - /** - * 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(); - - /** - * 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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.preview.model; - -//$Id$ - -import java.util.List; - -import org.jbpm.api.model.Node; -import org.jbpm.api.model.SequenceFlow; - - -/** - * 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 Node -{ - /** - * The GatewayType - * - */ - public 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 - */ - 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<SequenceFlow> getGates(); - - /** - * Get the optional default gate - * @return null if there is none - */ - SequenceFlow getDefaultGate(); - - /** - * Get the gate for the given target name - * @return null if there is none - */ - SequenceFlow getGateByName(String targetName); -} \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/GatewayExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/GatewayExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/GatewayExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.Gateway; + +//$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 GatewayExt extends Gateway, NodeExt +{ +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/GatewayExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,7 +21,9 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Gateway; + //$Id$ /** Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/NodeExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/NodeExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/NodeExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.preview.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.Node; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; + +/** + * A Node is an abstract element with a name and an associated process + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface NodeExt extends Node, PropertySupport +{ + /** + * 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(); + + /** Get the associated Group */ + Group getGroupRef(); + + /** + * Get the associated ExecutionHandler + */ + ExecutionHandler getExecutionHandler(); + + /** + * Get the associated SignalHandler + */ + SignalHandler getSignalHandler(); + + /** + * Get the associated FlowHandler + */ + FlowHandler getFlowHandler(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/NodeExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,7 +21,9 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Gateway; + // $Id$ /** Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessDefinitionExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessDefinitionExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessDefinitionExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.ProcessDefinition; + +//$Id$ + + +/** + * A ProcessDefinition defines the structure of an activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessDefinitionExt extends ProcessDefinition, ProcessStructureExt +{ +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessDefinitionExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessStructureExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessStructureExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessStructureExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.ProcessStructure; + +/** + * A ProcessStructure defines the structure of a Process + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessStructureExt extends ProcessStructure, PropertySupport +{ + /** + * 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(); + + /** + * 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); + + /** + * Get the list of associated {@link Group} objects. + * @return An empty list if there are none + */ + List<Group> getGroups(); + + /** + * Get an associated {@link Group} by name. + * @return null if not found + */ + Group getGroup(String grpName); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessStructureExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,7 +21,9 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Task; + //$Id$ /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,7 +21,9 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Task; + //$Id$ /** Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; - -import org.jbpm.api.model.SequenceFlow; - - -// $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. - * - * There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. - * That is, a Process Instance SHALL be generated when the Start Event is triggered. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface StartEvent extends Event -{ - /** - * Get the outgoing SequenceFlow - */ - SequenceFlow getOutFlow(); - - /** - * Get the start trigger type - */ - EventDetailType getTriggerType(); -} \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEventExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEventExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEventExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.StartEvent; + + + +// $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. + * + * There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. + * That is, a Process Instance SHALL be generated when the Start Event is triggered. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface StartEventExt extends StartEvent, EventExt +{ + /** + * Get the start trigger type + */ + EventDetailType getTriggerType(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEventExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.preview.model; - -//$Id$ - -import java.util.List; - -import org.jbpm.api.model.Node; -import org.jbpm.api.model.SequenceFlow; - - -/** - * 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 Node -{ - /** - * The TaskType - */ - public enum TaskType - { - Service, Receive, Send, User, Script, Manual, Reference, None, Wait - } - - /** - * 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. - */ - TaskType getTaskType(); - - /** - * Get the incomming SequenceFlow - */ - SequenceFlow getInFlow(); - - /** - * Get the outgoing SequenceFlow - */ - SequenceFlow getOutFlow(); - - /** - * 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(); -} \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/TaskExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/TaskExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/TaskExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.Task; + + +/** + * 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 TaskExt extends Task, NodeExt +{ + /** + * 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(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/TaskExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -21,6 +21,7 @@ */ package org.jbpm.preview.model; +import org.jbpm.api.model.Task; import org.jbpm.preview.client.UserTaskCallback; //$Id$ Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -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.jbpm.preview.model; - - -//$Id$ - - - -/** - * A WaitState is a Task that returns control to Thread that signalled the Execution - * - * @author thomas.diesler(a)jboss.com - * @since 12-Nov-2008 - */ -public interface WaitState extends Task -{ -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,16 +25,16 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.Group.GroupType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.SignalHandler; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,8 +23,8 @@ //$Id$ +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Expression.ExpressionLanguage; /** * The TaskBuilder can be used to build a Task dynamically. Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/ExecutionService.java (from rev 2922, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/ExecutionService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/ExecutionService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.service; + +// $Id$ + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import org.jbpm.api.model.Process; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.runtime.Attachments; +import org.jbpm.api.service.AbstractService; + +/** + * The ExecutionService executes processes + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class ExecutionService extends AbstractService +{ + private ExecutorService procExecutor = Executors.newCachedThreadPool(); + + // Hide public constructor + protected ExecutionService() + { + } + + /** + * Get the process executor service + */ + public ExecutorService getProcessExecutor() + { + return procExecutor; + } + + /** + * Start the Process from a given start event + * + * @param start The StartEvent that triggers the process + * @param att The Attachments in the ExecutionContext + */ + public abstract void startProcess(Process proc, StartEvent start, 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. + */ + public abstract ProcessStatus waitForEnd(Process proc); + + /** + * 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. + */ + public abstract ProcessStatus waitForEnd(Process proc, long timeout); +} Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -33,15 +33,15 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Event; import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; +import org.jbpm.api.model.Task; import org.jbpm.api.service.AbstractService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.model.Event; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Participant; -import org.jbpm.preview.model.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.preview.service; - -// $Id$ - -import javax.management.ObjectName; - -import org.hibernate.Session; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.AbstractService; - -/** - * The persistence service. - * - * @author thomas.diesler(a)jboss.com - * @since 17-Sep-2008 - */ -public abstract class PersistenceService extends AbstractService -{ - /** - * Locate the default PersistenceService - */ - public static PersistenceService locatePersistenceService() - { - ProcessEngine engine = Configuration.getProcessEngine(); - return engine.getService(PersistenceService.class); - } - - /** - * Create a new persistence session - */ - public abstract Session createSession(); - - /** - * Save the ProcessDefinition to persistent storage - */ - public abstract ObjectName saveProcessDefinition(ProcessDefinition procDef); - - /** - * Load the ProcessDefinition from persistent storage - */ - public abstract ProcessDefinition loadProcessDefinition(ObjectName procDefID); - - /** - * Delete the ProcessDefinition from persistent storage - */ - public abstract void deleteProcessDefinition(ProcessDefinition procDef); - - /** - * Save the Process to persistent storage - */ - public abstract ObjectName saveProcess(Process proc); - - /** - * Load the Process from persistent storage - */ - public abstract Process loadProcess(ObjectName procID); - - /** - * Delete the Process from persistent storage - */ - public abstract void deleteProcess(Process proc); - - /** - * Save the Node to persistent storage - */ - public abstract ObjectName saveNode(Session session, Node node); - - /** - * Load the Node from persistent storage - */ - public abstract <T extends Node> T loadNode(Session session, Class<T> clazz, ObjectName nodeID); -} \ No newline at end of file Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -29,14 +29,14 @@ import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; /** * Exclusive data-based gateway that has conditional outgoing sequence flows. Only one of the gates is taken. It is an Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -30,10 +30,10 @@ import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.model.Task.TaskType; /** * Test the basic wait state sequence Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,15 +26,15 @@ import java.io.IOException; import java.util.List; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; -import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -64,7 +64,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -79,7 +79,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,15 +26,15 @@ import java.io.IOException; import java.util.List; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; -import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -63,7 +63,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -28,11 +28,11 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; -import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testParallelSplit() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.preview.service.PersistenceService; +import org.jbpm.api.service.PersistenceService; /** * Test the basic execution sequence Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -29,7 +29,7 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -46,7 +46,7 @@ { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the Process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,11 +27,11 @@ import java.util.List; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -46,7 +46,7 @@ public void testSimpleMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,14 +26,14 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -50,7 +50,7 @@ public void testParallelMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,13 +26,13 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -50,7 +50,7 @@ public void testCaseProperties() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,13 +26,13 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.model.builder.TaskBuilder; @@ -51,7 +51,7 @@ public void testTaskDataRead() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,12 +26,12 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -46,7 +46,7 @@ public void testStart() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the process BasicAttachments att = new BasicAttachments(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,11 +27,11 @@ import java.util.List; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -47,7 +47,7 @@ public void testMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,11 +27,11 @@ import java.util.List; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -46,7 +46,7 @@ public void testSimpleMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,14 +27,14 @@ import java.util.List; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -63,7 +63,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,14 +26,14 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -50,7 +50,7 @@ public void testParallelMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -29,11 +29,11 @@ import javax.management.ObjectName; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -49,7 +49,7 @@ public void testParallelSplit() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,12 +26,12 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.model.builder.TaskBuilder; @@ -51,7 +51,7 @@ public void testValidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("frog", "kermit"); @@ -66,7 +66,7 @@ public void testInvalidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("pig", "piggy"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,11 +26,11 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.model.builder.TaskBuilder; @@ -51,7 +51,7 @@ public void testValidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,13 +26,13 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.model.builder.TaskBuilder; @@ -52,7 +52,7 @@ public void testActivityPropertyRead() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,13 +26,13 @@ import java.io.IOException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -57,7 +57,7 @@ public void testProcessProperties() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -29,17 +29,17 @@ import javax.management.ObjectName; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.client.SignalListener; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.MessageBuilder; @@ -63,7 +63,7 @@ ProcessDefinitionService procDefService = ProcessDefinitionService.locateProcessDefinitionService(); procDefService.registerProcessDefinition(procDef); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); try { proc.startProcessAsync(); @@ -81,7 +81,7 @@ // Get the just started process ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); Set<ObjectName> procIDs = procService.getProcesses("StartEventSignal", null); - proc = (ProcessAsync) procService.getProcess(procIDs.iterator().next()); + proc = (ProcessExt) procService.getProcess(procIDs.iterator().next()); // Wait for the process to end if (proc != null) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,12 +27,12 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.preview.runtime.BasicNodeHandler; @@ -49,7 +49,7 @@ public void testExecutionHandler() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -29,17 +29,17 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.client.SignalListener; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.Signal.SignalType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -74,7 +74,7 @@ public void testUnregisteredProcess() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); MessageService msgService = MessageService.locateMessageService(); try @@ -94,7 +94,7 @@ ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); ObjectName procID = procService.registerProcess(proc); try @@ -119,7 +119,7 @@ public void testSuspendedToken() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - final ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + final ProcessExt proc = (ProcessExt)procDef.newInstance(); SignalListener sigListener = new SignalListener() { private boolean sendMessage = true; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -28,12 +28,12 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; @@ -48,7 +48,7 @@ public void testSendTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "bar"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,16 +27,16 @@ import java.util.List; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.client.UserTaskCallback; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.ProcessBuilderExt; /** @@ -50,7 +50,7 @@ public void testUserTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, "UserTask"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -30,16 +30,16 @@ import org.jbpm.api.Constants; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.service.MessageBuilderService; @@ -58,7 +58,7 @@ public void testUserTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); // Register the process - this assigns the procID ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,14 +32,16 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.NodeExt; +import org.jbpm.preview.model.ProcessDefinitionExt; import org.jbpm.preview.model.Group.GroupType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.ri.runtime.TransactionAssociation; @@ -54,10 +56,10 @@ { public void testNoRollback() throws Exception { - ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); + ProcessDefinitionExt procDef = (ProcessDefinitionExt)unregisterOnTearDown(getProcessDefinition()); - Node taskA = procDef.getNode("TaskA"); - Node taskB = procDef.getNode("TaskB"); + NodeExt taskA = (NodeExt)procDef.getNode("TaskA"); + NodeExt taskB = (NodeExt)procDef.getNode("TaskB"); Group group = procDef.getGroup("TxRequired"); Group groupA = taskA.getGroupRef(); Group groupB = taskB.getGroupRef(); @@ -66,7 +68,7 @@ assertSame("Group same", group, groupA); assertSame("Group same", group, groupB); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); @@ -78,7 +80,7 @@ public void testRollback() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment(Boolean.class, "rollback", Boolean.TRUE); Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -31,9 +31,16 @@ import javax.xml.bind.Marshaller; import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.EndEvent; +import org.jbpm.api.model.Event; +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Task; +import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.dialect.api10.model.JAXBAssignment; import org.jbpm.dialect.api10.model.JAXBComplexGateway; @@ -44,7 +51,6 @@ import org.jbpm.dialect.api10.model.JAXBExpression; import org.jbpm.dialect.api10.model.JAXBFlow; import org.jbpm.dialect.api10.model.JAXBFlowHandler; -import org.jbpm.dialect.api10.model.JAXBNode; import org.jbpm.dialect.api10.model.JAXBGateway; import org.jbpm.dialect.api10.model.JAXBGroup; import org.jbpm.dialect.api10.model.JAXBInclusiveGateway; @@ -52,6 +58,7 @@ import org.jbpm.dialect.api10.model.JAXBMessage; import org.jbpm.dialect.api10.model.JAXBMessageEventDetail; import org.jbpm.dialect.api10.model.JAXBMessageRef; +import org.jbpm.dialect.api10.model.JAXBNode; import org.jbpm.dialect.api10.model.JAXBOutputSet; import org.jbpm.dialect.api10.model.JAXBParallelGateway; import org.jbpm.dialect.api10.model.JAXBProcess; @@ -65,15 +72,15 @@ import org.jbpm.dialect.api10.model.ObjectFactory; import org.jbpm.preview.model.Assignment; import org.jbpm.preview.model.ComplexGateway; -import org.jbpm.preview.model.EndEvent; -import org.jbpm.preview.model.Event; +import org.jbpm.preview.model.EndEventExt; +import org.jbpm.preview.model.EventExt; import org.jbpm.preview.model.ExclusiveGateway; -import org.jbpm.preview.model.Expression; -import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.model.GatewayExt; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.InclusiveGateway; import org.jbpm.preview.model.InputSet; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.NodeExt; import org.jbpm.preview.model.OutputSet; import org.jbpm.preview.model.ParallelGateway; import org.jbpm.preview.model.Participant; @@ -81,9 +88,8 @@ import org.jbpm.preview.model.ReceiveTask; import org.jbpm.preview.model.SendTask; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.StartEvent; -import org.jbpm.preview.model.Task; -import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.StartEventExt; +import org.jbpm.preview.model.TaskExt; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.SignalHandler; @@ -112,6 +118,7 @@ JAXBProcess jaxbProc = new JAXBProcess(); jaxbProc.setName(procDef.getName()); + /* for (Message msg : procDef.getMessages()) { JAXBMessage jaxbMsg = adaptMessage(msg); @@ -132,34 +139,37 @@ JAXBGroup jaxbGrp = getJaxbGroup(grp); jaxbProc.getGroups().add(jaxbGrp); } + */ for (Node node : procDef.getNodes()) { + NodeExt nodeExt = (NodeExt)node; + JAXBNode jaxbNode; - if (node instanceof Event) + if (nodeExt instanceof Event) { - jaxbNode = adaptEvent(jaxbProc, (Event)node); + jaxbNode = adaptEvent(jaxbProc, (EventExt)nodeExt); } - else if (node instanceof Task) + else if (nodeExt instanceof Task) { - jaxbNode = adaptTask(jaxbProc, (Task)node); + jaxbNode = adaptTask(jaxbProc, (TaskExt)nodeExt); } - else if (node instanceof Gateway) + else if (nodeExt instanceof Gateway) { - jaxbNode = adaptGateway(jaxbProc, (Gateway)node); + jaxbNode = adaptGateway(jaxbProc, (GatewayExt)nodeExt); } else { - throw new IllegalStateException("Unsupported flow object: " + node); + throw new IllegalStateException("Unsupported flow object: " + nodeExt); } - for (Assignment ass : node.getAssignments()) + for (Assignment ass : nodeExt.getAssignments()) { JAXBAssignment jaxbAss = getJaxbAssignment(ass); jaxbNode.getAssignments().add(jaxbAss); } - Group groupRef = node.getGroupRef(); + Group groupRef = nodeExt.getGroupRef(); if (groupRef != null) jaxbNode.setGroupRef(groupRef.getName()); @@ -168,12 +178,12 @@ return jaxbProc; } - private JAXBNode adaptEvent(JAXBProcess jaxbProc, Event event) + private JAXBNode adaptEvent(JAXBProcess jaxbProc, EventExt event) { JAXBEvent jaxbEvent; if (event instanceof StartEvent) { - StartEvent start = (StartEvent)event; + StartEventExt start = (StartEventExt)event; JAXBStartEvent jaxbStart = new JAXBStartEvent(); jaxbStart.setName(start.getName()); jaxbStart.setOutFlow(getJAXBFlow(start.getOutFlow())); @@ -214,7 +224,7 @@ } else if (event instanceof EndEvent) { - EndEvent end = (EndEvent)event; + EndEventExt end = (EndEventExt)event; JAXBEndEvent jaxbEnd = new JAXBEndEvent(); jaxbEnd.setName(end.getName()); @@ -271,7 +281,7 @@ return jaxbEvent; } - private JAXBNode adaptTask(JAXBProcess jaxbProc, Task task) + private JAXBNode adaptTask(JAXBProcess jaxbProc, TaskExt task) { JAXBTask jaxbTask = new JAXBTask(); jaxbTask.setTaskType(task.getTaskType()); @@ -328,7 +338,7 @@ return jaxbTask; } - private JAXBNode adaptGateway(JAXBProcess jaxbProc, Gateway gateway) + private JAXBNode adaptGateway(JAXBProcess jaxbProc, GatewayExt gateway) { JAXBGateway jaxbGateway; if (gateway instanceof ExclusiveGateway) @@ -381,6 +391,7 @@ return jaxbMsgRef; } + @SuppressWarnings("unused") private JAXBMessage adaptMessage(Message msg) { JAXBMessage jaxbMsg = new JAXBMessage(); @@ -453,6 +464,7 @@ return jaxbAss; } + @SuppressWarnings("unused") private JAXBGroup getJaxbGroup(Group grp) { JAXBGroup jaxbGrp = new JAXBGroup(); Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,8 +32,10 @@ import javax.xml.bind.Unmarshaller; import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.SequenceFlow.ConditionType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.service.ProcessBuilderService; @@ -72,8 +74,6 @@ import org.jbpm.dialect.api10.model.JAXBTerminateEventDetail; import org.jbpm.dialect.api10.model.JAXBTimerEventDetail; import org.jbpm.dialect.api10.model.ObjectFactory; -import org.jbpm.preview.model.Gateway; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.GroupBuilder; import org.jbpm.preview.model.builder.MessageBuilder; Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.jbpm.preview.model.Expression; +import org.jbpm.api.model.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import org.jbpm.preview.model.Task; +import org.jbpm.api.model.Task; /** * A Task is an Atomic Activity that is included within a Process. Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,7 +26,9 @@ import java.util.List; import org.jbpm.api.InvalidProcessException; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Task; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.jpdl32.model.JPDL32Action; import org.jbpm.dialect.jpdl32.model.JPDL32EndState; @@ -36,8 +38,6 @@ import org.jbpm.dialect.jpdl32.model.JPDL32StartState; import org.jbpm.dialect.jpdl32.model.JPDL32State; import org.jbpm.dialect.jpdl32.model.JPDL32Transition; -import org.jbpm.preview.model.Gateway; -import org.jbpm.preview.model.Task; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.runtime.ExecutionHandler; Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -37,7 +37,9 @@ import org.jboss.util.xml.DOMUtils; import org.jbpm.api.InvalidProcessException; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Task; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.stp.model.Activity; import org.jbpm.dialect.stp.model.ActivityType; @@ -45,8 +47,6 @@ import org.jbpm.dialect.stp.model.ObjectFactory; import org.jbpm.dialect.stp.model.Pool; import org.jbpm.dialect.stp.model.SequenceEdge; -import org.jbpm.preview.model.Gateway; -import org.jbpm.preview.model.Task; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -31,8 +31,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; +import org.jbpm.api.model.Expression; import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.Property; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,9 +26,9 @@ import javax.persistence.Entity; import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.ProcessStructure; import org.jbpm.preview.model.ComplexGateway; -import org.jbpm.preview.model.Expression; /** * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -35,7 +35,7 @@ import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.EndEvent; +import org.jbpm.preview.model.EndEventExt; import org.jbpm.preview.model.Signal; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.SignalHandler; @@ -56,7 +56,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMEndEvent") -public class EndEventImpl extends EventImpl implements EndEvent, SingleInFlowSupport +public class EndEventImpl extends EventImpl implements EndEventExt, SingleInFlowSupport { private static final long serialVersionUID = 1L; final static Logger log = LoggerFactory.getLogger(EndEventImpl.class); @@ -72,6 +72,7 @@ { } + @Override public EventDetailType getResultType() { return detailType; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -39,7 +39,7 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.preview.model.Event; +import org.jbpm.preview.model.EventExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; import org.jbpm.preview.runtime.ExecutionHandler; @@ -55,7 +55,7 @@ * @since 08-Jul-2008 */ @MappedSuperclass -public class EventImpl extends NodeImpl implements Event +public class EventImpl extends NodeImpl implements EventExt { private static final long serialVersionUID = 1L; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -30,12 +30,12 @@ import javax.persistence.Transient; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.preview.model.ExclusiveGateway; -import org.jbpm.preview.model.Expression; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -28,7 +28,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.preview.model.Expression; +import org.jbpm.api.model.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -36,12 +36,12 @@ import org.jbpm.api.Constants; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.preview.model.Gateway; import org.jbpm.preview.model.Signal; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.SignalHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -31,15 +31,15 @@ import javax.persistence.Entity; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.Attachments.Key; -import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.InclusiveGateway; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.MutableToken; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -46,17 +46,19 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; +import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.StartEvent; import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.EndEvent; import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.NodeExt; +import org.jbpm.preview.model.ProcessStructureExt; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.PropertySupport; -import org.jbpm.preview.model.StartEvent; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.NodeHandler; @@ -78,7 +80,7 @@ */ @Entity(name = "BPMNode") @Inheritance(strategy = InheritanceType.JOINED) -public abstract class NodeImpl extends AbstractElementImpl implements Node +public abstract class NodeImpl extends AbstractElementImpl implements NodeExt { private static final long serialVersionUID = 1L; @@ -88,7 +90,7 @@ private String name; @ManyToOne(targetEntity = ProcessStructureImpl.class) - private ProcessStructure procStruct; + private ProcessStructureExt procStruct; @Basic private int nodeIndex; @@ -137,7 +139,7 @@ public NodeImpl(ProcessStructure procStruct, String name) { - this.procStruct = procStruct; + this.procStruct = (ProcessStructureExt)procStruct; this.name = name; } @@ -416,7 +418,7 @@ Hibernate.initialize(inFlows); } - private void checkAndInitializeStructure(ProcessStructure procStruct) + private void checkAndInitializeStructure(ProcessStructureExt procStruct) { // Check required name if (name == null) Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -45,11 +45,12 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.preview.model.Assignment; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.ProcessDefinitionExt; +import org.jbpm.preview.model.ProcessStructureExt; import org.jbpm.preview.model.Property; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +62,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMProcessDefinition") -public class ProcessDefinitionImpl extends AbstractElementImpl implements ProcessDefinition +public class ProcessDefinitionImpl extends AbstractElementImpl implements ProcessDefinitionExt { private static final long serialVersionUID = 1L; @@ -69,7 +70,7 @@ final static Logger log = LoggerFactory.getLogger(ProcessDefinitionImpl.class); @OneToOne(cascade = { CascadeType.ALL }, targetEntity = ProcessStructureImpl.class) - private ProcessStructure procStruct; + private ProcessStructureExt procStruct; @Lob private byte[] rawProcStruct; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -45,17 +45,19 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.service.ExecutionService; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Assignment; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.ProcessStructureExt; import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.StartEvent; -import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.StartEventExt; +import org.jbpm.preview.service.ExecutionService; import org.jbpm.ri.runtime.TokenImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,7 +69,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMProcess") -public class ProcessImpl extends AbstractElementImpl implements ProcessAsync +public class ProcessImpl extends AbstractElementImpl implements ProcessExt, ProcessStructureExt { private static final long serialVersionUID = 1L; @@ -318,7 +320,8 @@ StartEvent start = null; for (StartEvent aux : getNodes(StartEvent.class)) { - if (aux.getTriggerType() == EventDetailType.None) + StartEventExt startExt = (StartEventExt)aux; + if (startExt.getTriggerType() == EventDetailType.None) { if (start != null) throw new InvalidProcessException("Process cannot have multiple start events with no trigger"); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -42,18 +42,18 @@ import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.ProcessStructure; +import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.EndEvent; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.ProcessStructureExt; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.PropertySupport; -import org.jbpm.preview.model.StartEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +64,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMProcessStructure") -public class ProcessStructureImpl extends AbstractElementImpl implements ProcessStructure +public class ProcessStructureImpl extends AbstractElementImpl implements ProcessStructureExt { private static final long serialVersionUID = 1L; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,8 +32,8 @@ import javax.persistence.Id; import javax.persistence.OneToOne; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.preview.model.Expression; /** * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -36,13 +36,14 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.api.service.ExecutionService; import org.jbpm.preview.client.SignalListener; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.StartEventExt; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.service.ExecutionService; import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.builder.SingleOutFlowSupport; import org.slf4j.Logger; @@ -57,7 +58,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMStartEvent") -public class StartEventImpl extends EventImpl implements StartEvent, SingleOutFlowSupport +public class StartEventImpl extends EventImpl implements StartEventExt, SingleOutFlowSupport { private static final long serialVersionUID = 1L; @@ -78,6 +79,7 @@ { } + @Override public EventDetailType getTriggerType() { return detailType; @@ -98,6 +100,7 @@ } @Transient + @Override public SequenceFlow getOutFlow() { if (outFlows.size() != 1) @@ -105,6 +108,7 @@ return outFlows.get(0); } + @Override public void setOutFlow(SequenceFlowImpl outFlow) { outFlow.setSourceIndex(outFlows.size()); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -41,17 +41,17 @@ import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.InputSet; import org.jbpm.preview.model.OutputSet; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Task; +import org.jbpm.preview.model.TaskExt; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.preview.service.SignalService; @@ -68,7 +68,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMTask") -public class TaskImpl extends NodeImpl implements Task, SingleOutFlowSupport, SingleInFlowSupport +public class TaskImpl extends NodeImpl implements TaskExt, SingleOutFlowSupport, SingleInFlowSupport { // provide serial version UID private static final long serialVersionUID = 1L; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -28,7 +28,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.preview.model.WaitState; +import org.jbpm.api.model.WaitState; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.model.builder.SingleInFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.preview.model.Event; +import org.jbpm.api.model.Event; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.ri.model.EventImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,10 +23,10 @@ //$Id$ +import org.jbpm.api.model.Gateway; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.preview.model.Gateway; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.GatewayImpl; import org.jbpm.ri.model.SequenceFlowImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,13 +27,13 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Event.EventDetailType; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.Group.GroupType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.GroupBuilder; import org.jbpm.preview.model.builder.MessageBuilder; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -23,9 +23,9 @@ //$Id$ +import org.jbpm.api.model.Task; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.Task; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.InputSetImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -24,10 +24,10 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.api.model.Node; +import org.jbpm.api.model.Expression; import org.jbpm.api.runtime.Attachments; import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Expression; +import org.jbpm.preview.model.NodeExt; import org.jbpm.preview.model.Assignment.AssignTime; /** @@ -42,7 +42,7 @@ public void execute(RuntimeContext rtContext) { Token token = rtContext.getToken(); - Node node = token.getCurrentNode(); + NodeExt node = (NodeExt)token.getCurrentNode(); // Do start time assignments for (Assignment ass : node.getAssignments()) Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -30,8 +30,9 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.NodeExt; +import org.jbpm.preview.model.ProcessDefinitionExt; import org.jbpm.preview.model.Property; /** @@ -42,18 +43,18 @@ */ public class DelegatingAttachments implements Attachments { - private Node node; + private NodeExt node; private Attachments delegate; private String activityPrefix; private String procPrefix; - private ProcessDefinition procDef; + private ProcessDefinitionExt procDef; - DelegatingAttachments(Node node, Attachments delegate) + DelegatingAttachments(NodeExt node, Attachments delegate) { this.node = node; this.delegate = delegate; - procDef = node.getProcessDefinition(); + procDef = (ProcessDefinitionExt)node.getProcessDefinition(); procPrefix = procDef.getName() + "."; activityPrefix = procPrefix + node.getName() + "."; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,6 +32,7 @@ import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.NodeExt; /** * A {@link Token} that includes properties from the current {@link Node} @@ -48,7 +49,7 @@ { this.delegateToken = token; - Node targetNode = token.getCurrentNode(); + NodeExt targetNode = (NodeExt)token.getCurrentNode(); Attachments exContext = token.getAttachments(); this.delegateContext = new DelegatingAttachments(targetNode, exContext); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.api.model.Node; +import org.jbpm.preview.model.NodeExt; import org.jbpm.preview.runtime.SignalHandler; /** @@ -39,7 +39,7 @@ public void execute(RuntimeContext rtContext) { Token token = rtContext.getToken(); - Node node = token.getCurrentNode(); + NodeExt node = (NodeExt)token.getCurrentNode(); SignalHandler sigHandler = node.getSignalHandler(); sigHandler.throwExitSignal(token); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,10 +27,10 @@ import java.util.Map; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.Attachments.Key; -import org.jbpm.preview.model.Expression; -import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.mvel.MVEL; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.api.model.Node; +import org.jbpm.preview.model.NodeExt; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; @@ -41,7 +41,7 @@ { TokenExecutor tokenExecutor = rtContext.getTokenExecutor(); Token token = rtContext.getToken(); - Node node = token.getCurrentNode(); + NodeExt node = (NodeExt)token.getCurrentNode(); // Call the next Interceptor rtContext.next(); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -26,7 +26,7 @@ import org.hibernate.Session; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.preview.service.PersistenceService; +import org.jbpm.api.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.api.model.Node; +import org.jbpm.preview.model.NodeExt; import org.jbpm.preview.runtime.SignalHandler; /** @@ -39,7 +39,7 @@ public void execute(RuntimeContext rtContext) { Token token = rtContext.getToken(); - Node node = token.getCurrentNode(); + NodeExt node = (NodeExt)token.getCurrentNode(); try { Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -34,12 +34,12 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.WaitState; import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.runtime.Attachments.Key; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.preview.model.WaitState; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.service.ProcessServiceImpl; import org.jbpm.ri.model.ProcessImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -30,10 +30,11 @@ import org.jbpm.api.Constants.TxType; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; +import org.jbpm.api.service.PersistenceService; import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.NodeExt; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.Group.GroupType; -import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +60,7 @@ // Get the Thread associated Tx Transaction tx = TransactionAssociation.getTransaction(); - TxType txType = getTxType(node); + TxType txType = getTxType((NodeExt)node); if (txType == TxType.REQUIRESNEW) { tx = session.beginTransaction(); @@ -96,7 +97,7 @@ Node nextNode = token.getCurrentNode(); if (nextNode != null) { - txTypeNext = getTxType(nextNode); + txTypeNext = getTxType((NodeExt)nextNode); } // Commit the Tx if it was not rolled back already @@ -126,7 +127,7 @@ } } - private TxType getTxType(Node node) + private TxType getTxType(NodeExt node) { // Initialize with the default TxType txType = TxType.REQUIRESNEW; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,17 +32,18 @@ import org.jbpm.api.ProcessTimeoutException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.Process; +import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.service.ExecutionService; import org.jbpm.api.service.ProcessInstanceService; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Expression; -import org.jbpm.preview.model.StartEvent; import org.jbpm.preview.model.Assignment.AssignTime; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.preview.service.ExecutionService; import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.model.SequenceFlowImpl; @@ -129,14 +130,14 @@ } // Do the start time assignments - startTimeAssignments(proc, initialToken); + startTimeAssignments((ProcessExt)proc, initialToken); // Start the initial token tokenExecutor.start(initialToken); } // Evaluate the Start time assignments - private void startTimeAssignments(Process proc, Token token) + private void startTimeAssignments(ProcessExt proc, Token token) { DelegatingToken delegatingToken = new DelegatingToken((MutableToken)token); Attachments atts = token.getAttachments(); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -40,8 +40,8 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.Service; -import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.model.AbstractElementImpl; import org.jbpm.ri.model.ProcessDefinitionImpl; import org.jbpm.ri.model.ProcessImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -34,7 +34,7 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.preview.service.PersistenceService; +import org.jbpm.api.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -32,8 +32,8 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Process; import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.runtime.NodeInterceptor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,8 +25,8 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.ComplexGateway; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.ComplexGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,10 +25,11 @@ import javax.management.ObjectName; -import org.jbpm.preview.model.EndEvent; +import org.jbpm.api.model.EndEvent; +import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.preview.model.EndEventExt; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.ri.model.EndEventImpl; import org.jbpm.ri.model.MessageImpl; @@ -64,7 +65,7 @@ ObjectName nodeID = saveNode(orgNode); - EndEvent wasNode = loadNode(EndEventImpl.class, nodeID); + EndEventExt wasNode = (EndEventExt)loadNode(EndEventImpl.class, nodeID); assertEquals("End", wasNode.getName()); assertEquals(EventDetailType.Signal, wasNode.getDetailType()); @@ -87,7 +88,7 @@ ObjectName nodeID = saveNode(orgNode); - EndEvent wasNode = loadNode(EndEventImpl.class, nodeID); + EndEventExt wasNode = (EndEventExt)loadNode(EndEventImpl.class, nodeID); assertEquals("End", wasNode.getName()); assertEquals(EventDetailType.Message, wasNode.getDetailType()); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,8 +25,8 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.ExclusiveGateway; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.ExclusiveGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,8 +25,8 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.InclusiveGateway; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.InclusiveGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,8 +27,8 @@ import org.hibernate.Session; import org.jbpm.api.model.Node; +import org.jbpm.api.service.PersistenceService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.service.HibernatePersistenceServiceImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,8 +25,8 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.ParallelGateway; -import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.ParallelGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,13 +27,13 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Task; +import org.jbpm.api.service.PersistenceService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.api.test.ProcessCatalog; -import org.jbpm.preview.model.EndEvent; -import org.jbpm.preview.model.StartEvent; -import org.jbpm.preview.model.Task; -import org.jbpm.preview.service.PersistenceService; /** * Test the PersistenceService Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -27,15 +27,15 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Task; +import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.api.test.ProcessCatalog; -import org.jbpm.preview.model.EndEvent; -import org.jbpm.preview.model.StartEvent; -import org.jbpm.preview.model.Task; -import org.jbpm.preview.service.PersistenceService; /** * Test the PersistenceService Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,10 +25,11 @@ import javax.management.ObjectName; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.StartEvent; -import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.StartEventExt; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.SignalImpl; @@ -64,7 +65,7 @@ ObjectName nodeID = saveNode(orgNode); - StartEvent wasNode = loadNode(StartEventImpl.class, nodeID); + StartEventExt wasNode = (StartEventExt)loadNode(StartEventImpl.class, nodeID); assertEquals("Start", wasNode.getName()); assertEquals(EventDetailType.Signal, wasNode.getDetailType()); @@ -87,7 +88,7 @@ ObjectName nodeID = saveNode(orgNode); - StartEvent wasNode = loadNode(StartEventImpl.class, nodeID); + StartEventExt wasNode = (StartEventExt)loadNode(StartEventImpl.class, nodeID); assertEquals("Start", wasNode.getName()); assertEquals(EventDetailType.Message, wasNode.getDetailType()); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -28,15 +28,16 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.Task; import org.jbpm.api.model.SequenceFlow.ConditionType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.InputSet; import org.jbpm.preview.model.OutputSet; -import org.jbpm.preview.model.Task; +import org.jbpm.preview.model.TaskExt; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.ri.model.AssignmentImpl; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.InputSetImpl; @@ -74,7 +75,7 @@ ObjectName nodeID = saveNode(orgNode); - Task wasNode = loadNode(TaskImpl.class, nodeID); + TaskExt wasNode = loadNode(TaskImpl.class, nodeID); Set<String> propNames = wasNode.getPropertyNames(); assertEquals(2, propNames.size()); assertEquals("valOne", wasNode.getProperty("propOne").getValue()); @@ -91,7 +92,7 @@ ObjectName nodeID = saveNode(orgNode); - Task wasNode = loadNode(TaskImpl.class, nodeID); + TaskExt wasNode = loadNode(TaskImpl.class, nodeID); List<Assignment> ass = wasNode.getAssignments(); assertEquals(2, ass.size()); Assignment assOne = ass.get(0); @@ -166,7 +167,7 @@ ObjectName nodeID = saveNode(orgNode); - Task wasNode = loadNode(TaskImpl.class, nodeID); + TaskExt wasNode = (TaskExt)loadNode(TaskImpl.class, nodeID); List<InputSet> inSets = wasNode.getInputSets(); assertEquals(2, inSets.size()); @@ -192,7 +193,7 @@ ObjectName nodeID = saveNode(orgNode); - Task wasNode = loadNode(TaskImpl.class, nodeID); + TaskExt wasNode = loadNode(TaskImpl.class, nodeID); List<OutputSet> outSets = wasNode.getOutputSets(); assertEquals(2, outSets.size()); @@ -212,7 +213,7 @@ ObjectName nodeID = saveNode(orgNode); - Task wasNode = loadNode(TaskImpl.class, nodeID); + TaskExt wasNode = loadNode(TaskImpl.class, nodeID); List<Expression> rules = wasNode.getIORules(); assertEquals(2, rules.size()); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,9 +25,9 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.UserTaskImpl; Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -25,14 +25,14 @@ import javax.management.ObjectName; +import org.jbpm.api.model.Expression; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.service.ProcessBuilderService; -import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Gateway.GatewayType; -import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.model.builder.TaskBuilder; Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -19,7 +19,7 @@ import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.client.SignalListener; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; @@ -65,7 +65,7 @@ System.out.println("Create new Process"); AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID); ProcessDefinition procDef = procBuilder.buildProcessDefinition(); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + ProcessExt proc = (ProcessExt)procDef.newInstance(); procService.registerProcess(proc); procID = proc.startProcessAsync(); httpSession.setAttribute("procID", procID); Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-14 10:51:01 UTC (rev 2923) +++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-14 11:11:53 UTC (rev 2924) @@ -30,7 +30,7 @@ import org.jbpm.api.runtime.Attachments; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.ProcessExt; import org.jbpm.preview.client.UserTaskCallback; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; @@ -53,7 +53,7 @@ private MessageService messageManager = MessageService.locateMessageService(); private AirticketMessageListener msgListener; - private ProcessAsync proc; + private ProcessExt proc; public void testValidData() throws Exception { @@ -61,7 +61,7 @@ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition()); // Create the process instance - proc = (ProcessAsync)procDef.newInstance(); + proc = (ProcessExt)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER); @@ -87,7 +87,7 @@ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition()); // Create the process instance - proc = (ProcessAsync)procDef.newInstance(); + proc = (ProcessExt)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2923 - jbpm3/tags/jpdl-3.2.2-SOA-4.2.0.CP02/build.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2008-11-14 05:51:01 -0500 (Fri, 14 Nov 2008) New Revision: 2923 Modified: jbpm3/tags/jpdl-3.2.2-SOA-4.2.0.CP02/build/build.properties Log: I changed the build.properties file. The relevant change is: # jboss.home is used for deployment targets. the libraries and binaries dependencies # are resolved in the repo with the lib.jboss.version property specified below. that # property also is based on jboss.version to keep them in sync jboss.version=4.3.0.GA jboss.eap.short.version=4.3 jboss.eap.release.id=4.3.0.GA_CP02 jboss.eap.name=jboss-eap-${jboss.eap.short.version} jboss.eap.full.name=jboss-eap-${jboss.eap.release.id} jboss.eap.remote.file.name=${jboss.eap.full.name}.zip jboss.home=${software.installation.dir}/${jboss.eap.full.name}/jbossas The build will now download http://porkchop.redhat.com/released/JBEAP-4.3.0/CP02/zip/jboss-eap-4.3.0.... and use that one for the build. Modified: jbpm3/tags/jpdl-3.2.2-SOA-4.2.0.CP02/build/build.properties =================================================================== --- jbpm3/tags/jpdl-3.2.2-SOA-4.2.0.CP02/build/build.properties 2008-11-14 10:11:29 UTC (rev 2922) +++ jbpm3/tags/jpdl-3.2.2-SOA-4.2.0.CP02/build/build.properties 2008-11-14 10:51:01 UTC (rev 2923) @@ -18,10 +18,12 @@ # are resolved in the repo with the lib.jboss.version property specified below. that # property also is based on jboss.version to keep them in sync jboss.version=4.3.0.GA -jboss.eap.version=4.3 -jboss.eap.name=jboss-eap-${jboss.eap.version} -jboss.eap.remote.file.name=${jboss.eap.name}.0-0.2.beta4.ep1.1.zip -jboss.home=${software.installation.dir}/${jboss.eap.name}/jbossas +jboss.eap.short.version=4.3 +jboss.eap.release.id=4.3.0.GA_CP02 +jboss.eap.name=jboss-eap-${jboss.eap.short.version} +jboss.eap.full.name=jboss-eap-${jboss.eap.release.id} +jboss.eap.remote.file.name=${jboss.eap.full.name}.zip +jboss.home=${software.installation.dir}/${jboss.eap.full.name}/jbossas # the eclipse home property has to end with 'eclipse' since the folders in the eclipse # distribution package start with eclipse and that package will be unzipped in @@ -36,7 +38,7 @@ # REPOSITORY LOCATION PROPERTIES local.repository=${user.home}/jbpm/repository remote.repository=http://repository.jboss.org -remote.jboss.repository=http://porkchop.redhat.com/devel/candidates/JBEAP4.3.0/latest/zip +remote.jboss.repository=http://porkchop.redhat.com/released/JBEAP-4.3.0/CP02/zip docbook.support.dir=${local.repository} # BROWSER PROPERTIES @@ -652,7 +654,7 @@ lib.jaxrpc.api.local=${local.repository}/${lib.jaxrpc.api.path} lib.jaxrpc.api.remote=${remote.repository}/${lib.jaxrpc.api.path} -lib.jboss.version=${jboss.version} +lib.jboss.version=${jboss.eap.release.id} lib.jboss.license=lgpl lib.jboss.dir=jbossas/core-libs/${lib.jboss.version}/lib

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2922 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/model and 44 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 05:11:29 -0500 (Fri, 14 Nov 2008) New Revision: 2922 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ObjectNameFactory.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gate.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessDefinition.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ExclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java Log: Move more model to preview Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.client; - -//$Id$ - -import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.runtime.Attachments; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Process extends ProcessStructure -{ - /** - * Defines the status a {@link Process} can be in - */ - public enum ProcessStatus - { - None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed - } - - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); - - /** - * Get the associated ProcessDefinition - */ - ProcessDefinition getProcessDefinition(); - - /** - * Get the process state - */ - ProcessStatus getProcessStatus(); - - /** - * Start the process - */ - Token startProcess(); - - /** - * Start the process, with a given context data - */ - Token startProcess(Attachments att); -} \ No newline at end of file Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessDefinition.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessDefinition.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessDefinition.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.client; - -//$Id$ - -import org.jbpm.api.model.ProcessStructure; - -/** - * A ProcessDefinition defines the structure of an activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ProcessDefinition extends ProcessStructure -{ - /** - * Create a new instance of this process definition - */ - Process newInstance(); - - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,6 +26,7 @@ import java.util.Set; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model; - - -//$Id$ - -/** - * 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 -{ - /** - * Get the type od end result - */ - EventDetailType getResultType(); -} \ No newline at end of file Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model; - -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Signal; - - -//$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 Node -{ - /** - * Defines the type of an {@link Event} - */ - enum EventType - { - Start, End, Intermediate - }; - - /** - * Defines the type of event detail - */ - enum EventDetailType - { - None, Message, Error, Cancel, Compensation, Link, Multiple, Timer, Rule, Signal, Terminate - } - - /** - * Get the type of this event - */ - EventType getEventType(); - - /** - * Get the detail type fopr this event - */ - EventDetailType getDetailType(); - - /** - * Get the associated signal ref - */ - Signal getSignalRef(); - - /** - * Get the associated message ref - */ - Message getMessageRef(); -} \ No newline at end of file Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ExclusiveGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ExclusiveGateway.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ExclusiveGateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model; - -import java.io.Serializable; - -//$Id$ - -/** - * An Expression, which is used in the definition of attributes for StartEvent, - * IntermediateEvent, Activity, ComplexGateway, and SequenceFlow - * - * @author thomas.diesler(a)jboss.com - * @since 21-Jul-2008 - */ -public interface Expression extends Serializable -{ - enum ExpressionLanguage - { - MVEL - } - - /** - * 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(); - - /** - * 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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model; - -//$Id$ - -import java.util.List; - -import org.jbpm.preview.model.Assignment; - -/** - * 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 -{ - /** - * 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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.model; - -//$Id$ - -import java.util.List; - - -/** - * 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 Node -{ - /** - * The GatewayType - * - */ - public 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 - */ - 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<SequenceFlow> getGates(); - - /** - * Get the optional default gate - * @return null if there is none - */ - SequenceFlow getDefaultGate(); - - /** - * Get the gate for the given target name - * @return null if there is none - */ - SequenceFlow getGateByName(String targetName); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,6 @@ import java.util.List; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.preview.model.Assignment; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.PropertySupport; Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model; + +//$Id$ + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.client.Token; +import org.jbpm.api.runtime.Attachments; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Process extends ProcessStructure +{ + /** + * Defines the status a {@link Process} can be in + */ + public enum ProcessStatus + { + None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed + } + + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); + + /** + * Get the associated ProcessDefinition + */ + ProcessDefinition getProcessDefinition(); + + /** + * Get the process state + */ + ProcessStatus getProcessStatus(); + + /** + * Start the process + */ + Token startProcess(); + + /** + * Start the process, with a given context data + */ + Token startProcess(Attachments att); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessDefinition.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.model; + +//$Id$ + +import org.jbpm.api.client.ProcessEngine; + +/** + * A ProcessDefinition defines the structure of an activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessDefinition extends ProcessStructure +{ + /** + * Create a new instance of this process definition + */ + Process newInstance(); + + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/SequenceFlow.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,8 +23,10 @@ import java.io.Serializable; +import org.jbpm.preview.model.Expression; + //$Id$ /** Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model; - - -// $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. - * - * There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. - * That is, a Process Instance SHALL be generated when the Start Event is triggered. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface StartEvent extends Event -{ - /** - * Get the outgoing SequenceFlow - */ - SequenceFlow getOutFlow(); - - /** - * Get the start trigger type - */ - EventDetailType getTriggerType(); -} \ No newline at end of file Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.model; - -//$Id$ - -import java.util.List; - -import org.jbpm.preview.model.InputSet; -import org.jbpm.preview.model.OutputSet; - - -/** - * 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 Node -{ - /** - * The TaskType - */ - public enum TaskType - { - Service, Receive, Send, User, Script, Manual, Reference, None, Wait - } - - /** - * 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. - */ - TaskType getTaskType(); - - /** - * Get the incomming SequenceFlow - */ - SequenceFlow getInFlow(); - - /** - * Get the outgoing SequenceFlow - */ - SequenceFlow getOutFlow(); - - /** - * 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(); -} \ No newline at end of file Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.api.model; - -//$Id$ - - - -/** - * A WaitState is a Task that returns control to Thread that signalled the Execution - * - * @author thomas.diesler(a)jboss.com - * @since 12-Nov-2008 - */ -public interface WaitState extends Task -{ -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GatewayBuilder.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,8 +21,8 @@ */ package org.jbpm.api.model.builder; -import org.jbpm.api.model.Gate; -import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gate; +import org.jbpm.preview.model.Expression.ExpressionLanguage; //$Id$ Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ObjectNameFactory.java (from rev 2919, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ObjectNameFactory.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ObjectNameFactory.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model.builder; + +// $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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,23 +23,10 @@ //$Id$ -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Node; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.Group.GroupType; -import org.jbpm.preview.model.builder.EventBuilder; -import org.jbpm.preview.model.builder.GroupBuilder; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.Task.TaskType; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. @@ -69,90 +56,25 @@ /** * Add a SartEvent with a given name */ - EventBuilder addStartEvent(String name); + ProcessBuilder addStartEvent(String name); /** - * Add a SartEvent with a given name and ResultType - */ - EventBuilder addStartEvent(String name, EventDetailType ResultType); - - /** - * Add an IntermediateEvent with a given name - */ - ProcessBuilder addEvent(String name); - - /** * Add an EndEvent with a given name */ - EventBuilder addEndEvent(String name); + ProcessBuilder addEndEvent(String name); /** - * Add an EndEvent with a given name and ResultType - */ - EventBuilder addEndEvent(String name, EventDetailType resultType); - - /** * Add a Task of {@link TaskType} NONE with a given name */ - TaskBuilder addTask(String name); + ProcessBuilder addTask(String name); /** * Add a Task of {@link TaskType} with a given name */ - TaskBuilder addTask(String name, TaskType type); + ProcessBuilder 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 addProcessMessage(String name); - - /** - * Add a {@link Property} to the process - */ - ProcessBuilder addProcessProperty(String name, String value); - - /** - * Add a {@link Property} to the current node - */ - ProcessBuilder addNodeProperty(String name, String value); - - /** - * Add an Assignment to the Process. - */ - ProcessBuilder addProcessAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); - - /** - * Add an Assignment to the current {@link Node}. - */ - ProcessBuilder addNodeAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); - - /** - * Add an {@link ExecutionHandler} with a given Class - */ - <T extends ExecutionHandler> ProcessBuilder addExecutionHandler(Class<T> clazz); - - /** - * Add an {@link FlowHandler} with a given Class - */ - <T extends FlowHandler> ProcessBuilder addFlowHandler(Class<T> clazz); - - /** - * Add an {@link SignalHandler} with a given Class - */ - <T extends SignalHandler> ProcessBuilder addSignalHandler(Class<T> clazz); - - /** - * Add a group reference for the current node - */ - ProcessBuilder addGroupRef(String name); - - /** - * Add a Process group - */ - GroupBuilder addGroup(GroupType type, String name); } \ No newline at end of file Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.api.model.builder; - -//$Id$ - -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Message; - -/** - * The TaskBuilder can be used to build a Task dynamically. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface TaskBuilder extends ProcessBuilder -{ - /** - * Add an outgoing {@link Message} reference. - * - * The {@link Message} must be defined at {@link Process} level - */ - TaskBuilder addOutMessageRef(String msgName); - - /** - * Add an incomming {@link Message} reference. - * - * The {@link Message} must be defined at {@link Process} level - */ - TaskBuilder addInMessageRef(String msgName); - - /** - * Add an InputSet - */ - TaskBuilder addInputSet(); - - /** - * Add an Property Input - */ - TaskBuilder addPropertyInput(String name); - - /** - * Add an OutputSet - */ - TaskBuilder addOutputSet(); - - /** - * Add an Property Output - */ - TaskBuilder addPropertyOutput(String name, String value); - - /** - * Add an IORule Expression - */ - TaskBuilder addIORule(String body, ExpressionLanguage lang); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,7 +28,7 @@ import java.net.URI; import java.net.URL; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; /** * The DialectHandler converts a supported dialect to the ProcessDefinition model. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ExecutionService.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,10 +26,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.Process.ProcessStatus; -import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.StartEvent; /** * The ExecutionService executes processes Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -24,8 +24,8 @@ //$Id$ import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Process; import org.jbpm.api.model.builder.ProcessBuilder; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -38,9 +38,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.preview.client.Deployment; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -106,23 +105,6 @@ } /** - * Deploy a new ProcessDefinition to the ProcessDefinition service. - */ - public ObjectName deploy(Deployment dep) - { - // Get the associated engine - ProcessEngine engine = getProcessEngine(); - - // Get the ProcessDefinition from the deployment - ProcessDefinition procDef = dep.getProcessDefinition(engine); - if (procDef == null) - throw new IllegalStateException("Cannot obtain ProcessDefinition from: " + dep); - - ObjectName procDefID = registerProcessDefinition(procDef); - return procDefID; - } - - /** * Register a ProcessDefinition. */ public ObjectName registerProcessDefinition(ProcessDefinition procDef) Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,10 +32,10 @@ import javax.management.ObjectName; import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Process.ProcessStatus; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -30,7 +30,7 @@ import junit.framework.TestCase; import org.jbpm.api.Constants; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -36,8 +36,8 @@ import org.jbpm.api.BPMException; import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.DialectHandler; import org.jbpm.api.service.DialectHandlerService; import org.jbpm.api.service.ProcessDefinitionService; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -31,7 +31,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.api.model.builder.ObjectNameFactory; /** * An integration test helper that deals with test deployment/undeployment, etc. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,18 +25,18 @@ import junit.framework.TestCase; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Expression; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Task; -import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.EndEvent; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.Task; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * A catalog of CTS test processes @@ -48,13 +48,14 @@ { public static ProcessDefinition getDefaultProcess(ProcessEngine engine) { - ProcessBuilder builder = engine.getService(ProcessBuilderService.class).getProcessBuilder(); + ProcessBuilderService pbService = engine.getService(ProcessBuilderService.class); + ProcessBuilderExt builder = (ProcessBuilderExt)pbService.getProcessBuilder(); builder.addProcess("Proc"); builder.addProcessProperty("proP1", "valP1").addProcessProperty("proP2", "valP2"); builder.addProcessMessage("procMsg").addProperty("msgPropName", "msgPropVal"); builder.addProcessAssignment(AssignTime.Start, Expression.ExpressionLanguage.MVEL, "foo==true", "fooTrue"); - builder.addStartEvent("Start").addSequenceFlow("Task"); - builder.addTask("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); + builder.addStartEventExt("Start").addSequenceFlow("Task"); + builder.addTaskExt("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); builder.addSequenceFlow("End").addEndEvent("End"); return builder.getProcessDefinition(); } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,8 +32,8 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.DialectHandler; import org.jbpm.api.service.DialectHandlerService; import org.jbpm.api.service.ProcessInstanceService; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; +import org.jbpm.api.model.Process; import org.jbpm.api.runtime.Attachments; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,12 +26,12 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.service.MessageBuilderService; import org.jbpm.preview.service.MessageService; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,7 +23,6 @@ import java.io.Serializable; -import org.jbpm.api.model.Expression; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,8 +21,6 @@ */ package org.jbpm.preview.model; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Gateway; // $Id$ Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/EndEvent.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEvent.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +import org.jbpm.preview.model.Event.EventDetailType; + + +//$Id$ + +/** + * 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 +{ + /** + * Get the type od end result + */ + EventDetailType getResultType(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java (from rev 2918, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Event.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.Node; + + +//$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 Node +{ + /** + * Defines the type of an {@link Event} + */ + enum EventType + { + Start, End, Intermediate + }; + + /** + * Defines the type of event detail + */ + enum EventDetailType + { + None, Message, Error, Cancel, Compensation, Link, Multiple, Timer, Rule, Signal, Terminate + } + + /** + * Get the type of this event + */ + EventType getEventType(); + + /** + * Get the detail type fopr this event + */ + EventDetailType getDetailType(); + + /** + * Get the associated signal ref + */ + Signal getSignalRef(); + + /** + * Get the associated message ref + */ + Message getMessageRef(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ExclusiveGateway.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ExclusiveGateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Expression.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model; + +import java.io.Serializable; + +//$Id$ + +/** + * An Expression, which is used in the definition of attributes for StartEvent, + * IntermediateEvent, Activity, ComplexGateway, and SequenceFlow + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Expression extends Serializable +{ + enum ExpressionLanguage + { + MVEL + } + + /** + * 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(); + + /** + * 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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gate.java (from rev 2918, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gate.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gate.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.SequenceFlow; + +/** + * 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 +{ + /** + * 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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gateway.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.Node; +import org.jbpm.api.model.SequenceFlow; + + +/** + * 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 Node +{ + /** + * The GatewayType + * + */ + public 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 + */ + 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<SequenceFlow> getGates(); + + /** + * Get the optional default gate + * @return null if there is none + */ + SequenceFlow getDefaultGate(); + + /** + * Get the gate for the given target name + * @return null if there is none + */ + SequenceFlow getGateByName(String targetName); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,7 +21,6 @@ */ package org.jbpm.preview.model; -import org.jbpm.api.model.Gateway; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,7 +21,6 @@ */ package org.jbpm.preview.model; -import org.jbpm.api.model.Gateway; // $Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,7 +21,6 @@ */ package org.jbpm.preview.model; -import org.jbpm.api.model.Task; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,7 +21,6 @@ */ package org.jbpm.preview.model; -import org.jbpm.api.model.Task; //$Id$ Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEvent.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.SequenceFlow; + + +// $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. + * + * There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. + * That is, a Process Instance SHALL be generated when the Start Event is triggered. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface StartEvent extends Event +{ + /** + * Get the outgoing SequenceFlow + */ + SequenceFlow getOutFlow(); + + /** + * Get the start trigger type + */ + EventDetailType getTriggerType(); +} \ No newline at end of file Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java (from rev 2918, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Task.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -0,0 +1,97 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.Node; +import org.jbpm.api.model.SequenceFlow; + + +/** + * 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 Node +{ + /** + * The TaskType + */ + public enum TaskType + { + Service, Receive, Send, User, Script, Manual, Reference, None, Wait + } + + /** + * 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. + */ + TaskType getTaskType(); + + /** + * Get the incomming SequenceFlow + */ + SequenceFlow getInFlow(); + + /** + * Get the outgoing SequenceFlow + */ + SequenceFlow getOutFlow(); + + /** + * 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(); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,7 +21,6 @@ */ package org.jbpm.preview.model; -import org.jbpm.api.model.Task; import org.jbpm.preview.client.UserTaskCallback; //$Id$ Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java (from rev 2917, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/WaitState.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/WaitState.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model; + + +//$Id$ + + + +/** + * A WaitState is a Task that returns control to Thread that signalled the Execution + * + * @author thomas.diesler(a)jboss.com + * @since 12-Nov-2008 + */ +public interface WaitState extends Task +{ +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,7 +23,6 @@ //$Id$ -import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.preview.model.Signal.SignalType; /** @@ -32,7 +31,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface EventBuilder extends ProcessBuilder +public interface EventBuilder extends ProcessBuilderExt { /** * Add a signal ref to the last added EventDetail Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model.builder; - -// $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: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -0,0 +1,139 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model.builder; + +//$Id$ + +import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.builder.GatewayBuilder; +import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.model.Task.TaskType; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; + +/** + * The ProcessBuilder can be used to build a {@link Process} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessBuilderExt extends ProcessBuilder +{ + /** + * Add a SartEvent with a given name + */ + EventBuilder addStartEventExt(String name); + + /** + * Add a SartEvent with a given name and ResultType + */ + EventBuilder addStartEventExt(String name, EventDetailType ResultType); + + /** + * Add an IntermediateEvent with a given name + */ + ProcessBuilderExt addEventExt(String name); + + /** + * Add an EndEvent with a given name + */ + EventBuilder addEndEventExt(String name); + + /** + * Add an EndEvent with a given name and ResultType + */ + EventBuilder addEndEventExt(String name, EventDetailType resultType); + + /** + * Add a Task of {@link TaskType} NONE with a given name + */ + TaskBuilder addTaskExt(String name); + + /** + * Add a Task of {@link TaskType} with a given name + */ + TaskBuilder addTaskExt(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 addProcessMessage(String name); + + /** + * Add a {@link Property} to the process + */ + ProcessBuilderExt addProcessProperty(String name, String value); + + /** + * Add a {@link Property} to the current node + */ + ProcessBuilderExt addNodeProperty(String name, String value); + + /** + * Add an Assignment to the Process. + */ + ProcessBuilderExt addProcessAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); + + /** + * Add an Assignment to the current {@link Node}. + */ + ProcessBuilderExt addNodeAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp); + + /** + * Add an {@link ExecutionHandler} with a given Class + */ + <T extends ExecutionHandler> ProcessBuilderExt addExecutionHandler(Class<T> clazz); + + /** + * Add an {@link FlowHandler} with a given Class + */ + <T extends FlowHandler> ProcessBuilderExt addFlowHandler(Class<T> clazz); + + /** + * Add an {@link SignalHandler} with a given Class + */ + <T extends SignalHandler> ProcessBuilderExt addSignalHandler(Class<T> clazz); + + /** + * Add a group reference for the current node + */ + ProcessBuilderExt addGroupRef(String name); + + /** + * Add a Process group + */ + GroupBuilder addGroup(GroupType type, String name); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java (from rev 2918, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -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.jbpm.preview.model.builder; + +//$Id$ + +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Expression.ExpressionLanguage; + +/** + * The TaskBuilder can be used to build a Task dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface TaskBuilder extends ProcessBuilderExt +{ + /** + * Add an outgoing {@link Message} reference. + * + * The {@link Message} must be defined at {@link Process} level + */ + TaskBuilder addOutMessageRef(String msgName); + + /** + * Add an incomming {@link Message} reference. + * + * The {@link Message} must be defined at {@link Process} level + */ + TaskBuilder addInMessageRef(String msgName); + + /** + * Add an InputSet + */ + TaskBuilder addInputSet(); + + /** + * Add an Property Input + */ + TaskBuilder addPropertyInput(String name); + + /** + * Add an OutputSet + */ + TaskBuilder addOutputSet(); + + /** + * Add an Property Output + */ + TaskBuilder addPropertyOutput(String name, String value); + + /** + * Add an IORule Expression + */ + TaskBuilder addIORule(String body, ExpressionLanguage lang); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,16 +32,16 @@ import javax.management.ObjectName; import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Event; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Task; +import org.jbpm.api.model.Process; import org.jbpm.api.service.AbstractService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.model.Event; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Participant; +import org.jbpm.preview.model.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,10 +27,10 @@ import org.hibernate.Session; import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.AbstractService; /** Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,18 +25,18 @@ import java.io.IOException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; /** * Exclusive data-based gateway that has conditional outgoing sequence flows. Only one of the gates is taken. It is an Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -24,7 +24,7 @@ // $Id$ import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,9 +27,9 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.api.test.CTSTestCase; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,15 +25,15 @@ import java.io.IOException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Task.TaskType; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.model.Task.TaskType; /** * Test the basic wait state sequence @@ -77,12 +77,12 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder(); - builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("TaskA"); - builder.addTask("TaskA", TaskType.Wait).addSequenceFlow("TaskB"); - builder.addTask("TaskB", TaskType.Wait).addSequenceFlow("TaskC"); - builder.addTask("TaskC", TaskType.Wait).addSequenceFlow("End"); - builder.addEndEvent("End"); - return builder.getProcessDefinition(); + ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("TaskA"); + procBuilder.addTask("TaskA", TaskType.Wait).addSequenceFlow("TaskB"); + procBuilder.addTask("TaskB", TaskType.Wait).addSequenceFlow("TaskC"); + procBuilder.addTask("TaskC", TaskType.Wait).addSequenceFlow("End"); + procBuilder.addEndEvent("End"); + return procBuilder.getProcessDefinition(); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,16 +26,16 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Gateway; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Exclusive data-based gateway that has conditional outgoing sequence flows. @@ -97,12 +97,12 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive); gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); - procBuilder.addEndEvent("EndA").addEndEvent("EndB"); + procBuilder.addEndEventExt("EndA").addEndEventExt("EndB"); return procBuilder.getProcessDefinition(); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,16 +26,16 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.Expression.ExpressionLanguage; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Gateway; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Inclusive gateway that has conditional outgoing sequence flows. @@ -77,12 +77,12 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split"); GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive); gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20"); - procBuilder.addEndEvent("EndA").addEndEvent("EndB"); + procBuilder.addEndEventExt("EndA").addEndEventExt("EndB"); return procBuilder.getProcessDefinition(); } } \ No newline at end of file Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,14 +28,14 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Gateway; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Parallel gateway that has uncontrolled outgoing sequence flows. @@ -66,7 +66,7 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel). addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB"); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,7 +27,7 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.preview.service.PersistenceService; /** Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Test the basic execution sequence @@ -66,9 +66,9 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt builder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task"); - builder.addTask("Task").addSequenceFlow("End").addEndEvent("End"); + builder.addTaskExt("Task").addSequenceFlow("End").addEndEvent("End"); return builder.getProcessDefinition(); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows @@ -60,11 +60,11 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split"); procBuilder.addGateway("Split", GatewayType.Inclusive).addSequenceFlow("TaskA").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskA").addSequenceFlow("Merge"); - procBuilder.addTask("TaskB").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskA").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskB").addSequenceFlow("Merge"); procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,17 +25,17 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow @@ -66,13 +66,13 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split"); procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("TaskA").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskA").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA").addSequenceFlow("Merge"); - procBuilder.addTask("TaskB").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskA").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskB").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB").addSequenceFlow("Merge"); procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,16 +25,16 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Data elements are supported which are specific to a process instance or case. They can be accessed by all components @@ -62,12 +62,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("CaseData"); procBuilder.addProcessAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "propValue"); procBuilder.addProcessProperty("foo", "bar").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA").addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addTaskExt("TaskA").addSequenceFlow("End"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,17 +25,17 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; /** * Data elements can be defined by tasks which are accessible only within the context of individual execution instances @@ -63,12 +63,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("TaskData").addStartEvent("Start").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA"); taskBuilder.addNodeProperty("foo", "bar").addSequenceFlow("End"); taskBuilder.addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskData_TaskA_foo", "foo"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,15 +25,15 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Test end event with message result @@ -63,10 +63,11 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("EndEventMessage").addStartEvent("Start"); - procBuilder.addSequenceFlow("TaskA").addTask("TaskA").addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addSequenceFlow("TaskA"); + procBuilder.addTaskExt("TaskA").addSequenceFlow("End"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("kermit", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Exclusive data-based gateway that has multiple incoming sequence flows. The first token arriving from one of the @@ -62,11 +62,11 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ExclusiveGatewayMerge").addStartEvent("Start").addSequenceFlow("Split"); procBuilder.addGateway("Split", GatewayType.Inclusive).addSequenceFlow("TaskA").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskA").addSequenceFlow("Merge"); - procBuilder.addTask("TaskB").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskA").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskB").addSequenceFlow("Merge"); procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows @@ -60,11 +60,11 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split"); procBuilder.addGateway("Split", GatewayType.Inclusive).addSequenceFlow("TaskA").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskA").addSequenceFlow("Merge"); - procBuilder.addTask("TaskB").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskA").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskB").addSequenceFlow("Merge"); procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,16 +26,16 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Inclusive gateway that has conditional outgoing sequence flows. @@ -77,12 +77,12 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); 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"); - procBuilder.addEndEvent("EndA").addEndEvent("EndB"); + procBuilder.addEndEventExt("EndA").addEndEventExt("EndB"); return procBuilder.getProcessDefinition(); } } \ No newline at end of file Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,17 +25,17 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow @@ -66,13 +66,13 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split"); procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("TaskA").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskA").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA").addSequenceFlow("Merge"); - procBuilder.addTask("TaskB").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskA").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA").addSequenceFlow("Merge"); + procBuilder.addTaskExt("TaskB").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB").addSequenceFlow("Merge"); procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,14 +28,14 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Parallel gateway that has uncontrolled outgoing sequence flows. All of them are taken, which leads to parallel paths @@ -66,9 +66,9 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ParallelGatewaySplit").addStartEvent("Start").addSequenceFlow("Split"); procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("EndA").addSequenceFlow("EndB"); - return procBuilder.addEndEvent("EndA").addEndEvent("EndB").getProcessDefinition(); + return procBuilder.addEndEventExt("EndA").addEndEventExt("EndB").getProcessDefinition(); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,16 +25,16 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; /** * InputSets define the data requirements for input to the activity. Zero or more InputSets MAY be defined. Each @@ -84,11 +84,11 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ActivityInputSet").addStartEvent("Start").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA"); taskBuilder.addInputSet().addPropertyInput("frog").addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("frog", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,15 +25,15 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; /** * OutputSets define the data requirements for output from the activity. Zero or more OutputSets MAY be defined. At the @@ -63,11 +63,11 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ActivityInputSet").addStartEvent("Start").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA"); taskBuilder.addOutputSet().addPropertyOutput("frog", "kermit").addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("frog", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,17 +25,17 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; /** * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These @@ -64,12 +64,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA"); taskBuilder.addNodeProperty("foo", "bar").addSequenceFlow("End"); taskBuilder.addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "propValue"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,16 +25,16 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks, @@ -69,12 +69,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA"); procBuilder.addProcessAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "propValue"); procBuilder.addProcessProperty("foo", "bar"); - procBuilder.addTask("TaskA").addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addTaskExt("TaskA").addSequenceFlow("End"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,11 +28,7 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; @@ -42,9 +38,13 @@ import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.preview.service.SignalService; /** @@ -94,13 +94,15 @@ public ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); - EventBuilder eventBuilder = procBuilder.addProcess("StartEventSignal").addStartEvent("StartA", EventDetailType.Signal); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); + procBuilder.addProcess("StartEventSignal"); + EventBuilder eventBuilder = procBuilder.addStartEventExt("StartA", EventDetailType.Signal); eventBuilder.addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); - TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA"); + procBuilder.addSequenceFlow("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA"); taskBuilder.addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue"); taskBuilder.addSequenceFlow("End"); - procBuilder.addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true); return procBuilder.getProcessDefinition(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,16 +25,16 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.preview.runtime.BasicNodeHandler; import org.jbpm.preview.runtime.ExecutionHandler; @@ -62,11 +62,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); - procBuilder.addProcess("TaskExecutionHandlerTest").addProcessProperty("procProp", "kermit"); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); + procBuilder.addProcess("TaskExecutionHandlerTest"); + procBuilder.addProcessProperty("procProp", "kermit"); procBuilder.addProcessAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_procProp == 'kermit'", "procAssign"); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA"); taskBuilder.addNodeProperty("taskProp", "piggy").addExecutionHandler(TaskExecutionHandler.class).addSequenceFlow("End"); taskBuilder.addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskExecutionHandlerTest_TaskA_taskProp == 'piggy'", "taskAssign"); procBuilder.addEndEvent("End"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,10 +28,7 @@ import javax.management.ObjectName; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; @@ -40,9 +37,12 @@ import org.jbpm.preview.client.SignalListener; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.service.MessageBuilderService; import org.jbpm.preview.service.MessageService; import org.jbpm.preview.service.SignalService; @@ -57,9 +57,9 @@ { public void testReceiveTaskWithNoMessage() throws Exception { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Receive).addSequenceFlow("End").addEndEvent("End"); + procBuilder.addTaskExt("TaskA", TaskType.Receive).addSequenceFlow("End").addEndEvent("End"); try { procBuilder.getProcessDefinition(); @@ -167,13 +167,14 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("ReceiveTaskTest"); procBuilder.addProcessMessage("ReceiveTaskMessage").addProperty("foo", null, true); procBuilder.addProcessMessage("EndEventMessage").addToRef(getTestID()).addProperty("foo", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Receive).addInMessageRef("ReceiveTaskMessage"); - EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End", EventDetailType.Message); + procBuilder.addTaskExt("TaskA", TaskType.Receive).addInMessageRef("ReceiveTaskMessage"); + procBuilder.addSequenceFlow("End"); + EventBuilder eventBuilder = procBuilder.addEndEventExt("End", EventDetailType.Message); eventBuilder.addMessageRef("EndEventMessage"); return procBuilder.getProcessDefinition(); } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,15 +27,15 @@ import java.util.List; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Test Send Task @@ -62,9 +62,9 @@ public void testSendTaskWithNoMessage() throws Exception { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("SendTaskTest").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Send).addSequenceFlow("End").addEndEvent("End"); + procBuilder.addTaskExt("TaskA", TaskType.Send).addSequenceFlow("End").addEndEvent("End"); try { procBuilder.getProcessDefinition(); @@ -78,11 +78,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); - MessageBuilder msgBuilder = procBuilder.addProcess("SendTaskTest").addProcessMessage("SendTaskMessage"); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); + procBuilder.addProcess("SendTaskTest"); + MessageBuilder msgBuilder = procBuilder.addProcessMessage("SendTaskMessage"); msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Send).addOutMessageRef("SendTaskMessage"); + procBuilder.addTaskExt("TaskA", TaskType.Send).addOutMessageRef("SendTaskMessage"); procBuilder.addSequenceFlow("End").addEndEvent("End"); return procBuilder.getProcessDefinition(); } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,10 +26,7 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; @@ -38,6 +35,9 @@ import org.jbpm.preview.client.UserTaskCallback; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Task.TaskType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Test UserTask that uses the callback API @@ -68,14 +68,15 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("UserTaskTest"); procBuilder.addProcessMessage("OutMessage").addProperty("foo", null, true); procBuilder.addProcessMessage("InMessage").addProperty("bar", null, true); procBuilder.addProcessMessage("EndMessage").addToRef(getTestID()).addProperty("bar", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("UserTask"); - procBuilder.addTask("UserTask", TaskType.User).addOutMessageRef("OutMessage").addInMessageRef("InMessage"); - procBuilder.addSequenceFlow("End").addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addTaskExt("UserTask", TaskType.User).addOutMessageRef("OutMessage").addInMessageRef("InMessage"); + procBuilder.addSequenceFlow("End"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); return procBuilder.getProcessDefinition(); } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,10 +29,8 @@ import javax.management.ObjectName; import org.jbpm.api.Constants; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessInstanceService; @@ -40,8 +38,10 @@ import org.jbpm.preview.client.MessageListener; import org.jbpm.preview.client.ProcessAsync; import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.service.MessageBuilderService; import org.jbpm.preview.service.MessageService; @@ -87,14 +87,15 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("UserTaskTest"); procBuilder.addProcessMessage("OutMessage").addToRef(MSG_LISTENER_ID).addProperty("foo", null, true); procBuilder.addProcessMessage("InMessage").addProperty("bar", null, true); procBuilder.addProcessMessage("EndMessage").addToRef(getTestID()).addProperty("bar", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("UserTask"); - procBuilder.addTask("UserTask", TaskType.User).addOutMessageRef("OutMessage").addInMessageRef("InMessage"); - procBuilder.addSequenceFlow("End").addEndEvent("End", EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addTaskExt("UserTask", TaskType.User).addOutMessageRef("OutMessage").addInMessageRef("InMessage"); + procBuilder.addSequenceFlow("End"); + procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage"); return procBuilder.getProcessDefinition(); } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredMarshallerTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredMarshallerTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,7 +25,7 @@ import java.io.IOException; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; /** Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,11 +29,9 @@ import org.hibernate.Transaction; import org.jbpm.api.Constants; import org.jbpm.api.Constants.TxType; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; @@ -41,6 +39,8 @@ import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.model.Task.TaskType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.ri.runtime.TransactionAssociation; @@ -92,11 +92,12 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess("RequiresTxTest"); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", TaskType.Send).addOutMessageRef("TaskAMessage").addGroupRef("TxRequired").addSequenceFlow("TaskB"); - procBuilder.addTask("TaskB").addGroupRef("TxRequired").addSequenceFlow("End").addExecutionHandler(TextExecutionHandler.class); + procBuilder.addTaskExt("TaskA", TaskType.Send).addOutMessageRef("TaskAMessage").addGroupRef("TxRequired").addSequenceFlow("TaskB"); + procBuilder.addTaskExt("TaskB").addGroupRef("TxRequired").addSequenceFlow("End"); + procBuilder.addExecutionHandler(TextExecutionHandler.class); procBuilder.addEndEvent("End"); procBuilder.addGroup(GroupType.Transaction, "TxRequired").addProperty(Constants.PROP_TX_TYPE, TxType.REQUIRED); procBuilder.addProcessMessage("TaskAMessage").addToRef(getTestID()).addProperty("msgProp", "msgA"); Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -33,7 +33,7 @@ import javax.xml.bind.JAXBException; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.DialectHandler; /** Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -31,17 +31,9 @@ import javax.xml.bind.Marshaller; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Event; -import org.jbpm.api.model.ExclusiveGateway; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Node; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Task; -import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.dialect.api10.model.JAXBAssignment; import org.jbpm.dialect.api10.model.JAXBComplexGateway; @@ -73,6 +65,11 @@ import org.jbpm.dialect.api10.model.ObjectFactory; import org.jbpm.preview.model.Assignment; import org.jbpm.preview.model.ComplexGateway; +import org.jbpm.preview.model.EndEvent; +import org.jbpm.preview.model.Event; +import org.jbpm.preview.model.ExclusiveGateway; +import org.jbpm.preview.model.Expression; +import org.jbpm.preview.model.Gateway; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.InclusiveGateway; import org.jbpm.preview.model.InputSet; @@ -84,6 +81,9 @@ import org.jbpm.preview.model.ReceiveTask; import org.jbpm.preview.model.SendTask; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.Task; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.SignalHandler; Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,13 +32,10 @@ import javax.xml.bind.Unmarshaller; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.SequenceFlow.ConditionType; -import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.api10.model.JAXBAssignment; import org.jbpm.dialect.api10.model.JAXBCancelEventDetail; @@ -75,10 +72,13 @@ import org.jbpm.dialect.api10.model.JAXBTerminateEventDetail; import org.jbpm.dialect.api10.model.JAXBTimerEventDetail; import org.jbpm.dialect.api10.model.ObjectFactory; +import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.GroupBuilder; import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.NodeHandler; @@ -104,7 +104,7 @@ private ProcessDefinition adaptProcess(JAXBProcess jaxbProc) throws IOException { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(jaxbProc.getName()); // Process Messages @@ -196,12 +196,12 @@ return ObjectNameFactory.create(objName); } - private void adaptJAXBEvent(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxbEvent) + private void adaptJAXBEvent(ProcessBuilderExt procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxbEvent) { if (jaxbEvent instanceof JAXBStartEvent) { JAXBStartEvent jaxbStart = (JAXBStartEvent)jaxbEvent; - EventBuilder eventBuilder = procBuilder.addStartEvent(jaxbStart.getName()); + EventBuilder eventBuilder = procBuilder.addStartEventExt(jaxbStart.getName()); addOutFlow(procBuilder, jaxbStart.getOutFlow()); if (jaxbStart.getTrigger().size() > 1) @@ -240,7 +240,7 @@ else if (jaxbEvent instanceof JAXBEndEvent) { JAXBEndEvent jaxbEnd = (JAXBEndEvent)jaxbEvent; - EventBuilder eventBuilder = procBuilder.addEndEvent(jaxbEnd.getName()); + EventBuilder eventBuilder = procBuilder.addEndEventExt(jaxbEnd.getName()); if (jaxbEnd.getResult().size() > 1) throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result"); @@ -288,10 +288,10 @@ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxbEvent.getSignalHandler())); } - private void adaptTask(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBTask jaxbTask) + private void adaptTask(ProcessBuilderExt procBuilder, JAXBProcess jaxbProc, JAXBTask jaxbTask) { TaskType taskType = jaxbTask.getTaskType(); - TaskBuilder taskBuilder = procBuilder.addTask(jaxbTask.getName(), taskType); + TaskBuilder taskBuilder = procBuilder.addTaskExt(jaxbTask.getName(), taskType); addOutFlow(taskBuilder, jaxbTask.getOutFlow()); for (JAXBInputSet jaxbSet : jaxbTask.getInputSets()) @@ -328,7 +328,7 @@ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxbTask.getSignalHandler())); } - private void adaptJAXBGateway(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBGateway jaxb) + private void adaptJAXBGateway(ProcessBuilderExt procBuilder, JAXBProcess jaxbProc, JAXBGateway jaxb) { GatewayBuilder gwBuilder; if (jaxb instanceof JAXBExclusiveGateway) @@ -384,7 +384,7 @@ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxb.getSignalHandler())); } - private void addOutFlow(ProcessBuilder procBuilder, JAXBFlow jaxbFlow) + private void addOutFlow(ProcessBuilderExt procBuilder, JAXBFlow jaxbFlow) { if (jaxbFlow != null) { Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.jbpm.api.model.Expression; +import org.jbpm.preview.model.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import org.jbpm.api.model.Task; +import org.jbpm.preview.model.Task; /** * A Task is an Atomic Activity that is included within a Process. Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -34,7 +34,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.DialectHandler; import org.jbpm.dialect.jpdl32.model.JPDL32ProcessDefinition; Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,10 +26,7 @@ import java.util.List; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.Task; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.jpdl32.model.JPDL32Action; import org.jbpm.dialect.jpdl32.model.JPDL32EndState; @@ -39,6 +36,9 @@ import org.jbpm.dialect.jpdl32.model.JPDL32StartState; import org.jbpm.dialect.jpdl32.model.JPDL32State; import org.jbpm.dialect.jpdl32.model.JPDL32Transition; +import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.model.Task; +import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.preview.runtime.ExecutionHandler; /** @@ -51,7 +51,7 @@ { public ProcessDefinition adaptProcessDefinition(JPDL32ProcessDefinition jpdlProcDef) { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(jpdlProcDef.getName()); for (Object jpdlObj : jpdlProcDef.getDescriptionOrSwimlaneOrStartState()) @@ -82,20 +82,20 @@ return procDef; } - private void adaptStartState(ProcessBuilder builder, JPDL32StartState jpdlStart) + private void adaptStartState(ProcessBuilderExt builder, JPDL32StartState jpdlStart) { - builder.addStartEvent("Start"); + builder.addStartEventExt("Start"); adaptTransitions(builder, jpdlStart.getDescriptionOrTaskOrTransition()); } - private void adaptEndState(ProcessBuilder builder, JPDL32EndState jpdlEnd) + private void adaptEndState(ProcessBuilderExt builder, JPDL32EndState jpdlEnd) { - builder.addEndEvent(jpdlEnd.getName()); + builder.addEndEventExt(jpdlEnd.getName()); } - private void adaptState(ProcessBuilder builder, JPDL32State jpdlState) + private void adaptState(ProcessBuilderExt builder, JPDL32State jpdlState) { - builder.addTask(jpdlState.getName(), Task.TaskType.None); + builder.addTaskExt(jpdlState.getName(), Task.TaskType.None); adaptTransitions(builder, jpdlState.getDescriptionOrEventOrExceptionHandler()); for (Object jpdlObj : jpdlState.getDescriptionOrEventOrExceptionHandler()) @@ -122,13 +122,13 @@ } } - private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj) + private void adaptFork(ProcessBuilderExt builder, JPDL32Fork jpdlObj) { builder.addGateway(jpdlObj.getName(), Gateway.GatewayType.Parallel); adaptTransitions(builder, jpdlObj.getScriptOrDescriptionOrEvent()); } - private void adaptTransitions(ProcessBuilder builder, List<Object> list) + private void adaptTransitions(ProcessBuilderExt builder, List<Object> list) { for (Object subEl : list) { Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -33,7 +33,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.DialectHandler; /** Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -37,10 +37,7 @@ import org.jboss.util.xml.DOMUtils; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.Task; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.stp.model.Activity; import org.jbpm.dialect.stp.model.ActivityType; @@ -48,6 +45,9 @@ import org.jbpm.dialect.stp.model.ObjectFactory; import org.jbpm.dialect.stp.model.Pool; import org.jbpm.dialect.stp.model.SequenceEdge; +import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.model.Task; +import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -90,7 +90,7 @@ Element root = doc.getDocumentElement(); diagram = unmarshaller.unmarshal(root, BpmnDiagram.class).getValue(); - ProcessBuilder procBuilder = adaptDiagram(diagram); + ProcessBuilderExt procBuilder = adaptDiagram(diagram); // Initialize the list of sequence edges Element poolEl = (Element)DOMUtils.getChildElements(root, "pools").next(); @@ -137,7 +137,7 @@ return procDef; } - private ProcessBuilder adaptDiagram(BpmnDiagram bpmnDiagram) + private ProcessBuilderExt adaptDiagram(BpmnDiagram bpmnDiagram) { List<Pool> stpPools = bpmnDiagram.getPools(); if (stpPools == null || stpPools.size() == 0) @@ -146,24 +146,24 @@ throw new IllegalStateException("Multiple Pools not supported"); Pool stpPool = stpPools.get(0); - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(stpPool.getId()); return procBuilder; } - private void adaptActivity(ProcessBuilder builder, Activity stpActivity) + private void adaptActivity(ProcessBuilderExt builder, Activity stpActivity) { ActivityType activityType = stpActivity.getActivityType(); if (activityType == ActivityType.EVENT_START_EMPTY) { - builder.addStartEvent("Start"); + builder.addStartEventExt("Start"); adaptOutgoingEdges(builder, stpActivity); } else if (activityType == ActivityType.EVENT_END_EMPTY) { String name = stpActivity.getLabel(); - builder.addEndEvent(name); + builder.addEndEventExt(name); } else if (activityType == ActivityType.TASK) { @@ -175,7 +175,7 @@ if (name.startsWith("Receive")) taskType = Task.TaskType.Receive; - builder.addTask(name, taskType); + builder.addTaskExt(name, taskType); adaptOutgoingEdges(builder, stpActivity); } else if (activityType == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE) @@ -196,7 +196,7 @@ } } - private void adaptOutgoingEdges(ProcessBuilder builder, Activity stpActivity) + private void adaptOutgoingEdges(ProcessBuilderExt builder, Activity stpActivity) { for (String edgeIds : stpActivity.getOutgoingEdges()) { Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -34,7 +34,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.DialectHandler; import org.jbpm.dialect.xpdl21.model.XPDLWorkflowProcess; Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java =================================================================== --- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -24,13 +24,13 @@ // $Id$ import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.xpdl21.model.XPDLActivities; import org.jbpm.dialect.xpdl21.model.XPDLActivity; import org.jbpm.dialect.xpdl21.model.XPDLEvent; import org.jbpm.dialect.xpdl21.model.XPDLWorkflowProcess; +import org.jbpm.preview.model.builder.ProcessBuilderExt; /** * Adapt the jpdl-3.2 ProcessDefinition to the API Process @@ -42,7 +42,7 @@ { public ProcessDefinition adaptWorkflowProcess(XPDLWorkflowProcess xpdlProc) { - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(xpdlProc.getName()); XPDLActivities xpdlActivities = xpdlProc.getActivities(); @@ -53,11 +53,11 @@ { if (xpdlEvent.getStartEvent() != null) { - procBuilder.addStartEvent("Start"); + procBuilder.addStartEventExt("Start"); } else if (xpdlEvent.getEndEvent() != null) { - procBuilder.addEndEvent(xpdlActivity.getName()); + procBuilder.addEndEventExt(xpdlActivity.getName()); } else { Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,10 +29,10 @@ import javax.persistence.MappedSuperclass; import org.hibernate.Session; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.AbstractElement; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; /** * The parrent of all Elements Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -31,8 +31,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.api.model.Expression; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.Property; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,9 +26,9 @@ import javax.persistence.Entity; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.ProcessStructure; import org.jbpm.preview.model.ComplexGateway; +import org.jbpm.preview.model.Expression; /** * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -30,13 +30,13 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.EndEvent; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.preview.runtime.TokenExecutor; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,16 +32,16 @@ import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Event; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; +import org.jbpm.api.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.Event; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.preview.service.SignalService; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -30,12 +30,12 @@ import javax.persistence.Transient; import org.jbpm.api.client.Token; -import org.jbpm.api.model.ExclusiveGateway; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.SequenceFlow.ConditionType; +import org.jbpm.preview.model.ExclusiveGateway; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExpressionImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,7 +28,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.api.model.Expression; +import org.jbpm.preview.model.Expression; /** * An Expression, which is used in the definition of attributes for @{link StartEvent}, Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -35,9 +35,9 @@ import javax.persistence.OneToOne; import org.hibernate.annotations.IndexColumn; -import org.jbpm.api.model.Gate; import org.jbpm.api.model.SequenceFlow; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Gate; /** * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -36,13 +36,13 @@ import org.jbpm.api.Constants; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.SequenceFlow.ConditionType; +import org.jbpm.api.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.Gateway; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.preview.service.SignalService; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -31,15 +31,15 @@ import javax.persistence.Entity; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.Attachments.Key; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.InclusiveGateway; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.MutableToken; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -43,20 +43,20 @@ import org.hibernate.annotations.IndexColumn; import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NameNotUniqueException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.EndEvent; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.PropertySupport; +import org.jbpm.preview.model.StartEvent; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.NodeHandler; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,8 +29,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.preview.model.Participant; -import org.jbpm.preview.model.builder.ObjectNameFactory; /** * A Participant, which is used in the definition of attributes for a @{link Pool}, @{link Message}, and @{link Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -41,16 +41,16 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.jbpm.api.Constants; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.preview.model.Assignment; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -39,14 +39,13 @@ import org.hibernate.Session; import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ExecutionService; import org.jbpm.api.service.ProcessInstanceService; @@ -55,7 +54,8 @@ import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.ri.runtime.TokenImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -41,19 +41,19 @@ import org.hibernate.annotations.IndexColumn; import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.EndEvent; import org.jbpm.preview.model.Group; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.PropertySupport; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.StartEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -31,9 +31,9 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; import org.jbpm.preview.client.MessageListener; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,10 +27,10 @@ import javax.persistence.Transient; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.SendTask; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SequenceFlowImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,8 +32,8 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.preview.model.Expression; /** * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -31,8 +31,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ObjectNameFactory; /** * A Signal thrown by the ProcessEngine Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,19 +29,19 @@ import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.service.ExecutionService; import org.jbpm.preview.client.SignalListener; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.StartEvent; import org.jbpm.preview.model.Signal.SignalType; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.builder.SingleOutFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -41,17 +41,17 @@ import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Task; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.InputSet; import org.jbpm.preview.model.OutputSet; import org.jbpm.preview.model.Property; import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.model.Task; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.preview.service.SignalService; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -33,9 +33,9 @@ import javax.persistence.Transient; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; import org.jbpm.preview.client.MessageListener; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,7 +28,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.WaitState; +import org.jbpm.preview.model.WaitState; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.model.builder.SingleInFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.model.Event; +import org.jbpm.preview.model.Event; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.ri.model.EventImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GatewayBuilderImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,10 +23,10 @@ //$Id$ -import org.jbpm.api.model.Gateway; -import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.api.model.builder.GatewayBuilder; +import org.jbpm.preview.model.Gateway; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.GatewayImpl; import org.jbpm.ri.model.SequenceFlowImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -24,21 +24,21 @@ //$Id$ import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.Task.TaskType; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Event.EventDetailType; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.preview.model.builder.GroupBuilder; import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.SignalHandler; @@ -69,7 +69,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public class ProcessBuilderImpl implements ProcessBuilder +public class ProcessBuilderImpl implements ProcessBuilderExt { protected ProcessEngine engine; protected ProcessStructureImpl procStruct; @@ -87,7 +87,7 @@ this.node = procBuilder.node; } - public ProcessBuilder addProcess(String procName) + public ProcessBuilderExt addProcess(String procName) { procStruct = new ProcessStructureImpl(engine, procName); return this; @@ -99,7 +99,7 @@ return new ProcessDefinitionImpl(engine, procStruct); } - public ProcessBuilder addSequenceFlow(String targetName) + public ProcessBuilderExt addSequenceFlow(String targetName) { if (node instanceof SingleOutFlowSupport) { @@ -118,13 +118,18 @@ return this; } - public EventBuilder addStartEvent(String name) + public ProcessBuilderExt addStartEvent(String name) { + return addStartEventExt(name); + } + + public EventBuilder addStartEventExt(String name) + { addNode(node = new StartEventImpl(procStruct, name)); return new EventBuilderImpl(this); } - public EventBuilder addStartEvent(String name, EventDetailType ResultType) + public EventBuilder addStartEventExt(String name, EventDetailType ResultType) { StartEventImpl startImpl = new StartEventImpl(procStruct, name); startImpl.setTriggerType(ResultType); @@ -132,19 +137,24 @@ return new EventBuilderImpl(this); } - public EventBuilder addEvent(String name) + public EventBuilder addEventExt(String name) { addNode(node = new EventImpl(procStruct, name)); return new EventBuilderImpl(this); } - public EventBuilder addEndEvent(String name) + public ProcessBuilderExt addEndEvent(String name) { + return addEndEventExt(name); + } + + public EventBuilder addEndEventExt(String name) + { addNode(node = new EndEventImpl(procStruct, name)); return new EventBuilderImpl(this); } - public EventBuilder addEndEvent(String name, EventDetailType resultType) + public EventBuilder addEndEventExt(String name, EventDetailType resultType) { EndEventImpl endImpl = new EndEventImpl(procStruct, name); endImpl.setResultType(resultType); @@ -152,13 +162,23 @@ return new EventBuilderImpl(this); } - public TaskBuilder addTask(String name) + public ProcessBuilderExt addTask(String name) { - addTask(name, TaskType.None); + return addTaskExt(name); + } + + public ProcessBuilderExt addTask(String name, TaskType type) + { + return addTaskExt(name, type); + } + + public TaskBuilder addTaskExt(String name) + { + addTaskExt(name, TaskType.None); return new TaskBuilderImpl(this); } - public TaskBuilder addTask(String name, TaskType type) + public TaskBuilder addTaskExt(String name, TaskType type) { if (type == TaskType.None || type == null) { @@ -226,14 +246,14 @@ return new GatewayBuilderImpl(this); } - public ProcessBuilder addProcessAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp) + public ProcessBuilderExt addProcessAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp) { AssignmentImpl assignment = getAssignment(time, lang, fromExpr, toProp); getProcessStructure().addAssignment(assignment); return this; } - public ProcessBuilder addNodeAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp) + public ProcessBuilderExt addNodeAssignment(AssignTime time, ExpressionLanguage lang, String fromExpr, String toProp) { AssignmentImpl assignment = getAssignment(time, lang, fromExpr, toProp); getNodeInternal().addAssignment(assignment); @@ -248,19 +268,19 @@ return assignment; } - public <T extends ExecutionHandler> ProcessBuilder addExecutionHandler(Class<T> clazz) + public <T extends ExecutionHandler> ProcessBuilderExt addExecutionHandler(Class<T> clazz) { getNodeInternal().setExecutionHandler(clazz); return this; } - public <T extends FlowHandler> ProcessBuilder addFlowHandler(Class<T> clazz) + public <T extends FlowHandler> ProcessBuilderExt addFlowHandler(Class<T> clazz) { getNodeInternal().setFlowHandler(clazz); return this; } - public <T extends SignalHandler> ProcessBuilder addSignalHandler(Class<T> clazz) + public <T extends SignalHandler> ProcessBuilderExt addSignalHandler(Class<T> clazz) { getNodeInternal().setSignalHandler(clazz); return this; @@ -273,14 +293,14 @@ return msgBuilder; } - public ProcessBuilder addProcessProperty(String name, String value) + public ProcessBuilderExt addProcessProperty(String name, String value) { PropertyImpl prop = new PropertyImpl(name, value); getProcessStructure().addProperty(prop); return this; } - public ProcessBuilder addNodeProperty(String name, String value) + public ProcessBuilderExt addNodeProperty(String name, String value) { PropertyImpl prop = new PropertyImpl(name, value); getNodeInternal().addProperty(prop); @@ -296,13 +316,13 @@ } @Override - public ProcessBuilder addGroupRef(String grpName) + public ProcessBuilderExt addGroupRef(String grpName) { getNodeInternal().setGroupRef(new GroupImpl(GroupType.None, grpName)); return this; } - private ProcessBuilder addNode(NodeImpl nodeImpl) + private ProcessBuilderExt addNode(NodeImpl nodeImpl) { getProcessStructure().addNode(nodeImpl); return this; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,10 +23,10 @@ //$Id$ -import org.jbpm.api.model.Task; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.builder.TaskBuilder; import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.Task; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.builder.TaskBuilder; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.InputSetImpl; import org.jbpm.ri.model.MessageImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -24,10 +24,10 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; import org.jbpm.api.runtime.Attachments; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.Assignment.AssignTime; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,9 +28,9 @@ import java.util.HashMap; import java.util.Map; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.runtime.Attachments; import org.jbpm.preview.model.Property; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,10 +26,10 @@ import java.util.Set; import org.hibernate.Session; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExpressionEvaluator.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -27,10 +27,10 @@ import java.util.Map; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.Attachments.Key; +import org.jbpm.preview.model.Expression; +import org.jbpm.preview.model.Expression.ExpressionLanguage; import org.mvel.MVEL; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,9 +23,9 @@ //$Id$ -import org.jbpm.api.client.Process; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.preview.runtime.TokenExecutor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -21,11 +21,11 @@ */ package org.jbpm.ri.runtime; -import org.jbpm.api.client.Process; import org.jbpm.api.client.Token; -import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.service.ProcessServiceImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.client.Process; +import org.jbpm.api.model.Process; import org.jbpm.preview.runtime.TokenExecutor; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,7 +23,7 @@ //$Id$ -import org.jbpm.api.client.Process; +import org.jbpm.api.model.Process; /** * A RuntimeProcess add runtime behaviour to the {@link Process} Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -32,9 +32,9 @@ import java.util.concurrent.Executors; import org.jbpm.api.client.Token; -import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.preview.runtime.FlowHandler; import org.jbpm.preview.runtime.TokenExecutor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,17 +29,17 @@ import org.hibernate.Session; import org.jboss.util.id.UID; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.WaitState; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.runtime.Attachments.Key; import org.jbpm.api.service.ProcessInstanceService; +import org.jbpm.preview.model.WaitState; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.service.ProcessServiceImpl; import org.jbpm.ri.model.ProcessImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -30,16 +30,16 @@ import org.jbpm.api.BPMException; import org.jbpm.api.ProcessTimeoutException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.client.Process.ProcessStatus; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ExecutionService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Expression; +import org.jbpm.preview.model.StartEvent; import org.jbpm.preview.model.Assignment.AssignTime; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.preview.runtime.TokenExecutor; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -36,10 +36,10 @@ import org.hibernate.cfg.AnnotationConfiguration; import org.jbpm.api.NodeNotFoundException; import org.jbpm.api.ProcessNotFoundException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.Service; import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.model.AbstractElementImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -30,10 +30,10 @@ import org.hibernate.Session; import org.jbpm.api.ProcessNotFoundException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -23,10 +23,10 @@ // $Id$ -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.model.Process; import org.jbpm.api.service.ProcessBuilderService; +import org.jbpm.preview.model.builder.ProcessBuilderExt; import org.jbpm.ri.model.builder.ProcessBuilderImpl; /** @@ -44,7 +44,7 @@ } @Override - public ProcessBuilder getProcessBuilder() + public ProcessBuilderExt getProcessBuilder() { return new ProcessBuilderImpl(getProcessEngine()); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.ri.model.ProcessDefinitionImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -29,9 +29,9 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Process.ProcessStatus; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.model.ProcessImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,7 +25,7 @@ import java.net.URL; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.test.APITestCase; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.ComplexGateway; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.ComplexGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,10 +25,10 @@ import javax.management.ObjectName; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Event.EventDetailType; +import org.jbpm.preview.model.EndEvent; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.ri.model.EndEventImpl; import org.jbpm.ri.model.MessageImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ExclusiveGatewayPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.model.ExclusiveGateway; -import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.preview.model.ExclusiveGateway; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.ExclusiveGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.InclusiveGateway; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.InclusiveGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.preview.model.ParallelGateway; +import org.jbpm.preview.model.Gateway.GatewayType; import org.jbpm.ri.model.ParallelGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,13 +26,13 @@ import javax.management.ObjectName; import org.jbpm.api.ProcessNotFoundException; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Task; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.test.CTSTestCase; import org.jbpm.api.test.ProcessCatalog; +import org.jbpm.preview.model.EndEvent; +import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.Task; import org.jbpm.preview.service.PersistenceService; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -26,15 +26,15 @@ import javax.management.ObjectName; import org.jbpm.api.ProcessNotFoundException; -import org.jbpm.api.client.Process; -import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Task; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.api.test.ProcessCatalog; +import org.jbpm.preview.model.EndEvent; +import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.Task; import org.jbpm.preview.service.PersistenceService; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,10 +25,10 @@ import javax.management.ObjectName; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.StartEvent; +import org.jbpm.preview.model.Event.EventDetailType; import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.SignalImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -28,15 +28,15 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Expression; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Task; import org.jbpm.api.model.SequenceFlow.ConditionType; -import org.jbpm.api.model.Task.TaskType; import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.InputSet; import org.jbpm.preview.model.OutputSet; +import org.jbpm.preview.model.Task; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.ri.model.AssignmentImpl; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.InputSetImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,9 +25,9 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Task.TaskType; import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; +import org.jbpm.preview.model.Task.TaskType; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.UserTaskImpl; Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,16 +25,16 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.Task.TaskType; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.GatewayBuilder; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.TaskBuilder; import org.jbpm.api.service.ProcessBuilderService; +import org.jbpm.preview.model.Expression; import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Expression.ExpressionLanguage; +import org.jbpm.preview.model.Gateway.GatewayType; +import org.jbpm.preview.model.Task.TaskType; +import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.preview.model.builder.TaskBuilder; /** * Test the Airticket sample application @@ -94,14 +94,14 @@ public ProcessDefinition buildProcessDefinition() { // Create a Process through the ProcessBuilder - ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder(); + ProcessBuilderExt procBuilder = (ProcessBuilderExt)ProcessBuilderService.locateProcessBuilder(); procBuilder.addProcess(PROCESS_NAME); // Add Start Event - procBuilder.addStartEvent("Start").addSequenceFlow(TASK_RECEIVE_REQUEST); + procBuilder.addStartEventExt("Start").addSequenceFlow(TASK_RECEIVE_REQUEST); // Build the ReceiveReqTask - TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, TaskType.Receive); + TaskBuilder taskBuilder = procBuilder.addTaskExt(TASK_RECEIVE_REQUEST, TaskType.Receive); taskBuilder.addInMessageRef(MESSAGE_REQ_DATA). addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, getValidationExpression(), PROPERTY_IS_VALID_REQUEST). addSequenceFlow(GATEWAY_IS_VALID); @@ -112,13 +112,13 @@ addDefaultGate(TASK_SEND_INVALID); // Build the CheckAvailabilityTask - taskBuilder = procBuilder.addTask(TASK_CHECK_AVAILABLE); + taskBuilder = procBuilder.addTaskExt(TASK_CHECK_AVAILABLE); taskBuilder.addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " < 10", PROPERTY_IS_AVAILABLE). addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, PROPERTY_SEATS + " * 111", PROPERTY_PRICE). addSequenceFlow(GATEWAY_IS_AVAILABLE); // Build the SendInvalidTask - taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, TaskType.Send); + taskBuilder = procBuilder.addTaskExt(TASK_SEND_INVALID, TaskType.Send); taskBuilder.addOutMessageRef(MESSAGE_INVALID_DATA). addSequenceFlow(TASK_RECEIVE_REQUEST); @@ -128,12 +128,12 @@ addDefaultGate(TASK_SEND_NOT_AVAILABLE); // Build the SendOfferTask - taskBuilder = procBuilder.addTask(TASK_MAKE_OFFER, TaskType.User); + taskBuilder = procBuilder.addTaskExt(TASK_MAKE_OFFER, TaskType.User); taskBuilder.addOutMessageRef(MESSAGE_OFFER).addInMessageRef(MESSAGE_ACCEPT_OFFER). addSequenceFlow(GATEWAY_IS_ACCEPTED); // Build the SendNotAvailableTask - taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, TaskType.Send); + taskBuilder = procBuilder.addTaskExt(TASK_SEND_NOT_AVAILABLE, TaskType.Send); taskBuilder.addOutMessageRef(MESSAGE_NOT_AVAILABLE). addSequenceFlow(TASK_RECEIVE_REQUEST); @@ -148,7 +148,7 @@ addGate(TASK_BOOKING); // Build the CreditCardTask - taskBuilder = procBuilder.addTask(TASK_CREDIT_CARD); + taskBuilder = procBuilder.addTaskExt(TASK_CREDIT_CARD); taskBuilder.addInputSet(). addPropertyInput(PROPERTY_CREDIT_CARD). addPropertyInput(PROPERTY_EXPIRE). @@ -156,7 +156,7 @@ addSequenceFlow(GATEWAY_SYNC_JOIN); // Build the BookingTask - taskBuilder = procBuilder.addTask(TASK_BOOKING); + taskBuilder = procBuilder.addTaskExt(TASK_BOOKING); taskBuilder.addInputSet(). addPropertyInput(PROPERTY_NAME). addPropertyInput(PROPERTY_FROM). @@ -170,12 +170,12 @@ gatewayBuilder.addGate(TASK_SEND_CONFIRM); // Build the SendConfirmTask - taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, TaskType.Send); + taskBuilder = procBuilder.addTaskExt(TASK_SEND_CONFIRM, TaskType.Send); taskBuilder.addOutMessageRef(MESSAGE_CONFIRM). addSequenceFlow(EVENT_END); // Add the EndEvent - procBuilder.addEndEvent(EVENT_END); + procBuilder.addEndEventExt(EVENT_END); // Add ReqDataMsg procBuilder.addProcessMessage(MESSAGE_REQ_DATA). Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -15,7 +15,8 @@ import org.jboss.bpm.samples.airticket.client.OfferMessage; import org.jboss.bpm.samples.airticket.client.OrderMessage; import org.jboss.bpm.samples.airticket.client.RequestMessage; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.client.MessageListener; import org.jbpm.preview.client.ProcessAsync; @@ -23,7 +24,6 @@ import org.jbpm.preview.model.Message; import org.jbpm.preview.model.Signal; import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.service.MessageBuilderService; import org.jbpm.preview.service.MessageService; import org.jbpm.preview.service.SignalService; Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-14 09:11:15 UTC (rev 2921) +++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-14 10:11:29 UTC (rev 2922) @@ -25,7 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.test.CTSTestCase; import org.jbpm.preview.client.MessageListener; @@ -34,7 +35,6 @@ import org.jbpm.preview.model.Message; import org.jbpm.preview.model.UserTask; import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.preview.service.MessageBuilderService; import org.jbpm.preview.service.MessageService; import org.slf4j.Logger;

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2921 - in projects/spec/trunk/modules: cts/src/test/java/org/jbpm/test/cts/task/waitstate and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 04:11:15 -0500 (Fri, 14 Nov 2008) New Revision: 2921 Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java Log: Exclusive split - ok Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 09:07:25 UTC (rev 2920) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 09:11:15 UTC (rev 2921) @@ -24,9 +24,12 @@ // $Id$ import java.io.IOException; -import java.util.List; +import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.Token; +import org.jbpm.api.client.Process.ProcessStatus; +import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.GatewayBuilder; @@ -34,12 +37,10 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessAsync; -import org.jbpm.preview.model.Signal; /** - * Exclusive data-based gateway that has conditional outgoing sequence flows. - * Only one of the gates is taken. It is an error if no gate is applicable. + * Exclusive data-based gateway that has conditional outgoing sequence flows. Only one of the gates is taken. It is an + * error if no gate is applicable. * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 @@ -49,44 +50,48 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + Process proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); - proc.startProcessAsync(att); - proc.waitForEnd(5000); - List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); - assertEquals(1, endSignals.size()); - assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name")); + Token tok = proc.startProcess(att); + + String nodeName = tok.getCurrentNode().getName(); + assertEquals("EndA", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); } public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + Process proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); - proc.startProcessAsync(att); - proc.waitForEnd(5000); + + Token tok = proc.startProcess(att); - List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); - assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); + String nodeName = tok.getCurrentNode().getName(); + assertEquals("EndB", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); } public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + Process proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); - proc.startProcessAsync(att); + try { - proc.waitForEnd(5000); + proc.startProcess(att); fail("No gate defined for foo==10"); } catch (RuntimeException rte) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-14 09:07:25 UTC (rev 2920) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-14 09:11:15 UTC (rev 2921) @@ -28,6 +28,7 @@ import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; +import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; @@ -48,28 +49,30 @@ Process proc = procDef.newInstance(); // Start the Process - Token token = proc.startProcess(); - String nodeName = token.getCurrentNode().getName(); - assertEquals(TokenStatus.Suspended, token.getTokenStatus()); + Token tok = proc.startProcess(); + String nodeName = tok.getCurrentNode().getName(); + assertEquals(TokenStatus.Suspended, tok.getTokenStatus()); assertEquals("TaskA", nodeName); - token.signal(); + tok.signal(); - nodeName = token.getCurrentNode().getName(); - assertEquals(TokenStatus.Suspended, token.getTokenStatus()); + nodeName = tok.getCurrentNode().getName(); + assertEquals(TokenStatus.Suspended, tok.getTokenStatus()); assertEquals("TaskB", nodeName); - token.signal(); + tok.signal(); - nodeName = token.getCurrentNode().getName(); - assertEquals(TokenStatus.Suspended, token.getTokenStatus()); + nodeName = tok.getCurrentNode().getName(); + assertEquals(TokenStatus.Suspended, tok.getTokenStatus()); assertEquals("TaskC", nodeName); - token.signal(); + tok.signal(); - nodeName = token.getCurrentNode().getName(); - assertEquals(TokenStatus.Destroyed, token.getTokenStatus()); + nodeName = tok.getCurrentNode().getName(); assertEquals("End", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); } public ProcessDefinition getProcessDefinition() throws IOException Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 09:07:25 UTC (rev 2920) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 09:11:15 UTC (rev 2921) @@ -42,6 +42,7 @@ import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.service.ProcessServiceImpl; +import org.jbpm.ri.model.ProcessImpl; /** * A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime. @@ -199,18 +200,35 @@ } // Travers the token along the nodes - while (continueTokenExecution()) + try { - // Get the target node - node = getCurrentNode(); + while (continueTokenExecution()) + { + // Get the target node + node = getCurrentNode(); - // Create a Token that includes node properties - DelegatingToken tokCopy = new DelegatingToken(this); - rtContext.setToken(tokCopy); + // Create a Token that includes node properties + DelegatingToken tokCopy = new DelegatingToken(this); + rtContext.setToken(tokCopy); - // Call the interceptor chain - rtContext.next(); + // Call the interceptor chain + rtContext.next(); + } } + catch (RuntimeException rte) + { + ProcessImpl procImpl = (ProcessImpl)getProcess(); + procImpl.setRuntimeException(rte); + procImpl.setProcessStatus(ProcessStatus.Aborted); + throw rte; + } + + // Set Process to completed + if (getRootToken().getTokenStatus() == TokenStatus.Destroyed) + { + ProcessImpl procImpl = (ProcessImpl)getProcess(); + procImpl.setProcessStatus(ProcessStatus.Completed); + } } private boolean continueTokenExecution()

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2920 - in projects/gwt-console/trunk: server/src/main/java/org/jboss/bpm/console/server/dao/internal and 4 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-11-14 04:07:25 -0500 (Fri, 14 Nov 2008) New Revision: 2920 Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock.png projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock_small.png projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/unlock.png Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: Disallow signaling on tokens that are terminated or have active children Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -41,6 +41,8 @@ private Set<TokenReference> children = new HashSet<TokenReference>(); private List<String> availableSignals = new ArrayList<String>(); + private boolean canBeSignaled = true; + public TokenReference(long id, String name, String nodeName) { this.id = id; @@ -73,4 +75,13 @@ return currentNodeName; } + public boolean canBeSignaled() + { + return canBeSignaled; + } + + public void setCanBeSignaled(boolean canBeSignaled) + { + this.canBeSignaled = canBeSignaled; + } } Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -63,6 +63,9 @@ { TokenReference token = new TokenReference(t0.getId(), t0.getName(), t0.getNode().getName()); + if(t0.hasActiveChildren() || t0.isTerminatedImplicitly()) + token.setCanBeSignaled(false); + Map children = t0.getChildren(); if(children!=null) { Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -213,8 +213,12 @@ long rootTokenId = JSONWalk.on(jso).next("id").asLong(); String name = JSONWalk.on(jso).next("name").asString(); String nodeName = JSONWalk.on(jso).next("currentNodeName").asString(); + TokenReference rt = new TokenReference(rootTokenId, name, nodeName); + boolean canBeSignaled = JSONWalk.on(jso).next("canBeSignaled").asBool(); + rt.setCanBeSignaled(canBeSignaled); + JSONArray signals = JSONWalk.on(jso).next("availableSignals").asArray(); for(int i=0; i<signals.size(); i++) { Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -127,6 +127,9 @@ } } ); + + if(!tok.canBeSignaled()) + treeNode.setIcon("images/icons/lock.png"); return treeNode; } } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -32,7 +32,6 @@ import com.gwtext.client.widgets.form.Form; import com.gwtext.client.widgets.form.FormPanel; import com.gwtext.client.widgets.form.TextField; -import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.UIConstants; import org.jboss.bpm.console.client.model.ProcessInstance; import org.jboss.bpm.console.client.model.jbpm3.TokenReference; @@ -158,11 +157,16 @@ cb.setStore(store); // suspended instances cannot be signaled - if(processInstance.isSuspended()) + if(processInstance.isSuspended() || !tok.canBeSignaled()) + { signalButton.disable(); + cb.disable(); + } else + { signalButton.enable(); - + cb.enable(); + } } // ----------- Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-11-14 09:07:25 UTC (rev 2920) @@ -114,6 +114,10 @@ background-image: url( images/icons/add.png) } +.bpm-lock-icon-small { + background-image: url( images/icons/lock_small.png) +} + .bpm-remove-icon { background-image: url( images/icons/remove.png) } Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock_small.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock_small.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/unlock.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/unlock.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2919 - in projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview: client and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 02:51:48 -0500 (Fri, 14 Nov 2008) New Revision: 2919 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/MessageListener.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/PersistenceToken.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/SignalListener.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/GroupBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/MessageBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/SignalBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/BasicNodeHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ExecutionHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/FlowHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/NodeHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/SignalHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/TokenExecutor.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/DeploymentService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalService.java Log: Refactor api preview packages Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.client; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Serializable; +import java.net.URI; +import java.net.URL; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.DialectHandler; +import org.jbpm.api.service.DialectHandlerService; +import org.jbpm.api.service.ProcessInstanceService; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +/** + * A deployment, containing all information to create a process that will be deployed to the {@link ProcessInstanceService} + * + * @author Tom Baeyens + * @author thomas.diesler(a)jboss.com + * @since 25-Sep-2008 + */ +public class Deployment implements Serializable +{ + private static final long serialVersionUID = 1L; + + private String procXML; + private ProcessDefinition process; + + public Deployment(String procXML) + { + if (procXML == null) + throw new IllegalArgumentException("Null process definition"); + + this.procXML = procXML; + } + + public Deployment(URL procURL) throws IOException + { + if (procURL == null) + throw new IllegalArgumentException("Null process definition"); + + StringBuilder strBuilder = new StringBuilder(); + BufferedReader br = new BufferedReader(new InputStreamReader(procURL.openStream())); + String line = br.readLine(); + while (line != null) + { + strBuilder.append(line); + line = br.readLine(); + } + procXML = strBuilder.toString(); + } + + public Deployment(ProcessDefinition procDef) + { + this.process = procDef; + } + + public ProcessDefinition getProcessDefinition(ProcessEngine engine) + { + if (process == null) + { + DialectHandlerService dhService = engine.getService(DialectHandlerService.class); + if (dhService == null) + throw new IllegalStateException("DialectHandlerService not registered"); + + URI nsURI = getNamespaceURI(); + DialectHandler dialectHandler = dhService.getDialectHandler(nsURI); + if (dialectHandler == null) + throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI); + + process = dialectHandler.createProcess(procXML); + } + return process; + } + + private URI getNamespaceURI() + { + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + dbf.setNamespaceAware(true); + Document doc; + try + { + DocumentBuilder db = dbf.newDocumentBuilder(); + doc = db.parse(new ByteArrayInputStream(procXML.getBytes())); + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot parse process descriptor", ex); + } + + Element root = doc.getDocumentElement(); + String nsURI = root.getNamespaceURI(); + if (nsURI == null) + throw new IllegalStateException("Cannot get namespace URI from root element"); + + return URI.create(nsURI); + } +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/MessageListener.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/MessageListener.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/MessageListener.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.client; + +import javax.management.ObjectName; + +import org.jbpm.preview.model.Message; + +//$Id$ + +/** + * A MessageListener that can be registered with the ProcessEngine + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface MessageListener +{ + /** + * Get the id for this listener + */ + ObjectName getKey(); + + /** + * Catch a message from the process that this listener is registered with + */ + void catchMessage(Message message); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/MessageListener.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/PersistenceToken.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/PersistenceToken.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/PersistenceToken.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.preview.client; + +// $Id$ + +import org.hibernate.Session; +import org.jbpm.api.client.Token; + +/** + * A Token that gives access to the persistence context + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface PersistenceToken extends Token +{ + /** + * Get the associated persistence session + */ + Session getSession(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/PersistenceToken.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.client; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.api.client.Process; +import org.jbpm.api.runtime.Attachments; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessAsync extends Process +{ + /** + * Start the process asynchronously + */ + ObjectName startProcessAsync(); + + /** + * Start the process asynchronously, with a given context data + */ + ObjectName startProcessAsync(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. + */ + ProcessStatus 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. + */ + ProcessStatus waitForEnd(long timeout); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessAsync.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/SignalListener.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/SignalListener.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/SignalListener.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.client; + +//$Id$ + +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.service.SignalService; + +/** + * A signal listener that can be registered with the {@link SignalService} + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SignalListener +{ + /** + * Returns true if the listener accepts a given signal + */ + boolean acceptSignal(Signal signal); + + /** + * Catch a previously accepted signal + */ + void catchSignal(Signal signal); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/SignalListener.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,135 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.client; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.runtime.Attachments; +import org.jbpm.api.runtime.BasicAttachments; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.UserTask; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.service.MessageBuilderService; +import org.jbpm.preview.service.MessageService; + +/** + * A callback that can be attached to a {@link UserTask} to facilitate message handling; + * + * The callback registers a {@link MessageListener}, extracts the data from the received message + * and calls the user provided 'callback' method. The response message is then constructed from + * the user provided data and automatically sent back to the {@link UserTask}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Oct-2008 + */ +public abstract class UserTaskCallback +{ + private MessageListener messageListener; + + /** + * Get the associated MessageListener + */ + public MessageListener getMessageListener() + { + return messageListener; + } + + /** + * Attached this callback to the user task + */ + public void attach(UserTask userTask) + { + userTask.setUserTaskCallback(this); + + messageListener = new CallbackMessageListener(userTask); + + ProcessEngine engine = userTask.getProcessDefinition().getProcessEngine(); + MessageService msgService = engine.getService(MessageService.class); + msgService.addMessageListener(messageListener); + } + + /** + * Detach this callback from the user task + */ + public void detach(UserTask userTask) + { + ProcessEngine engine = userTask.getProcessDefinition().getProcessEngine(); + MessageService msgService = engine.getService(MessageService.class); + msgService.removeMessageListener(messageListener.getKey()); + } + + public abstract void callback(Attachments att); + + class CallbackMessageListener implements MessageListener + { + private UserTask userTask; + + public CallbackMessageListener(UserTask userTask) + { + this.userTask = userTask; + } + + @Override + public void catchMessage(Message msg) + { + // Get the message data + Attachments att = new BasicAttachments(); + for (String propName : msg.getPropertyNames()) + { + String value = msg.getProperty(propName).getValue(); + att.addAttachment(propName, value); + } + + // Call the user callback + callback(att); + + // Build the response message + Message msgRef = userTask.getInMessageRef(); + MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder(); + msgBuilder.newMessage(msgRef.getName()); + for (String propName : msgRef.getPropertyNames()) + { + Object value = att.getAttachment(propName); + if (value == null) + throw new IllegalStateException("Cannot obtain required property: " + propName); + msgBuilder.addProperty(propName, value); + } + Message resMessage = msgBuilder.getMessage(); + + MessageService msgService = MessageService.locateMessageService(); + + ObjectName procID = userTask.getProcess().getKey(); + msgService.sendMessage(procID, userTask.getName(), resMessage); + } + + @Override + public ObjectName getKey() + { + String oname = userTask.getKey().getCanonicalName(); + return ObjectNameFactory.create(oname + ",msgListener=UserTaskCallback"); + } + } +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.model.builder; + +//$Id$ + +import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.preview.model.Signal.SignalType; + +/** + * The EventBuilder can be used to build an Event dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface EventBuilder extends ProcessBuilder +{ + /** + * Add a signal ref to the last added EventDetail + */ + EventBuilder addSignalRef(SignalType signalType, String signalMessage); + + /** + * Add a message ref to the last added EventDetail + */ + EventBuilder addMessageRef(String msgName); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/GroupBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/GroupBuilder.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/GroupBuilder.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.model.builder; + +//$Id$ + +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Group.GroupType; + + +/** + * A GroupBuilder can be used to build a {@link Group} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface GroupBuilder +{ + /** Add a new Group*/ + GroupBuilder newGroup(GroupType type, String name); + + /** + * Add a message property + */ + GroupBuilder addProperty(String name, Object value); + + /** + * Get the Group + */ + Group getGroup(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/GroupBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/MessageBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/MessageBuilder.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/MessageBuilder.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.model.builder; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.preview.model.Message; + + +/** + * 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 Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/MessageBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.model.builder; + +// $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); + } + } +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ObjectNameFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/SignalBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/SignalBuilder.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/SignalBuilder.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.model.builder; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; + + +/** + * A SignalBuilder can be used to build a {@link Signal} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SignalBuilder +{ + /** + * Create a Signal + */ + Signal newSignal(SignalType signalType, ObjectName fromRef, String message); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/SignalBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/BasicNodeHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/BasicNodeHandler.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/BasicNodeHandler.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.runtime; + +import org.jbpm.api.model.Node; + +/** + * A handler that is associated with a node + * + * @author thomas.diesler(a)jboss.com + * @since 30-Sep-2008 + */ +public abstract class BasicNodeHandler implements NodeHandler +{ + private static final long serialVersionUID = 1L; + + private Node node; + + @Override + public Node getNode() + { + return node; + } + + @Override + public void setNode(Node node) + { + this.node = node; + } +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/BasicNodeHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ExecutionHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ExecutionHandler.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ExecutionHandler.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.runtime; + +//$Id$ + +import org.jbpm.api.client.Token; +import org.jbpm.api.model.Node; + +/** + * The ProcessEngine invokes the ExecutionHandler on a + * {@link Node} to execute user provided business logic. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ExecutionHandler extends NodeHandler +{ + /** + * Execute the associated business logic. + */ + void execute(Token token); + +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ExecutionHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/FlowHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/FlowHandler.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/FlowHandler.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.runtime; + +// $Id$ + +import org.jbpm.api.client.Token; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Node; + +/** + * The {@link ProcessEngine} invokes the FlowHandler on a {@link Node} + * to move the {@link Token} to the next {@link Node}. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface FlowHandler extends NodeHandler +{ + /** + * Execute the FlowHandler. + * + * The FlowHandler typically invoves one of the {@link TokenExecutor} + * methods to move the {@link Token} to the next {@link Node}. + */ + void execute(TokenExecutor tokenExecutor, Token token); + +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/FlowHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/NodeHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/NodeHandler.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/NodeHandler.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.runtime; + +import java.io.Serializable; + +//$Id$ + +import org.jbpm.api.model.Node; + +/** + * A handler that is associated with a node + * + * @author thomas.diesler(a)jboss.com + * @since 30-Sep-2008 + */ +public interface NodeHandler extends Serializable +{ + /** + * Get the associated node. + */ + Node getNode(); + + /** + * Set the associated node. + */ + void setNode(Node node); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/NodeHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/SignalHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/SignalHandler.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/SignalHandler.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.runtime; + +// $Id$ + +import org.jbpm.api.client.Token; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Node; +import org.jbpm.preview.model.Signal; + +/** + * The {@link ProcessEngine} invokes the SignalHandler on a {@link Node} + * to send {@link Signal}s. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SignalHandler extends NodeHandler +{ + /** + * Get signal for enter + */ + void throwEnterSignal(Token token); + + /** + * Get signal for exit + */ + void throwExitSignal(Token token); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/SignalHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/TokenExecutor.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/TokenExecutor.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/TokenExecutor.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.runtime; + +//$Id$ + +import org.jbpm.api.client.Token; +import org.jbpm.api.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 +{ + /** + * 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} + */ + void suspend(Token token); + + /** + * Activate a {@link Token} + */ + void activate(Token token); + + /** + * Move a given {@link Token} along a given flow. + */ + void move(Token token, SequenceFlow flow); +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/TokenExecutor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/DeploymentService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/DeploymentService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/DeploymentService.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -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.jbpm.preview.service; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.api.service.Service; +import org.jbpm.preview.client.Deployment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The marker interface for all Services + * + * @author thomas.diesler(a)jboss.com + * @since 25-Sep-2008 + */ +public abstract class DeploymentService implements Service +{ + // Provide logging + final static Logger log = LoggerFactory.getLogger(DeploymentService.class); + + /** + * Deploy a new process to the process service. + */ + ObjectName deploy(Deployment deployment) + { + return null; + } +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/DeploymentService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageBuilderService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageBuilderService.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.service; + +//$Id$ + +import org.jbpm.api.client.Configuration; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.AbstractService; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; + +/** + * The MessageBuilder can be used to build a {@link Message} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class MessageBuilderService extends AbstractService +{ + /** + * Locate the default MessageBuilder + */ + public static MessageBuilder locateMessageBuilder() + { + ProcessEngine engine = Configuration.getProcessEngine(); + MessageBuilderService builderService = engine.getService(MessageBuilderService.class); + return builderService.getMessageBuilder(); + } + + /** + * Get the MessageBuilder + */ + public abstract MessageBuilder getMessageBuilder(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageBuilderService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,171 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software{} you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation{} either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY{} without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software{} if not, write to the Free + * 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.preview.service; + +//$Id$ + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.management.ObjectName; + +import org.jbpm.api.client.Configuration; +import org.jbpm.api.client.Process; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Event; +import org.jbpm.api.model.Node; +import org.jbpm.api.model.Task; +import org.jbpm.api.service.AbstractService; +import org.jbpm.api.service.ProcessInstanceService; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Participant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The ProcessEngine sends messages through the MessageService. + * + * A {@link Message} has an ID and is targeted to a + * specific Participant. A component can register a {@link MessageListener} with the MessageService. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class MessageService extends AbstractService +{ + // Provide logging + final Logger log = LoggerFactory.getLogger(MessageService.class); + + // The set of registered message listeners + private Map<ObjectName, MessageListener> listeners = new HashMap<ObjectName, MessageListener>(); + + /** + * Locate the default MessageService + */ + public static MessageService locateMessageService() + { + ProcessEngine engine = Configuration.getProcessEngine(); + return engine.getService(MessageService.class); + } + + /** + * Add a MessageListener + */ + public void addMessageListener(MessageListener listener) + { + synchronized (listeners) + { + if (hasMessageListener(listener.getKey())) + throw new IllegalStateException("Listener already registered: " + listener.getKey()); + + log.debug("addMessageListener: " + listener.getKey()); + listeners.put(listener.getKey(), listener); + } + } + + /** + * Get the set of registered MessageListeners + */ + public Set<MessageListener> getMessageListeners() + { + synchronized (listeners) + { + HashSet<MessageListener> set = new HashSet<MessageListener>(listeners.values()); + return Collections.unmodifiableSet(set); + } + } + + /** + * Get a MessageListener for a given ID + * + * @return null if there is none + */ + public MessageListener getMessageListener(ObjectName listenerID) + { + synchronized (listeners) + { + return listeners.get(listenerID); + } + } + + /** + * True if there is a MessageListener for a given ID + */ + public boolean hasMessageListener(ObjectName listenerID) + { + return getMessageListener(listenerID) != null; + } + + /** + * Remove an MessageListener + */ + public void removeMessageListener(ObjectName listenerID) + { + synchronized (listeners) + { + log.debug("removeMessageListener: " + listenerID); + listeners.remove(listenerID); + } + } + + /** + * Send a message to a given {@link Task} or {@link Event} + */ + public void sendMessage(ObjectName procID, String targetName, Message msg) + { + ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); + Process proc = procService.getProcess(procID); + if (proc == null) + throw new IllegalStateException("Cannot obtain registered process: " + procID); + + Node targetNode = proc.getNode(targetName); + if (targetNode == null) + throw new IllegalArgumentException("Cannot find message target: " + targetName); + if (targetNode instanceof MessageListener == false) + throw new IllegalArgumentException("Message target is not a valid message receiver: " + targetName); + + log.debug("sendMessage to " + targetNode + " => " + msg); + MessageListener msgListener = (MessageListener)targetNode; + msgListener.catchMessage(msg); + } + + /** + * Send a message to a given {@link MessageListener} + */ + public void sendMessage(Message msg) + { + Participant toRef = msg.getToRef(); + if (toRef == null) + throw new IllegalArgumentException("Target entity cannot be null"); + + MessageListener msgListener = getMessageListener(toRef.getName()); + if (msgListener == null) + throw new IllegalStateException("No message listener registered for: " + toRef); + + log.debug("sendMessage to '" + toRef + "' => " + msg); + msgListener.catchMessage(msg); + } +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,97 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.service; + +// $Id$ + +import javax.management.ObjectName; + +import org.hibernate.Session; +import org.jbpm.api.client.Configuration; +import org.jbpm.api.client.Process; +import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Node; +import org.jbpm.api.service.AbstractService; + +/** + * The persistence service. + * + * @author thomas.diesler(a)jboss.com + * @since 17-Sep-2008 + */ +public abstract class PersistenceService extends AbstractService +{ + /** + * Locate the default PersistenceService + */ + public static PersistenceService locatePersistenceService() + { + ProcessEngine engine = Configuration.getProcessEngine(); + return engine.getService(PersistenceService.class); + } + + /** + * Create a new persistence session + */ + public abstract Session createSession(); + + /** + * Save the ProcessDefinition to persistent storage + */ + public abstract ObjectName saveProcessDefinition(ProcessDefinition procDef); + + /** + * Load the ProcessDefinition from persistent storage + */ + public abstract ProcessDefinition loadProcessDefinition(ObjectName procDefID); + + /** + * Delete the ProcessDefinition from persistent storage + */ + public abstract void deleteProcessDefinition(ProcessDefinition procDef); + + /** + * Save the Process to persistent storage + */ + public abstract ObjectName saveProcess(Process proc); + + /** + * Load the Process from persistent storage + */ + public abstract Process loadProcess(ObjectName procID); + + /** + * Delete the Process from persistent storage + */ + public abstract void deleteProcess(Process proc); + + /** + * Save the Node to persistent storage + */ + public abstract ObjectName saveNode(Session session, Node node); + + /** + * Load the Node from persistent storage + */ + public abstract <T extends Node> T loadNode(Session session, Class<T> clazz, ObjectName nodeID); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/PersistenceService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalBuilderService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalBuilderService.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.service; + +//$Id$ + +import org.jbpm.api.client.Configuration; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.AbstractService; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.SignalBuilder; + +/** + * The SignalBuilder can be used to build a {@link Signal} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class SignalBuilderService extends AbstractService +{ + /** + * Locate the default SignalBuilder + */ + public static SignalBuilder locateSignalBuilder() + { + ProcessEngine engine = Configuration.getProcessEngine(); + SignalBuilderService builderService = engine.getService(SignalBuilderService.class); + return builderService.getSignalBuilder(); + } + + /** + * Get the SignalBuilder + */ + public abstract SignalBuilder getSignalBuilder(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalBuilderService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalService.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalService.java 2008-11-14 07:51:48 UTC (rev 2919) @@ -0,0 +1,137 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.service; + +//$Id$ + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import org.jbpm.api.client.Configuration; +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.AbstractService; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Signal; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link Signal} is like an undirected flare shot up + * into the air. A component can register a {@link SignalListener} with the SignalService. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class SignalService extends AbstractService +{ + // provide logging + final static Logger log = LoggerFactory.getLogger(SignalService.class); + + // The map of registered signal listeners + private Set<SignalListener> listeners = new HashSet<SignalListener>(); + + /** + * Locate the default SignalService + */ + public static SignalService locateSignalService() + { + ProcessEngine engine = Configuration.getProcessEngine(); + return engine.getService(SignalService.class); + } + + /** + * Add a SignalListener for a given source + */ + public void addSignalListener(SignalListener listener) + { + synchronized (listeners) + { + log.debug("addSignalListener: " + listener); + listeners.add(listener); + } + } + + /** + * Get the set of registered SignalListeners + */ + public Set<SignalListener> getSignalListeners() + { + synchronized (listeners) + { + HashSet<SignalListener> set = new HashSet<SignalListener>(listeners); + return Collections.unmodifiableSet(set); + } + } + + /** + * Remove a SignalListener for a given source + */ + public void removeSignalListener(SignalListener listener) + { + synchronized (listeners) + { + log.debug("removeSignalListener: " + listener); + listeners.remove(listener); + } + } + + /** + * Throw a signal to all registered listeners + */ + public void throwSignal(Signal signal) + { + log.debug("throwSignal: " + signal); + Set<SignalListener> currentSet = getSignalListeners(); + for (SignalListener listener : currentSet) + { + if (failsafeAccept(listener, signal)) + failsafeThrow(listener, signal); + } + } + + private boolean failsafeAccept(SignalListener listener, Signal signal) + { + try + { + boolean accept = listener.acceptSignal(signal); + return accept; + } + catch (RuntimeException rte) + { + log.error("Signal processing error", rte); + return false; + } + } + + private void failsafeThrow(SignalListener listener, Signal signal) + { + try + { + listener.catchSignal(signal); + } + catch (RuntimeException rte) + { + log.error("Signal processing error", rte); + } + } +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2918 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/client and 40 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 02:49:48 -0500 (Fri, 14 Nov 2008) New Revision: 2918 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Group.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InputSet.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Message.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/OutputSet.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Participant.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Property.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/PropertySupport.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Signal.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/preview/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/preview/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/preview/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/runtime/preview/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/preview/ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalMultithreadTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGroup.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GroupImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InputSetImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MessageImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/OutputSetImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParallelGatewayImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertyImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GroupBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MessageBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SignalBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MessageSender.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MutableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeContext.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalServiceImpl.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java Log: Refactor api preview packages Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -21,8 +21,8 @@ */ package org.jbpm.api.model; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Gate.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,7 +25,7 @@ import java.util.List; -import org.jbpm.api.model.preview.Assignment; +import org.jbpm.preview.model.Assignment; /** * There MAY be zero or more Gates (except where noted below). Zero Gates are Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,12 +27,12 @@ import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.PropertySupport; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.SignalHandler; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.PropertySupport; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; /** * A Node is an abstract element with a name and an associated process Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessStructure.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,10 +25,10 @@ import java.util.List; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.PropertySupport; /** * A ProcessStructure defines the structure of a Process Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Task.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,8 +25,8 @@ import java.util.List; -import org.jbpm.api.model.preview.InputSet; -import org.jbpm.api.model.preview.OutputSet; +import org.jbpm.preview.model.InputSet; +import org.jbpm.preview.model.OutputSet; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -30,16 +30,16 @@ import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.builder.preview.EventBuilder; -import org.jbpm.api.model.builder.preview.GroupBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.Assignment.AssignTime; -import org.jbpm.api.model.preview.Group.GroupType; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.SignalHandler; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.model.builder.EventBuilder; +import org.jbpm.preview.model.builder.GroupBuilder; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/TaskBuilder.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.api.model.preview.Message; +import org.jbpm.preview.model.Message; /** * The TaskBuilder can be used to build a Task dynamically. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -40,8 +40,8 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.preview.Deployment; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.client.Deployment; +import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -36,7 +36,7 @@ import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Process.ProcessStatus; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestCase.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -30,7 +30,7 @@ import junit.framework.TestCase; import org.jbpm.api.Constants; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; +import org.jbpm.preview.model.builder.ObjectNameFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -38,18 +38,18 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.preview.MessageListener; -import org.jbpm.api.client.preview.SignalListener; -import org.jbpm.api.model.builder.preview.SignalBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.service.DialectHandler; import org.jbpm.api.service.DialectHandlerService; import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.preview.MessageService; -import org.jbpm.api.service.preview.SignalBuilderService; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.SignalBuilder; +import org.jbpm.preview.service.MessageService; +import org.jbpm.preview.service.SignalBuilderService; +import org.jbpm.preview.service.SignalService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -31,7 +31,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; +import org.jbpm.preview.model.builder.ObjectNameFactory; /** * An integration test helper that deals with test deployment/undeployment, etc. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,10 +33,10 @@ import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Task; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; /** * A catalog of CTS test processes Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +import java.io.Serializable; + +import org.jbpm.api.model.Expression; + + +//$Id$ + +/** + * An Assignment, which is used in the definition of attributes for Process, + * Activity, Event, Gateway, and Gate. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Assignment extends Serializable +{ + public enum AssignTime + { + Start, End + } + + /** + * 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(); +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.Gateway; + +// $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 Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Group.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Group.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Group.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +//$Id$ + +import java.io.Serializable; + + +/** + * The Group object is an Artifact that provides a visual mechanism to group elements of a diagram informally. The + * grouping is tied to the Category supporting element (which is an attribute of all BPMN elements). That is, a Group is a + * visual depiction of a single Category. The graphical elements within the Group will be assigned the Category of the + * Group. + * + * @author thomas.diesler(a)jboss.com + * @since 30-Oct-2008 + */ +public interface Group extends PropertySupport, Serializable +{ + /** + * The supported group types + */ + enum GroupType { None, Transaction }; + + /** + * Name is an attribute that is text description of the Group. + */ + String getName(); + + /** + * Get the group type for this group + */ + GroupType getGroupType(); +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Group.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.preview.model; + +import org.jbpm.api.model.Gateway; + +//$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 +{ +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InputSet.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InputSet.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InputSet.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.preview.model; + + + +//$Id$ + +/** + * 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 PropertySupport +{ +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InputSet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Message.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Message.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Message.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +import java.io.Serializable; + + + + +//$Id$ + +/** + * A Message, which is used in the definition of attributes for a StartEvent, + * EndEvent, IntermediateEvent, Task, and MessageFlow + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Message extends PropertySupport, Serializable +{ + /** + * Name is an attribute that is text description of the Message. + */ + String getName(); + + /** + * This defines the source of the Message. + */ + Participant getFromRef(); + + /** + * This defines the target of the Message. + */ + Participant getToRef(); +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Message.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/OutputSet.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/OutputSet.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/OutputSet.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.preview.model; + + + +//$Id$ + +/** + * 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 PropertySupport +{ +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/OutputSet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.Gateway; + +// $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 Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Participant.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Participant.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Participant.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +//$Id$ + +import java.io.Serializable; + +import javax.management.ObjectName; + + + +/** + * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface Participant extends Serializable +{ + /** + * The name of this participant + */ + ObjectName getName(); +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Participant.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Property.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Property.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Property.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +import java.io.Serializable; + +// $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 Serializable +{ + /** + * Each Property has a Name (e.g., name=”Customer Name”). + */ + String getName(); + + /** + * Get the property value. + */ + String getValue(); + + /** + * 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(); +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Property.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/PropertySupport.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/PropertySupport.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/PropertySupport.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +//$Id$ + +import java.io.Serializable; +import java.util.Set; + + +/** + * Property support + * + * @author thomas.diesler(a)jboss.com + * @since 21-Jul-2008 + */ +public interface PropertySupport extends Serializable +{ + /** + * Get a Property with a given name. + */ + Property getProperty(String name); + + /** + * Get the set of properties + */ + Set<Property> getProperties(); + + /** + * Get the set of property names + */ + Set<String> getPropertyNames(); + + /** + * Add a property + */ + void addProperty(Property prop); + + /** + * Add a property + */ + void addProperty(String name, Object value); + + /** + * Remove a property + */ + Property removeProperty(String name); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/PropertySupport.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +import org.jbpm.api.model.Task; + +//$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 Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +import org.jbpm.api.model.Task; + +//$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 Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Signal.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Signal.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Signal.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -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.jbpm.preview.model; + +//$Id$ + +import java.io.Serializable; + +import javax.management.ObjectName; + +/** + * A Signal is like an undirected flare shot up + * into the air. + * + * @author Thomas.Diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Signal extends Serializable +{ + /** + * Defines the types of supported Signals + */ + 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_TASK_ENTER, SYSTEM_TASK_EXIT, SYSTEM_TASK_TRIGGER, + USER_SIGNAL + } + + /** + * Get the signal type of this signal + */ + SignalType getSignalType(); + + /** + * Get the sending participant for this signal + */ + ObjectName getFromRef(); + + /** + * Get the optional message associated with this signal + */ + public String getMessage(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Signal.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.preview.model; + +import org.jbpm.api.model.Task; +import org.jbpm.preview.client.UserTaskCallback; + +//$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 +{ + /** + * Get the associated callback + */ + UserTaskCallback getUserTaskCallback(); + + /** + * Set the associated callback + */ + void setUserTaskCallback(UserTaskCallback callback); + + /** + * 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 + */ + Message getOutMessageRef(); + + /** + * 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 + */ + Message getInMessageRef(); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,15 +27,15 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Exclusive data-based gateway that has conditional outgoing sequence flows. Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,15 +27,15 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Exclusive data-based gateway that has conditional outgoing sequence flows. Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,15 +27,15 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Inclusive gateway that has conditional outgoing sequence flows. Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -29,13 +29,13 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; /** * Parallel gateway that has uncontrolled outgoing sequence flows. Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.service.PersistenceService; /** * Test the basic execution sequence Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,12 +27,12 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; /** * Test the basic execution sequence Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,12 +27,12 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,16 +26,16 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,15 +26,15 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Data elements are supported which are specific to a process instance or case. They can be accessed by all components Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,16 +26,16 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Data elements can be defined by tasks which are accessible only within the context of individual execution instances Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,14 +26,14 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Test end event with message result Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,12 +27,12 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Exclusive data-based gateway that has multiple incoming sequence flows. The first token arriving from one of the Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,12 +27,12 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,15 +27,15 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; /** * Inclusive gateway that has conditional outgoing sequence flows. Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,16 +26,16 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -29,13 +29,13 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; /** * Parallel gateway that has uncontrolled outgoing sequence flows. All of them are taken, which leads to parallel paths Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,15 +26,15 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; /** * InputSets define the data requirements for input to the activity. Zero or more InputSets MAY be defined. Each Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,14 +26,14 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; /** * OutputSets define the data requirements for output from the activity. Zero or more OutputSets MAY be defined. At the Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,16 +26,16 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,15 +26,15 @@ import java.io.IOException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks, Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalMultithreadTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalMultithreadTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalMultithreadTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -23,11 +23,11 @@ // $Id$ -import org.jbpm.api.client.preview.SignalListener; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; -import org.jbpm.api.service.preview.SignalService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.service.SignalService; /** * Test the ProcessManager Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalServiceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalServiceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,10 +25,10 @@ import java.util.List; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; -import org.jbpm.api.service.preview.SignalService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.service.SignalService; /** * Test the SignalService Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -29,23 +29,23 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; -import org.jbpm.api.client.preview.SignalListener; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.EventBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Assignment.AssignTime; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.api.service.preview.SignalService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.EventBuilder; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.service.SignalService; /** * Test start event with signal trigger Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,16 +27,16 @@ import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.preview.BasicNodeHandler; -import org.jbpm.api.runtime.preview.ExecutionHandler; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.runtime.BasicNodeHandler; +import org.jbpm.preview.runtime.ExecutionHandler; /** * Test ExecutionHandler attached to Task Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -29,23 +29,23 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; -import org.jbpm.api.client.preview.SignalListener; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.EventBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.api.service.preview.MessageBuilderService; -import org.jbpm.api.service.preview.MessageService; -import org.jbpm.api.service.preview.SignalService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.EventBuilder; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.service.MessageBuilderService; +import org.jbpm.preview.service.MessageService; +import org.jbpm.preview.service.SignalService; /** * Test Receive Task Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -28,14 +28,14 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; /** * Test Send Task Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,17 +27,17 @@ import java.util.List; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; -import org.jbpm.api.client.preview.UserTaskCallback; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.UserTask; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.UserTaskCallback; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.UserTask; /** * Test UserTask that uses the callback API Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -30,20 +30,20 @@ import org.jbpm.api.Constants; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.MessageListener; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Message; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.api.service.preview.MessageBuilderService; -import org.jbpm.api.service.preview.MessageService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.service.MessageBuilderService; +import org.jbpm.preview.service.MessageService; /** * Test User Task Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -31,17 +31,17 @@ import org.jbpm.api.Constants.TxType; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Node; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Group.GroupType; import org.jbpm.api.runtime.BasicAttachments; -import org.jbpm.api.runtime.preview.ExecutionHandler; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.ri.runtime.TransactionAssociation; /** Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -43,22 +43,6 @@ import org.jbpm.api.model.Task; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.SequenceFlow.ConditionType; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.ComplexGateway; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.InclusiveGateway; -import org.jbpm.api.model.preview.InputSet; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.OutputSet; -import org.jbpm.api.model.preview.ParallelGateway; -import org.jbpm.api.model.preview.Participant; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.ReceiveTask; -import org.jbpm.api.model.preview.SendTask; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.SignalHandler; import org.jbpm.dialect.api10.model.JAXBAssignment; import org.jbpm.dialect.api10.model.JAXBComplexGateway; import org.jbpm.dialect.api10.model.JAXBEndEvent; @@ -87,6 +71,22 @@ import org.jbpm.dialect.api10.model.JAXBStartEvent; import org.jbpm.dialect.api10.model.JAXBTask; import org.jbpm.dialect.api10.model.ObjectFactory; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.ComplexGateway; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.InclusiveGateway; +import org.jbpm.preview.model.InputSet; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.OutputSet; +import org.jbpm.preview.model.ParallelGateway; +import org.jbpm.preview.model.Participant; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.ReceiveTask; +import org.jbpm.preview.model.SendTask; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; /** * A JAXB marshaller for a Process Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -39,14 +39,6 @@ import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.EventBuilder; -import org.jbpm.api.model.builder.preview.GroupBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.NodeHandler; -import org.jbpm.api.runtime.preview.SignalHandler; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.api10.model.JAXBAssignment; import org.jbpm.dialect.api10.model.JAXBCancelEventDetail; @@ -83,6 +75,14 @@ import org.jbpm.dialect.api10.model.JAXBTerminateEventDetail; import org.jbpm.dialect.api10.model.JAXBTimerEventDetail; import org.jbpm.dialect.api10.model.ObjectFactory; +import org.jbpm.preview.model.builder.EventBuilder; +import org.jbpm.preview.model.builder.GroupBuilder; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.NodeHandler; +import org.jbpm.preview.runtime.SignalHandler; /** * A JAXB unmarshaller for a Process Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Assignment.AssignTime; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Assignment.AssignTime; /** * An Assignment, which is used in the definition of attributes for Process, Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGroup.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGroup.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGroup.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jbpm.api.model.preview.Group.GroupType; +import org.jbpm.preview.model.Group.GroupType; /** * An Assignment, which is used in the definition of attributes for Process, Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jbpm.api.model.preview.Signal.SignalType; +import org.jbpm.preview.model.Signal.SignalType; /** * The base of all supported event details Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -30,7 +30,6 @@ import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Task; import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.runtime.preview.ExecutionHandler; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.dialect.jpdl32.model.JPDL32Action; import org.jbpm.dialect.jpdl32.model.JPDL32EndState; @@ -40,6 +39,7 @@ import org.jbpm.dialect.jpdl32.model.JPDL32StartState; import org.jbpm.dialect.jpdl32.model.JPDL32State; import org.jbpm.dialect.jpdl32.model.JPDL32Transition; +import org.jbpm.preview.runtime.ExecutionHandler; /** * Adapt the jpdl-3.2 ProcessDefinition to the API Process Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -32,8 +32,8 @@ import javax.persistence.Id; import org.jbpm.api.model.Expression; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Property; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Property; /** * An Assignment, which is used in the definition of attributes for Process, Activities, Events, Gateways, and Gates. Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -28,7 +28,7 @@ import org.jbpm.api.NotImplementedException; import org.jbpm.api.model.Expression; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.preview.ComplexGateway; +import org.jbpm.preview.model.ComplexGateway; /** * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -34,13 +34,13 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.SignalHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.builder.SingleInFlowSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -39,12 +39,12 @@ import org.jbpm.api.model.Event; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.SignalHandler; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.service.SignalService; import org.jbpm.ri.runtime.MessageSender; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -36,9 +36,9 @@ import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.SequenceFlow.ConditionType; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.ExpressionEvaluator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -37,7 +37,7 @@ import org.hibernate.annotations.IndexColumn; import org.jbpm.api.model.Gate; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.preview.Assignment; +import org.jbpm.preview.model.Assignment; /** * There MAY be zero or more Gates (except where noted below). Zero Gates are allowed if the Gateway is last object in a Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -41,11 +41,11 @@ import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.SequenceFlow.ConditionType; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.SignalHandler; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.builder.MultipleInFlowSupport; import org.jbpm.ri.model.builder.MultipleOutFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GroupImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GroupImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GroupImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -34,9 +34,9 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; /** * A Flow Object is one of the set of following graphical objects: Event, Activity, and Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -37,11 +37,11 @@ import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.SequenceFlow.ConditionType; -import org.jbpm.api.model.preview.InclusiveGateway; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.Attachments.Key; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.model.InclusiveGateway; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.MutableToken; import org.mvel.MVEL; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InputSetImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InputSetImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InputSetImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -32,9 +32,9 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.api.model.preview.InputSet; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.InputSet; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; /** * An InputSet, which is used in the definition of common attributes for Activities and for attributes of a Process Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MessageImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MessageImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MessageImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,10 +33,10 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Participant; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Participant; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; /** * A Message, which is used in the definition of attributes for a @{link StartEvent}, Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -53,15 +53,15 @@ import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.NodeHandler; -import org.jbpm.api.runtime.preview.SignalHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.NodeHandler; +import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.model.builder.MultipleInFlowSupport; import org.jbpm.ri.model.builder.MultipleOutFlowSupport; import org.jbpm.ri.model.builder.SingleInFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/OutputSetImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/OutputSetImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/OutputSetImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -32,9 +32,9 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.api.model.preview.OutputSet; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.OutputSet; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; /** * An OutputSet, which is used in the definition of common attributes for Activities and for attributes of a Process Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParallelGatewayImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParallelGatewayImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParallelGatewayImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -35,10 +35,10 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.preview.ParallelGateway; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.model.ParallelGateway; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.MutableToken; import org.jbpm.ri.runtime.TokenImpl; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -29,8 +29,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Participant; +import org.jbpm.preview.model.Participant; +import org.jbpm.preview.model.builder.ObjectNameFactory; /** * A Participant, which is used in the definition of attributes for a @{link Pool}, @{link Message}, and @{link Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -46,11 +46,11 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Property; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.builder.ObjectNameFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -44,18 +44,18 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Node; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Property; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ExecutionService; import org.jbpm.api.service.ProcessInstanceService; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.builder.ObjectNameFactory; import org.jbpm.ri.runtime.TokenImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -48,12 +48,12 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; +import org.jbpm.preview.model.builder.ObjectNameFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertyImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertyImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertyImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -28,7 +28,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.api.model.preview.Property; +import org.jbpm.preview.model.Property; /** * A Property, which is used in the definition of attributes for a Process and common activity attributes Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -37,8 +37,8 @@ import javax.persistence.MapKey; import javax.persistence.OneToMany; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.PropertySupport; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.PropertySupport; /** * Basic property support Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -34,12 +34,12 @@ import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.client.preview.MessageListener; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.ReceiveTask; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.ReceiveTask; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.RuntimeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -32,9 +32,9 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.SendTask; -import org.jbpm.api.runtime.preview.ExecutionHandler; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.SendTask; +import org.jbpm.preview.runtime.ExecutionHandler; import org.jbpm.ri.runtime.MessageSender; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -31,8 +31,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Signal; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.ObjectNameFactory; /** * A Signal thrown by the ProcessEngine Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,17 +33,17 @@ import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; -import org.jbpm.api.client.preview.SignalListener; import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; -import org.jbpm.api.runtime.preview.SignalHandler; import org.jbpm.api.service.ExecutionService; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.builder.SingleOutFlowSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -46,15 +46,15 @@ import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.Task; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.InputSet; -import org.jbpm.api.model.preview.OutputSet; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.SignalHandler; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.model.InputSet; +import org.jbpm.preview.model.OutputSet; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.builder.SingleInFlowSupport; import org.jbpm.ri.model.builder.SingleOutFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -36,13 +36,13 @@ import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; -import org.jbpm.api.client.preview.MessageListener; -import org.jbpm.api.client.preview.UserTaskCallback; import org.jbpm.api.model.ProcessStructure; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.UserTask; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.client.UserTaskCallback; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.UserTask; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.runtime.MessageSender; import org.jbpm.ri.runtime.RuntimeContext; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -29,8 +29,8 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.WaitState; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.model.builder.SingleInFlowSupport; import org.jbpm.ri.model.builder.SingleOutFlowSupport; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -24,8 +24,8 @@ //$Id$ import org.jbpm.api.model.Event; -import org.jbpm.api.model.builder.preview.EventBuilder; -import org.jbpm.api.model.preview.Signal.SignalType; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.EventBuilder; import org.jbpm.ri.model.EventImpl; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.SignalImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GroupBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GroupBuilderImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GroupBuilderImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -23,9 +23,9 @@ //$Id$ -import org.jbpm.api.model.builder.preview.GroupBuilder; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Group.GroupType; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.model.builder.GroupBuilder; import org.jbpm.ri.model.GroupImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MessageBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MessageBuilderImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MessageBuilderImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,9 +25,9 @@ import javax.management.ObjectName; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Property; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.builder.MessageBuilder; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.ParticipantImpl; import org.jbpm.ri.model.PropertyImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -34,14 +34,14 @@ import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.builder.preview.EventBuilder; -import org.jbpm.api.model.builder.preview.GroupBuilder; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Assignment.AssignTime; -import org.jbpm.api.model.preview.Group.GroupType; -import org.jbpm.api.runtime.preview.ExecutionHandler; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.SignalHandler; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.model.builder.EventBuilder; +import org.jbpm.preview.model.builder.GroupBuilder; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.SignalHandler; import org.jbpm.ri.model.AssignmentImpl; import org.jbpm.ri.model.ComplexGatewayImpl; import org.jbpm.ri.model.EndEventImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SignalBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SignalBuilderImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SignalBuilderImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,9 +25,9 @@ import javax.management.ObjectName; -import org.jbpm.api.model.builder.preview.SignalBuilder; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.model.builder.SignalBuilder; import org.jbpm.ri.model.SignalImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,7 +26,7 @@ import org.jbpm.api.model.Task; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.preview.Property; +import org.jbpm.preview.model.Property; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.InputSetImpl; import org.jbpm.ri.model.MessageImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,9 +26,9 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Expression; import org.jbpm.api.model.Node; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Assignment.AssignTime; /** * An interceptor that invokes the ExecutionHandler.execute Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -31,8 +31,8 @@ import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.model.Node; -import org.jbpm.api.model.preview.Property; import org.jbpm.api.runtime.Attachments; +import org.jbpm.preview.model.Property; /** * An ExecutionContext that delegates to the current {@link Node} or {@link Process} for property rerieval. Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,7 +25,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.runtime.preview.SignalHandler; +import org.jbpm.preview.runtime.SignalHandler; /** * An interceptor that invokes the SignalHandler.throwExitSignal Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,8 +25,8 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.TokenExecutor; /** * An interceptor that invokes the FlowHandler.execute Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,7 +27,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.TokenExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MessageSender.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MessageSender.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MessageSender.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -28,12 +28,12 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Participant; -import org.jbpm.api.model.preview.Property; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.service.preview.MessageService; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Participant; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.service.MessageService; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.ParticipantImpl; import org.jbpm.ri.model.builder.MessageBuilderImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MutableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MutableToken.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MutableToken.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,8 +25,8 @@ import org.hibernate.Session; import org.jbpm.api.client.Token; -import org.jbpm.api.client.preview.PersistenceToken; import org.jbpm.api.model.SequenceFlow; +import org.jbpm.preview.client.PersistenceToken; /** * A mutable extension to the Token. Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/PersistenceSessionInterceptor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,7 +26,7 @@ import org.hibernate.Session; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeContext.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeContext.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeContext.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,7 +27,7 @@ import java.util.List; import org.jbpm.api.client.Token; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.TokenExecutor; /** * A runtime context that passes through a chain of interceptors. Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.client.Process; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.TokenExecutor; /** * A RuntimeProcess add runtime behaviour to the {@link Process} Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -25,7 +25,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.runtime.preview.SignalHandler; +import org.jbpm.preview.runtime.SignalHandler; /** * An interceptor that invokes the SignalHandler.throwEnterSignal Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -35,8 +35,8 @@ import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.runtime.preview.FlowHandler; -import org.jbpm.api.runtime.preview.TokenExecutor; +import org.jbpm.preview.runtime.FlowHandler; +import org.jbpm.preview.runtime.TokenExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -39,8 +39,8 @@ import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.runtime.Attachments.Key; -import org.jbpm.api.runtime.preview.TokenExecutor; import org.jbpm.api.service.ProcessInstanceService; +import org.jbpm.preview.runtime.TokenExecutor; import org.jbpm.ri.service.ProcessServiceImpl; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -30,10 +30,10 @@ import org.jbpm.api.Constants.TxType; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.preview.Group; -import org.jbpm.api.model.preview.Property; -import org.jbpm.api.model.preview.Group.GroupType; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.model.Group; +import org.jbpm.preview.model.Property; +import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -36,14 +36,14 @@ import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.model.Expression; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.Assignment.AssignTime; -import org.jbpm.api.model.preview.Signal.SignalType; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.runtime.preview.TokenExecutor; import org.jbpm.api.service.ExecutionService; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.preview.service.SignalService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.model.SequenceFlowImpl; import org.jbpm.ri.model.SignalImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -41,7 +41,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; import org.jbpm.api.service.Service; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.model.AbstractElementImpl; import org.jbpm.ri.model.ProcessDefinitionImpl; import org.jbpm.ri.model.ProcessImpl; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -34,7 +34,7 @@ import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.service.PersistenceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageBuilderServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageBuilderServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -24,9 +24,9 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.service.preview.MessageBuilderService; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.service.MessageBuilderService; import org.jbpm.ri.model.builder.MessageBuilderImpl; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -28,9 +28,9 @@ import org.hibernate.Transaction; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.preview.MessageListener; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.service.preview.MessageService; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.service.MessageService; import org.jbpm.ri.runtime.TransactionAssociation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,7 +33,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Process.ProcessStatus; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.api.service.preview.PersistenceService; +import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.runtime.NodeInterceptor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalBuilderServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalBuilderServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -24,9 +24,9 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.builder.preview.SignalBuilder; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.service.preview.SignalBuilderService; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.SignalBuilder; +import org.jbpm.preview.service.SignalBuilderService; import org.jbpm.ri.model.builder.SignalBuilderImpl; /** Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -24,7 +24,7 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.service.SignalService; /** * An implementation of the SignalService Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.preview.ComplexGateway; +import org.jbpm.preview.model.ComplexGateway; import org.jbpm.ri.model.ComplexGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,9 +27,9 @@ import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.ri.model.EndEventImpl; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.SignalImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.preview.InclusiveGateway; +import org.jbpm.preview.model.InclusiveGateway; import org.jbpm.ri.model.InclusiveGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/NodePersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,8 +27,8 @@ import org.hibernate.Session; import org.jbpm.api.model.Node; -import org.jbpm.api.service.preview.PersistenceService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.service.PersistenceService; import org.jbpm.ri.service.HibernatePersistenceServiceImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.preview.ParallelGateway; +import org.jbpm.preview.model.ParallelGateway; import org.jbpm.ri.model.ParallelGatewayImpl; /** Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -31,9 +31,9 @@ import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Task; -import org.jbpm.api.service.preview.PersistenceService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.api.test.ProcessCatalog; +import org.jbpm.preview.service.PersistenceService; /** * Test the PersistenceService Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,9 +33,9 @@ import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Task; import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.preview.PersistenceService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.api.test.ProcessCatalog; +import org.jbpm.preview.service.PersistenceService; /** * Test the PersistenceService Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -27,9 +27,9 @@ import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Event.EventDetailType; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; -import org.jbpm.api.model.preview.Signal.SignalType; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.Signal.SignalType; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.SignalImpl; import org.jbpm.ri.model.StartEventImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,10 +33,10 @@ import org.jbpm.api.model.Task; import org.jbpm.api.model.SequenceFlow.ConditionType; import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.preview.Assignment; -import org.jbpm.api.model.preview.InputSet; -import org.jbpm.api.model.preview.OutputSet; -import org.jbpm.api.model.preview.Assignment.AssignTime; +import org.jbpm.preview.model.Assignment; +import org.jbpm.preview.model.InputSet; +import org.jbpm.preview.model.OutputSet; +import org.jbpm.preview.model.Assignment.AssignTime; import org.jbpm.ri.model.AssignmentImpl; import org.jbpm.ri.model.ExpressionImpl; import org.jbpm.ri.model.InputSetImpl; Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,8 +26,8 @@ import javax.management.ObjectName; import org.jbpm.api.model.Task.TaskType; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.UserTask; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.UserTask; import org.jbpm.ri.model.MessageImpl; import org.jbpm.ri.model.UserTaskImpl; Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -33,8 +33,8 @@ import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; -import org.jbpm.api.model.preview.Assignment.AssignTime; import org.jbpm.api.service.ProcessBuilderService; +import org.jbpm.preview.model.Assignment.AssignTime; /** * Test the Airticket sample application Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -16,17 +16,17 @@ import org.jboss.bpm.samples.airticket.client.OrderMessage; import org.jboss.bpm.samples.airticket.client.RequestMessage; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.MessageListener; -import org.jbpm.api.client.preview.ProcessAsync; -import org.jbpm.api.client.preview.SignalListener; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.Signal; import org.jbpm.api.service.ProcessInstanceService; -import org.jbpm.api.service.preview.MessageBuilderService; -import org.jbpm.api.service.preview.MessageService; -import org.jbpm.api.service.preview.SignalService; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.SignalListener; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.Signal; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.service.MessageBuilderService; +import org.jbpm.preview.service.MessageService; +import org.jbpm.preview.service.SignalService; import com.google.gwt.user.server.rpc.RemoteServiceServlet; Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-13 17:29:49 UTC (rev 2917) +++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-14 07:49:48 UTC (rev 2918) @@ -26,17 +26,17 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.MessageListener; -import org.jbpm.api.client.preview.ProcessAsync; -import org.jbpm.api.client.preview.UserTaskCallback; -import org.jbpm.api.model.builder.preview.MessageBuilder; -import org.jbpm.api.model.builder.preview.ObjectNameFactory; -import org.jbpm.api.model.preview.Message; -import org.jbpm.api.model.preview.UserTask; import org.jbpm.api.runtime.Attachments; -import org.jbpm.api.service.preview.MessageBuilderService; -import org.jbpm.api.service.preview.MessageService; import org.jbpm.api.test.CTSTestCase; +import org.jbpm.preview.client.MessageListener; +import org.jbpm.preview.client.ProcessAsync; +import org.jbpm.preview.client.UserTaskCallback; +import org.jbpm.preview.model.Message; +import org.jbpm.preview.model.UserTask; +import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.preview.model.builder.ObjectNameFactory; +import org.jbpm.preview.service.MessageBuilderService; +import org.jbpm.preview.service.MessageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory;

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2917 - in jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704: jpdl/jar/src/test/java/org/jbpm/db and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-13 12:29:49 -0500 (Thu, 13 Nov 2008) New Revision: 2917 Added: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/Semaphore.java Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/EventCallback.java jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java Log: removed dependencies on jdk 5 apis Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/EventCallback.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/EventCallback.java 2008-11-13 17:00:09 UTC (rev 2916) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/EventCallback.java 2008-11-13 17:29:49 UTC (rev 2917) @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.concurrent.Semaphore; -import java.util.concurrent.TimeUnit; import javax.transaction.Status; import javax.transaction.Synchronization; @@ -109,7 +107,7 @@ log.debug("waiting for " + event); Semaphore eventSemaphore = getEventSemaphore(event); try { - if (eventSemaphore.tryAcquire(timeout, TimeUnit.MILLISECONDS)) { + if (eventSemaphore.tryAcquire(timeout)) { log.debug("received '" + event + "' notification"); } else { @@ -143,4 +141,4 @@ } } } -} \ No newline at end of file +} Added: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/Semaphore.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/Semaphore.java (rev 0) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/test/java/org/jbpm/enterprise/test/Semaphore.java 2008-11-13 17:29:49 UTC (rev 2917) @@ -0,0 +1,44 @@ +package org.jbpm.enterprise.test; + +/** + * Trivial semaphore which borrows the interface of java.util.concurrent.Semaphore. + */ +class Semaphore { + + private int permits; + + public Semaphore(int permits) { + this.permits = permits; + } + + public void release() { + release(1); + } + + public synchronized void release(int permits) { + this.permits += permits; + notifyAll(); + } + + public boolean tryAcquire(long timeout) throws InterruptedException { + return tryAcquire(1, timeout); + } + + public synchronized boolean tryAcquire(int permits, long timeout) throws InterruptedException { + long startTime = System.currentTimeMillis(); + while (this.permits < permits && System.currentTimeMillis() - startTime < timeout) { + wait(timeout); + } + if (this.permits >= permits) { + this.permits -= permits; + return true; + } + return false; + } + + public synchronized int drainPermits() { + int permits = this.permits; + this.permits = 0; + return permits; + } +} Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java 2008-11-13 17:00:09 UTC (rev 2916) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java 2008-11-13 17:29:49 UTC (rev 2917) @@ -67,12 +67,12 @@ initializeMembers(); log.debug(""); - log.debug("### starting " + this.getClass().getCanonicalName() + "." + log.debug("### starting " + this.getClass().getName() + "." + getName() + " ####################################################"); } public void tearDown() throws Exception { - log.debug("### " + this.getClass().getCanonicalName() + "." + getName() + log.debug("### " + this.getClass().getName() + "." + getName() + " done ####################################################"); resetMembers(); closeJbpmContext();

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2916 - in projects/spec/trunk/modules: cts/src/test/java/org/jbpm/test/cts/service/process and 3 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-13 12:00:09 -0500 (Thu, 13 Nov 2008) New Revision: 2916 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java Log: Add notion of parent/child tokens Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -23,6 +23,8 @@ // $Id$ +import java.util.Set; + import org.jbpm.api.model.Node; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; @@ -52,6 +54,11 @@ ProcessEngine getProcessEngine(); /** + * Get the associated {@link Process} + */ + Process getProcess(); + + /** * Get the unique token identity */ String getTokenID(); @@ -60,11 +67,6 @@ * Get the token status */ TokenStatus getTokenStatus(); - - /** - * Get the associated {@link Process} - */ - Process getProcess(); /** * Get the associated {@link Attachments} @@ -82,7 +84,24 @@ Node getCurrentNode(); /** + * Get the root token that his Token is associated with + */ + Token getRootToken(); + + /** + * Get the parent token that his Token is associated with + * @return null if this is the root token + */ + Token getParentToken(); + + /** + * Get the set of child tokens + * @return An empty set if there are none + */ + Set<Token> getChildTokens(); + + /** * Signal the Token, which takes it to the next wait state */ - Token signal(); + void signal(); } \ No newline at end of file Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -27,9 +27,9 @@ import javax.management.ObjectName; +import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.api.test.CTSTestCase; @@ -66,7 +66,7 @@ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); ProcessInstanceService procService = engine.getService(ProcessInstanceService.class); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + Process proc = procDef.newInstance(); assertNotNull("Process not null", proc); assertNull("Process not automatically registered", procService.getProcess(proc.getKey())); assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -25,8 +25,8 @@ import javax.management.ObjectName; +import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; @@ -47,7 +47,7 @@ ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); ProcessDefinition procDef = getProcessDefinition(); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + Process proc = procDef.newInstance(); assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); assertNull("Process not registered automatically", procService.getProcess(proc.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -25,10 +25,10 @@ import java.io.IOException; +import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; @@ -45,24 +45,30 @@ public void testBasicWaitState() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessAsync proc = (ProcessAsync)procDef.newInstance(); + Process proc = procDef.newInstance(); // Start the Process - Token tok = proc.startProcess(); - String nodeName = tok.getCurrentNode().getName(); - assertEquals(TokenStatus.Suspended, tok.getTokenStatus()); + Token token = proc.startProcess(); + String nodeName = token.getCurrentNode().getName(); + assertEquals(TokenStatus.Suspended, token.getTokenStatus()); assertEquals("TaskA", nodeName); - nodeName = tok.signal().getCurrentNode().getName(); - assertEquals(TokenStatus.Suspended, tok.getTokenStatus()); + token.signal(); + + nodeName = token.getCurrentNode().getName(); + assertEquals(TokenStatus.Suspended, token.getTokenStatus()); assertEquals("TaskB", nodeName); - nodeName = tok.signal().getCurrentNode().getName(); - assertEquals(TokenStatus.Suspended, tok.getTokenStatus()); + token.signal(); + + nodeName = token.getCurrentNode().getName(); + assertEquals(TokenStatus.Suspended, token.getTokenStatus()); assertEquals("TaskC", nodeName); - nodeName = tok.signal().getCurrentNode().getName(); - assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + token.signal(); + + nodeName = token.getCurrentNode().getName(); + assertEquals(TokenStatus.Destroyed, token.getTokenStatus()); assertEquals("End", nodeName); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -270,7 +270,10 @@ token.setLastFlow(new InitialFlow(start)); token.setTokenStatus(TokenStatus.Started); - return token.signal(); + // Signal the initial token + token.signal(); + + return token; } public ObjectName startProcessAsync() Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -23,6 +23,8 @@ //$Id$ +import java.util.Set; + import org.hibernate.Session; import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessEngine; @@ -118,6 +120,24 @@ } @Override + public Set<Token> getChildTokens() + { + return delegateToken.getChildTokens(); + } + + @Override + public Token getParentToken() + { + return delegateToken.getParentToken(); + } + + @Override + public Token getRootToken() + { + return delegateToken.getRootToken(); + } + + @Override public Session getSession() { return delegateToken.getSession(); @@ -130,9 +150,9 @@ } @Override - public Token signal() + public void signal() { - return delegateToken.signal(); + delegateToken.signal(); } public String toString() Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-13 16:42:27 UTC (rev 2915) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-13 17:00:09 UTC (rev 2916) @@ -23,6 +23,10 @@ //$Id$ +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import org.hibernate.Session; import org.jboss.util.id.UID; import org.jbpm.api.client.Process; @@ -59,6 +63,9 @@ private TokenStatus status; private Process proc; private Session session; + + private Token parentToken; + private Set<Token> childTokens = new HashSet<Token>(); /** * Construct a Token with given {@link Attachments} @@ -102,6 +109,47 @@ } @Override + public Token getRootToken() + { + Token token = this; + while (token.getParentToken() != null) + { + token = token.getParentToken(); + } + return token; + } + + @Override + public Token getParentToken() + { + return parentToken; + } + + void setParentToken(Token parentToken) + { + this.parentToken = parentToken; + } + + @Override + public Set<Token> getChildTokens() + { + return Collections.unmodifiableSet(childTokens); + } + + public void addChildToken(TokenImpl childTok) + { + childTok.setParentToken(this); + childTokens.add(childTok); + } + + + public void removeChildToken(TokenImpl childTok) + { + if (childTokens.remove(childTok)) + childTok.setParentToken(null); + } + + @Override public Attachments getAttachments() { return att; @@ -127,7 +175,7 @@ } @Override - public Token signal() + public void signal() { Node node = getCurrentNode(); if (node == null) @@ -163,8 +211,6 @@ // Call the interceptor chain rtContext.next(); } - - return this; } private boolean continueTokenExecution()

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2915 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/client/preview and 26 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-13 11:42:27 -0500 (Thu, 13 Nov 2008) New Revision: 2915 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/preview/ProcessAsync.java Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java Log: Move process async to preview Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Process.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -23,8 +23,6 @@ //$Id$ -import javax.management.ObjectName; - import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; @@ -65,31 +63,7 @@ Token startProcess(); /** - * Start the process, with a given execution context + * Start the process, with a given context data */ Token startProcess(Attachments att); - - /** - * Start the process asynchronously - */ - ObjectName startProcessAsync(); - - /** - * Start the process asynchronously, with a given execution context - */ - ObjectName startProcessAsync(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. - */ - ProcessStatus 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. - */ - ProcessStatus waitForEnd(long timeout); } \ No newline at end of file Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/preview/ProcessAsync.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/preview/ProcessAsync.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/preview/ProcessAsync.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.api.client.preview; + +//$Id$ + +import javax.management.ObjectName; + +import org.jbpm.api.client.Process; +import org.jbpm.api.runtime.Attachments; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessAsync extends Process +{ + /** + * Start the process asynchronously + */ + ObjectName startProcessAsync(); + + /** + * Start the process asynchronously, with a given context data + */ + ObjectName startProcessAsync(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. + */ + ProcessStatus 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. + */ + ProcessStatus waitForEnd(long timeout); +} \ No newline at end of file Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/preview/ProcessAsync.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.GatewayBuilder; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -64,7 +64,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -79,7 +79,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -27,9 +27,9 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.api.test.CTSTestCase; @@ -66,7 +66,7 @@ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); ProcessInstanceService procService = engine.getService(ProcessInstanceService.class); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); assertNotNull("Process not null", proc); assertNull("Process not automatically registered", procService.getProcess(proc.getKey())); assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessDefinitionService; @@ -47,7 +47,7 @@ ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); ProcessDefinition procDef = getProcessDefinition(); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); assertNull("Process not registered automatically", procService.getProcess(proc.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,10 +25,10 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; @@ -45,7 +45,7 @@ public void testBasicWaitState() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the Process Token tok = proc.startProcess(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.GatewayBuilder; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -64,7 +64,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -79,7 +79,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.GatewayBuilder; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -63,7 +63,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -28,8 +28,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.preview.Signal; @@ -49,7 +49,7 @@ public void testParallelSplit() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.preview.Signal; import org.jbpm.api.model.preview.Signal.SignalType; @@ -46,7 +46,7 @@ { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the Process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.preview.Signal; @@ -46,7 +46,7 @@ public void testSimpleMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; @@ -50,7 +50,7 @@ public void testParallelMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; @@ -50,7 +50,7 @@ public void testCaseProperties() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; @@ -51,7 +51,7 @@ public void testTaskDataRead() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.preview.MessageBuilder; @@ -46,7 +46,7 @@ public void testStart() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the process BasicAttachments att = new BasicAttachments(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.preview.Signal; @@ -47,7 +47,7 @@ public void testMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.preview.Signal; @@ -46,7 +46,7 @@ public void testSimpleMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.GatewayBuilder; @@ -49,7 +49,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -63,7 +63,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; @@ -50,7 +50,7 @@ public void testParallelMerge() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Start the process proc.startProcessAsync(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -28,8 +28,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.preview.Signal; @@ -49,7 +49,7 @@ public void testParallelSplit() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; @@ -51,7 +51,7 @@ public void testValidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("frog", "kermit"); @@ -66,7 +66,7 @@ public void testInvalidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("pig", "piggy"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; @@ -51,7 +51,7 @@ public void testValidProps() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; @@ -52,7 +52,7 @@ public void testActivityPropertyRead() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,8 +25,8 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; @@ -57,7 +57,7 @@ public void testProcessProperties() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -28,8 +28,8 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.client.preview.SignalListener; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; @@ -63,7 +63,7 @@ ProcessDefinitionService procDefService = ProcessDefinitionService.locateProcessDefinitionService(); procDefService.registerProcessDefinition(procDef); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); try { proc.startProcessAsync(); @@ -81,7 +81,7 @@ // Get the just started process ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); Set<ObjectName> procIDs = procService.getProcesses("StartEventSignal", null); - proc = procService.getProcess(procIDs.iterator().next()); + proc = (ProcessAsync) procService.getProcess(procIDs.iterator().next()); // Wait for the process to end if (proc != null) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,9 +25,9 @@ import java.io.IOException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.TaskBuilder; @@ -49,7 +49,7 @@ public void testExecutionHandler() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(5000); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -28,8 +28,8 @@ import javax.management.ObjectName; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.client.preview.SignalListener; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Task.TaskType; @@ -74,7 +74,7 @@ public void testUnregisteredProcess() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); MessageService msgService = MessageService.locateMessageService(); try @@ -94,7 +94,7 @@ ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); ObjectName procID = procService.registerProcess(proc); try @@ -119,7 +119,7 @@ public void testSuspendedToken() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - final Process proc = procDef.newInstance(); + final ProcessAsync proc = (ProcessAsync)procDef.newInstance(); SignalListener sigListener = new SignalListener() { private boolean sendMessage = true; Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -27,8 +27,8 @@ import java.util.List; import org.jbpm.api.InvalidProcessException; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.model.builder.preview.MessageBuilder; @@ -48,7 +48,7 @@ public void testSendTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "bar"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.List; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.client.preview.UserTaskCallback; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Task.TaskType; @@ -50,7 +50,7 @@ public void testUserTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, "UserTask"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -29,9 +29,9 @@ import javax.management.ObjectName; import org.jbpm.api.Constants; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.preview.MessageListener; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; @@ -58,7 +58,7 @@ public void testUserTask() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); // Register the process - this assigns the procID ProcessInstanceService procService = ProcessInstanceService.locateProcessService(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -29,9 +29,9 @@ import org.hibernate.Transaction; import org.jbpm.api.Constants; import org.jbpm.api.Constants.TxType; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.Token; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Node; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; @@ -66,7 +66,7 @@ assertSame("Group same", group, groupA); assertSame("Group same", group, groupB); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); proc.startProcessAsync(); proc.waitForEnd(); @@ -78,7 +78,7 @@ public void testRollback() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment(Boolean.class, "rollback", Boolean.TRUE); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -44,6 +44,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.model.Node; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Event.EventDetailType; @@ -66,7 +67,7 @@ * @since 08-Jul-2008 */ @Entity(name = "BPMProcess") -public class ProcessImpl extends AbstractElementImpl implements Process +public class ProcessImpl extends AbstractElementImpl implements ProcessAsync { private static final long serialVersionUID = 1L; Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -15,9 +15,9 @@ import org.jboss.bpm.samples.airticket.client.OfferMessage; import org.jboss.bpm.samples.airticket.client.OrderMessage; import org.jboss.bpm.samples.airticket.client.RequestMessage; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.preview.MessageListener; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.client.preview.SignalListener; import org.jbpm.api.model.builder.preview.MessageBuilder; import org.jbpm.api.model.builder.preview.ObjectNameFactory; @@ -65,7 +65,7 @@ System.out.println("Create new Process"); AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID); ProcessDefinition procDef = procBuilder.buildProcessDefinition(); - Process proc = procDef.newInstance(); + ProcessAsync proc = (ProcessAsync)procDef.newInstance(); procService.registerProcess(proc); procID = proc.startProcessAsync(); httpSession.setAttribute("procID", procID); Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-13 15:00:05 UTC (rev 2914) +++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-13 16:42:27 UTC (rev 2915) @@ -25,9 +25,9 @@ import javax.management.ObjectName; -import org.jbpm.api.client.Process; import org.jbpm.api.client.ProcessDefinition; import org.jbpm.api.client.preview.MessageListener; +import org.jbpm.api.client.preview.ProcessAsync; import org.jbpm.api.client.preview.UserTaskCallback; import org.jbpm.api.model.builder.preview.MessageBuilder; import org.jbpm.api.model.builder.preview.ObjectNameFactory; @@ -53,7 +53,7 @@ private MessageService messageManager = MessageService.locateMessageService(); private AirticketMessageListener msgListener; - private Process proc; + private ProcessAsync proc; public void testValidData() throws Exception { @@ -61,7 +61,7 @@ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition()); // Create the process instance - proc = procDef.newInstance(); + proc = (ProcessAsync)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER); @@ -87,7 +87,7 @@ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition()); // Create the process instance - proc = procDef.newInstance(); + proc = (ProcessAsync)procDef.newInstance(); // Attach the callback to the UserTask UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);

17 years, 5 months

1
0
0 / 0

← Newer
1
...
21
22
23
24
25
26
27
...
43
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 November 2008