November 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r2974 - in projects/spec/trunk/modules/dialects: jpdl32 and 2 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-18 02:40:39 -0500 (Tue, 18 Nov 2008) New Revision: 2974 Modified: projects/spec/trunk/modules/dialects/api10/pom.xml projects/spec/trunk/modules/dialects/jpdl32/pom.xml projects/spec/trunk/modules/dialects/stp/pom.xml projects/spec/trunk/modules/dialects/xpdl21/pom.xml Log: Set relativePath to parent pom Modified: projects/spec/trunk/modules/dialects/api10/pom.xml =================================================================== --- projects/spec/trunk/modules/dialects/api10/pom.xml 2008-11-18 07:28:49 UTC (rev 2973) +++ projects/spec/trunk/modules/dialects/api10/pom.xml 2008-11-18 07:40:39 UTC (rev 2974) @@ -23,5 +23,6 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-dialects</artifactId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> </project> \ No newline at end of file Modified: projects/spec/trunk/modules/dialects/jpdl32/pom.xml =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/pom.xml 2008-11-18 07:28:49 UTC (rev 2973) +++ projects/spec/trunk/modules/dialects/jpdl32/pom.xml 2008-11-18 07:40:39 UTC (rev 2974) @@ -23,6 +23,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-dialects</artifactId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> </project> \ No newline at end of file Modified: projects/spec/trunk/modules/dialects/stp/pom.xml =================================================================== --- projects/spec/trunk/modules/dialects/stp/pom.xml 2008-11-18 07:28:49 UTC (rev 2973) +++ projects/spec/trunk/modules/dialects/stp/pom.xml 2008-11-18 07:40:39 UTC (rev 2974) @@ -22,6 +22,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-dialects</artifactId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> </project> \ No newline at end of file Modified: projects/spec/trunk/modules/dialects/xpdl21/pom.xml =================================================================== --- projects/spec/trunk/modules/dialects/xpdl21/pom.xml 2008-11-18 07:28:49 UTC (rev 2973) +++ projects/spec/trunk/modules/dialects/xpdl21/pom.xml 2008-11-18 07:40:39 UTC (rev 2974) @@ -23,5 +23,6 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-dialects</artifactId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> </project> \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2973 - projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-18 02:28:49 -0500 (Tue, 18 Nov 2008) New Revision: 2973 Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ Log: Rename preview to incubator Property changes on: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore - cts pattern preview + cts pattern incubator

17 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-18 02:25:07 -0500 (Tue, 18 Nov 2008) New Revision: 2972 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Assignment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ComplexGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EndEventExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EventExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Gate.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/GatewayExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Group.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InclusiveGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InputSet.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Message.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/NodeExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/OutputSet.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ParallelGateway.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Participant.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessDefinitionExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessStructureExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Property.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/PropertySupport.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ReceiveTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/SendTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Signal.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/StartEventExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/TaskExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/UserTask.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/endevent/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/executioncontext/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/exclusive/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/process/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/startevent/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/java/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/receive/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/send/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/ Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/ Modified: projects/spec/trunk/modules/api/pom.xml 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/ProcessCatalogExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/MessageListener.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/PersistenceToken.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/SignalListener.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/UserTaskCallback.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/EventBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/GroupBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/MessageBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/SignalBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/TaskBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/BasicNodeHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/ExecutionHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/FlowHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/NodeHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/SignalHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/TokenExecutor.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/DeploymentService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/SignalBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/SignalService.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/endevent/EndEventMessageTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/executioncontext/ExecutionContextTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeInputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeOutputSetTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodePropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/process/ProcessPropertyTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalMultithreadTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/startevent/StartEventSignalTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/java/JavaTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/receive/ReceiveTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/send/SendTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskCallbackTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredTest.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/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshallerExt.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/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java projects/spec/trunk/modules/ri/pom.xml 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/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/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/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/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/ProcessBuilderServiceImpl.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/ParallelGatewayPersistenceTest.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: Rename preview to incubator Modified: projects/spec/trunk/modules/api/pom.xml =================================================================== --- projects/spec/trunk/modules/api/pom.xml 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/api/pom.xml 2008-11-18 07:25:07 UTC (rev 2972) @@ -80,7 +80,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <show>public</show> - <excludePackageNames>*.internal:*.preview:*.test</excludePackageNames> + <excludePackageNames>*.internal:*.incubator:*.test</excludePackageNames> </configuration> </plugin> </plugins> 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -41,15 +41,15 @@ import org.jbpm.api.service.DialectHandler; import org.jbpm.api.service.DialectHandlerService; import org.jbpm.api.service.ProcessDefinitionService; -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.jbpm.incubator.client.MessageListener; +import org.jbpm.incubator.client.SignalListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.model.builder.SignalBuilder; +import org.jbpm.incubator.service.MessageService; +import org.jbpm.incubator.service.SignalBuilderService; +import org.jbpm.incubator.service.SignalService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: 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 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalogExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,14 +30,14 @@ 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; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.EndEventExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.ProcessDefinitionExt; +import org.jbpm.incubator.model.StartEventExt; +import org.jbpm.incubator.model.TaskExt; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * A catalog of CTS test processes Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client) Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.client; import java.io.BufferedReader; import java.io.ByteArrayInputStream; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/MessageListener.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/MessageListener.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/MessageListener.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,11 +19,11 @@ * 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; +package org.jbpm.incubator.client; import javax.management.ObjectName; -import org.jbpm.preview.model.Message; +import org.jbpm.incubator.model.Message; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/PersistenceToken.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/PersistenceToken.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/PersistenceToken.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.client; // $Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/ProcessExt.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.client; //$Id$ @@ -27,7 +27,7 @@ import org.jbpm.api.model.Process; import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.ProcessStructureExt; +import org.jbpm.incubator.model.ProcessStructureExt; /** * A Process is any Activity performed within a company or organization. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/SignalListener.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/SignalListener.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/SignalListener.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,12 +19,12 @@ * 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; +package org.jbpm.incubator.client; //$Id$ -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.service.SignalService; /** * A signal listener that can be registered with the {@link SignalService} Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/UserTaskCallback.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/UserTaskCallback.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/UserTaskCallback.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.client; //$Id$ @@ -29,11 +29,11 @@ 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.service.MessageBuilderService; -import org.jbpm.preview.service.MessageService; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.UserTask; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.service.MessageBuilderService; +import org.jbpm.incubator.service.MessageService; /** * A callback that can be attached to a {@link UserTask} to facilitate message handling; Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Assignment.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Assignment.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Assignment.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Assignment.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.incubator.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(); +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ComplexGateway.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ComplexGateway.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ComplexGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ComplexGateway.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EndEventExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EndEventExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EndEventExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EndEventExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EventExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/EventExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EventExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/EventExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.model; + +import org.jbpm.api.model.Event; + +//$Id$ + + +/** + * An Event is something that “happens” during the course of a business process. + * <p/> + * 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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Gate.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Gate.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Gate.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Gate.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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/incubator/model/GatewayExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/GatewayExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/GatewayExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/GatewayExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Group.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Group.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Group.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Group.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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(); +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InclusiveGateway.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InclusiveGateway.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InclusiveGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InclusiveGateway.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InputSet.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/InputSet.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InputSet.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/InputSet.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 +{ +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Message.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Message.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Message.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Message.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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(); +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/NodeExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/NodeExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/NodeExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/NodeExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.model; + +//$Id$ + +import java.util.List; + +import org.jbpm.api.model.Node; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/OutputSet.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/OutputSet.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/OutputSet.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/OutputSet.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 +{ +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ParallelGateway.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ParallelGateway.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ParallelGateway.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ParallelGateway.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Participant.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Participant.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Participant.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Participant.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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(); +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessDefinitionExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessDefinitionExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessDefinitionExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessDefinitionExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessStructureExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ProcessStructureExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessStructureExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ProcessStructureExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Property.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Property.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Property.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Property.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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(); +} Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/PropertySupport.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/PropertySupport.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/PropertySupport.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/PropertySupport.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ReceiveTask.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/ReceiveTask.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ReceiveTask.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/ReceiveTask.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/SendTask.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/SendTask.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/SendTask.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/SendTask.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Signal.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/Signal.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Signal.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/Signal.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/StartEventExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/StartEventExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/StartEventExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/StartEventExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.model; + +import org.jbpm.api.model.StartEvent; + + + +// $Id$ + +/** + * A Start Event indicates where a particular Process will start. <p/> 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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/TaskExt.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/TaskExt.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/TaskExt.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/TaskExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/UserTask.java (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/UserTask.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/UserTask.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/UserTask.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.incubator.model; + +import org.jbpm.api.model.Task; +import org.jbpm.incubator.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 Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder) Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/EventBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/EventBuilder.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/EventBuilder.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,11 +19,11 @@ * 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; +package org.jbpm.incubator.model.builder; //$Id$ -import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.incubator.model.Signal.SignalType; /** * The EventBuilder can be used to build an Event dynamically. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/GroupBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/GroupBuilder.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/GroupBuilder.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,12 +19,12 @@ * 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; +package org.jbpm.incubator.model.builder; //$Id$ -import org.jbpm.preview.model.Group; -import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Group.GroupType; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/MessageBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/MessageBuilder.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/MessageBuilder.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,13 +19,13 @@ * 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; +package org.jbpm.incubator.model.builder; //$Id$ import javax.management.ObjectName; -import org.jbpm.preview.model.Message; +import org.jbpm.incubator.model.Message; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/ProcessBuilderExt.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.model.builder; //$Id$ @@ -31,13 +31,13 @@ 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.Group.GroupType; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Group.GroupType; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.runtime.SignalHandler; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/SignalBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/SignalBuilder.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/SignalBuilder.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,14 +19,14 @@ * 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; +package org.jbpm.incubator.model.builder; //$Id$ import javax.management.ObjectName; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; /** Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/TaskBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/model/builder/TaskBuilder.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/TaskBuilder.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,12 +19,12 @@ * 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; +package org.jbpm.incubator.model.builder; //$Id$ import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Message; +import org.jbpm.incubator.model.Message; /** * The TaskBuilder can be used to build a Task dynamically. Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime) Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/BasicNodeHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/BasicNodeHandler.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/BasicNodeHandler.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.runtime; import org.jbpm.api.model.Node; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/ExecutionHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/ExecutionHandler.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/ExecutionHandler.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.runtime; //$Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/FlowHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/FlowHandler.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/FlowHandler.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.runtime; // $Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/NodeHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/NodeHandler.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/NodeHandler.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.runtime; import java.io.Serializable; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/SignalHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/SignalHandler.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/SignalHandler.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,14 +19,14 @@ * 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; +package org.jbpm.incubator.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; +import org.jbpm.incubator.model.Signal; /** * The {@link ProcessEngine} invokes the SignalHandler on a {@link Node} Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/TokenExecutor.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/runtime/TokenExecutor.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/runtime/TokenExecutor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.runtime; //$Id$ Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service (from rev 2969, projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service) Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/DeploymentService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/DeploymentService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/DeploymentService.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,14 +19,14 @@ * 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; +package org.jbpm.incubator.service; //$Id$ import javax.management.ObjectName; import org.jbpm.api.service.Service; -import org.jbpm.preview.client.Deployment; +import org.jbpm.incubator.client.Deployment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/ExecutionService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.service; // $Id$ Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageBuilderService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageBuilderService.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,15 +19,15 @@ * 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; +package org.jbpm.incubator.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; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; /** * The MessageBuilder can be used to build a {@link Message} dynamically. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.service; //$Id$ @@ -39,9 +39,9 @@ import org.jbpm.api.model.Task; import org.jbpm.api.service.AbstractService; import org.jbpm.api.service.ProcessService; -import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Participant; +import org.jbpm.incubator.client.MessageListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Participant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/SignalBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalBuilderService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/SignalBuilderService.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,15 +19,15 @@ * 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; +package org.jbpm.incubator.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; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.SignalBuilder; /** * The SignalBuilder can be used to build a {@link Signal} dynamically. Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/SignalService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/SignalService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/SignalService.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * 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; +package org.jbpm.incubator.service; //$Id$ @@ -30,8 +30,8 @@ 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.jbpm.incubator.client.SignalListener; +import org.jbpm.incubator.model.Signal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/endevent (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/endevent/EndEventMessageTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/endevent/EndEventMessageTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/endevent/EndEventMessageTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.endevent; +package org.jbpm.test.incubator.endevent; // $Id$ @@ -30,10 +30,10 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Test end event with message result Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/executioncontext (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/executioncontext) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/executioncontext/ExecutionContextTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/executioncontext/ExecutionContextTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/executioncontext/ExecutionContextTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.executioncontext; +package org.jbpm.test.incubator.executioncontext; // $Id$ Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/exclusive (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.gateway.exclusive; +package org.jbpm.test.incubator.gateway.exclusive; // $Id$ @@ -30,9 +30,9 @@ import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Exclusive data-based gateway that has multiple incoming sequence flows. The first token arriving from one of the Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.gateway.inclusive; +package org.jbpm.test.incubator.gateway.inclusive; // $Id$ @@ -30,9 +30,9 @@ import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.gateway.inclusive; +package org.jbpm.test.incubator.gateway.inclusive; // $Id$ @@ -33,9 +33,9 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Inclusive gateway that has conditional outgoing sequence flows. Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.gateway.parallel; +package org.jbpm.test.incubator.gateway.parallel; // $Id$ @@ -31,11 +31,11 @@ import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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/incubator/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.gateway.parallel; +package org.jbpm.test.incubator.gateway.parallel; // $Id$ @@ -32,10 +32,10 @@ import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -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; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Parallel gateway that has uncontrolled outgoing sequence flows. All of them are taken, which leads to parallel paths Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeInputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeInputSetTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeInputSetTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.node; +package org.jbpm.test.incubator.node; // $Id$ @@ -30,11 +30,11 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; -import org.jbpm.preview.model.builder.TaskBuilder; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; /** * 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/incubator/node/NodeOutputSetTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodeOutputSetTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodeOutputSetTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.node; +package org.jbpm.test.incubator.node; // $Id$ @@ -29,11 +29,11 @@ import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; -import org.jbpm.preview.model.builder.TaskBuilder; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; /** * 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/incubator/node/NodePropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/node/NodePropertyTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/node/NodePropertyTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.node; +package org.jbpm.test.incubator.node; // $Id$ @@ -30,12 +30,12 @@ import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; -import org.jbpm.preview.model.builder.TaskBuilder; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; /** * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/process (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/process/ProcessPropertyTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/process/ProcessPropertyTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/process/ProcessPropertyTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.process; +package org.jbpm.test.incubator.process; // $Id$ @@ -30,11 +30,11 @@ import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks, Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalMultithreadTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalMultithreadTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalMultithreadTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,15 +19,15 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.service.signal; +package org.jbpm.test.incubator.service.signal; // $Id$ 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; +import org.jbpm.incubator.client.SignalListener; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.service.SignalService; /** * Test the ProcessManager Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/service/signal/SignalServiceTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/service/signal/SignalServiceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,16 +19,16 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.service.signal; +package org.jbpm.test.incubator.service.signal; // $Id$ import java.util.List; 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; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.service.SignalService; /** * Test the SignalService Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/startevent (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/startevent/StartEventSignalTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/startevent/StartEventSignalTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.startevent; +package org.jbpm.test.incubator.startevent; // $Id$ @@ -35,17 +35,17 @@ import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; import org.jbpm.api.test.CTSTestCase; -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.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; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.client.SignalListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.model.builder.EventBuilder; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; +import org.jbpm.incubator.service.SignalService; /** * Test start event with signal trigger Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/java (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/java/JavaTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/java/JavaTaskTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/java/JavaTaskTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.task.java; +package org.jbpm.test.incubator.task.java; // $Id$ @@ -31,12 +31,12 @@ import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Assignment.AssignTime; -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; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; +import org.jbpm.incubator.runtime.BasicNodeHandler; +import org.jbpm.incubator.runtime.ExecutionHandler; /** * Test ExecutionHandler attached to Task Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/receive (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/receive/ReceiveTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.task.receive; +package org.jbpm.test.incubator.task.receive; // $Id$ @@ -35,17 +35,17 @@ import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; import org.jbpm.api.test.CTSTestCase; -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.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.service.MessageBuilderService; -import org.jbpm.preview.service.MessageService; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.client.SignalListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.model.builder.EventBuilder; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.service.MessageBuilderService; +import org.jbpm.incubator.service.MessageService; +import org.jbpm.incubator.service.SignalService; /** * Test Receive Task Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/send (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/send/SendTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/send/SendTaskTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/send/SendTaskTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.task.send; +package org.jbpm.test.incubator.task.send; // $Id$ @@ -32,10 +32,10 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Test Send Task Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskCallbackTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskCallbackTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.task.user; +package org.jbpm.test.incubator.task.user; // $Id$ @@ -33,11 +33,11 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -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.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.client.UserTaskCallback; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.UserTask; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Test UserTask that uses the callback API Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/task/user/UserTaskTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.task.user; +package org.jbpm.test.incubator.task.user; // $Id$ @@ -37,13 +37,13 @@ import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.service.ProcessService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -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.incubator.client.MessageListener; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.service.MessageBuilderService; +import org.jbpm.incubator.service.MessageService; /** * Test User Task Copied: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction (from rev 2969, projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction) Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredMarshallerTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.transaction; +package org.jbpm.test.incubator.transaction; // $Id$ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-18 00:50:30 UTC (rev 2969) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jbpm.test.preview.transaction; +package org.jbpm.test.incubator.transaction; // $Id$ @@ -35,14 +35,14 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -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.builder.ProcessBuilderExt; -import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.model.ProcessDefinitionExt; +import org.jbpm.incubator.model.Group.GroupType; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.runtime.ExecutionHandler; /** * Test two tasks with Tx attribute REQUIRED 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -33,9 +33,9 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -33,9 +33,9 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,10 +32,10 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -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; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Parallel gateway that has uncontrolled outgoing sequence flows. 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -29,10 +29,10 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -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; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,9 +30,9 @@ import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -31,11 +31,11 @@ import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/casedata/CaseDataTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,11 +30,11 @@ import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/pattern/data/taskdata/TaskDataTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,12 +30,12 @@ import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.preview.client.ProcessExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Assignment.AssignTime; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.model.builder.ProcessBuilderExt; -import org.jbpm.preview.model.builder.TaskBuilder; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; /** * Data elements can be defined by tasks which are accessible only within the context of individual execution instances Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -70,29 +70,29 @@ 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.EndEventExt; -import org.jbpm.preview.model.EventExt; -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; -import org.jbpm.preview.model.ProcessDefinitionExt; -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.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; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.ComplexGateway; +import org.jbpm.incubator.model.EndEventExt; +import org.jbpm.incubator.model.EventExt; +import org.jbpm.incubator.model.GatewayExt; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.InclusiveGateway; +import org.jbpm.incubator.model.InputSet; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.model.OutputSet; +import org.jbpm.incubator.model.ParallelGateway; +import org.jbpm.incubator.model.Participant; +import org.jbpm.incubator.model.ProcessDefinitionExt; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.ReceiveTask; +import org.jbpm.incubator.model.SendTask; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.StartEventExt; +import org.jbpm.incubator.model.TaskExt; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.runtime.SignalHandler; /** * A JAXB marshaller for a Process Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshallerExt.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshallerExt.java 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshallerExt.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -74,15 +74,15 @@ 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.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; -import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.incubator.model.builder.EventBuilder; +import org.jbpm.incubator.model.builder.GroupBuilder; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.runtime.NodeHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGroup.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jbpm.preview.model.Group.GroupType; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -38,8 +38,8 @@ 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.builder.ProcessBuilderExt; -import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.runtime.ExecutionHandler; /** * Adapt the jpdl-3.2 ProcessDefinition to the API Process 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -47,7 +47,7 @@ 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.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; import org.w3c.dom.Document; import org.w3c.dom.Element; 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,7 +30,7 @@ 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; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; /** * Adapt the jpdl-3.2 ProcessDefinition to the API Process Modified: projects/spec/trunk/modules/ri/pom.xml =================================================================== --- projects/spec/trunk/modules/ri/pom.xml 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/pom.xml 2008-11-18 07:25:07 UTC (rev 2972) @@ -117,6 +117,21 @@  <build> <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/test</directory> + <includes> + <include>java/org/jbpm/test/cts/**</include> + <include>java/org/jbpm/test/incubator/**</include> + <include>java/org/jbpm/test/pattern/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -142,7 +157,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>org/jbpm/test/preview/**/*Test.java</exclude> + <exclude>org/jbpm/test/incubator/**/*Test.java</exclude> <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> </excludes> </configuration> 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,8 +32,8 @@ import javax.persistence.Id; import org.jbpm.api.model.Expression; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Property; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ComplexGatewayImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -28,7 +28,7 @@ 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.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EndEventImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -35,12 +35,12 @@ import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.EndEventExt; -import org.jbpm.preview.model.Signal; -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.incubator.model.EndEventExt; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.runtime.SignalHandler; +import org.jbpm.incubator.runtime.TokenExecutor; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -39,12 +39,12 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.preview.model.EventExt; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.SignalHandler; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.model.EventExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.SignalHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ExclusiveGatewayImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GateImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -36,8 +36,8 @@ import org.hibernate.annotations.IndexColumn; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.Gate; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GatewayImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -42,10 +42,10 @@ 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.Signal; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.SignalHandler; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.SignalHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/GroupImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -34,9 +34,9 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.preview.model.Group; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.PropertySupport; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InclusiveGatewayImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -39,9 +39,9 @@ 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.InclusiveGateway; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.model.InclusiveGateway; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/InputSetImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,9 +32,9 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.preview.model.InputSet; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.PropertySupport; +import org.jbpm.incubator.model.InputSet; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/MessageImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -33,10 +33,10 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Participant; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.PropertySupport; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Participant; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -53,17 +53,17 @@ 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.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.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.incubator.model.Assignment; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.model.ProcessStructureExt; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.PropertySupport; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.runtime.NodeHandler; +import org.jbpm.incubator.runtime.SignalHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/OutputSetImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,9 +32,9 @@ import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jbpm.preview.model.OutputSet; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.PropertySupport; +import org.jbpm.incubator.model.OutputSet; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParallelGatewayImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.preview.model.ParallelGateway; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.model.ParallelGateway; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -30,7 +30,7 @@ import javax.persistence.Id; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.preview.model.Participant; +import org.jbpm.incubator.model.Participant; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -46,12 +46,12 @@ import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; 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.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.ProcessDefinitionExt; +import org.jbpm.incubator.model.ProcessStructureExt; +import org.jbpm.incubator.model.Property; 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -50,14 +50,14 @@ import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessService; -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.StartEventExt; -import org.jbpm.preview.service.ExecutionService; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.ProcessStructureExt; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.StartEventExt; +import org.jbpm.incubator.service.ExecutionService; 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -48,12 +48,12 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; 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.ProcessStructureExt; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.PropertySupport; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.ProcessStructureExt; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.PropertySupport; 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertyImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -28,7 +28,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jbpm.preview.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -37,8 +37,8 @@ import javax.persistence.MapKey; import javax.persistence.OneToMany; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.PropertySupport; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -36,10 +36,10 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; -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.incubator.client.MessageListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.ReceiveTask; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,9 +32,9 @@ 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; -import org.jbpm.preview.runtime.ExecutionHandler; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.SendTask; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SignalImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,7 +32,7 @@ import javax.persistence.Id; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.preview.model.Signal; +import org.jbpm.incubator.model.Signal; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -38,13 +38,13 @@ import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.builder.ObjectNameFactory; -import org.jbpm.preview.client.SignalListener; -import org.jbpm.preview.model.Signal; -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.incubator.client.SignalListener; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.StartEventExt; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.runtime.SignalHandler; +import org.jbpm.incubator.service.ExecutionService; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/TaskImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -47,14 +47,14 @@ import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; -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.TaskExt; -import org.jbpm.preview.runtime.ExecutionHandler; -import org.jbpm.preview.runtime.SignalHandler; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.model.InputSet; +import org.jbpm.incubator.model.OutputSet; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.TaskExt; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.SignalHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -38,11 +38,11 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; -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.incubator.client.MessageListener; +import org.jbpm.incubator.client.UserTaskCallback; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.UserTask; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/WaitStateImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -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.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/EventBuilderImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,8 +24,8 @@ //$Id$ import org.jbpm.api.model.Event; -import org.jbpm.preview.model.Signal.SignalType; -import org.jbpm.preview.model.builder.EventBuilder; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/GroupBuilderImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -23,9 +23,9 @@ //$Id$ -import org.jbpm.preview.model.Group; -import org.jbpm.preview.model.Group.GroupType; -import org.jbpm.preview.model.builder.GroupBuilder; +import org.jbpm.incubator.model.Group; +import org.jbpm.incubator.model.Group.GroupType; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/MessageBuilderImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -25,9 +25,9 @@ import javax.management.ObjectName; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.builder.MessageBuilder; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,16 +32,16 @@ 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.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.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; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Group.GroupType; +import org.jbpm.incubator.model.builder.EventBuilder; +import org.jbpm.incubator.model.builder.GroupBuilder; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; +import org.jbpm.incubator.runtime.ExecutionHandler; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/SignalBuilderImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -25,9 +25,9 @@ import javax.management.ObjectName; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.Signal.SignalType; -import org.jbpm.preview.model.builder.SignalBuilder; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/TaskBuilderImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -25,8 +25,8 @@ import org.jbpm.api.model.Task; import org.jbpm.api.model.Expression.ExpressionLanguage; -import org.jbpm.preview.model.Property; -import org.jbpm.preview.model.builder.TaskBuilder; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/AssignmentInterceptor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,9 +26,9 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Expression; import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.Assignment; -import org.jbpm.preview.model.NodeExt; -import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -31,9 +31,9 @@ import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.runtime.Attachments; -import org.jbpm.preview.model.NodeExt; -import org.jbpm.preview.model.ProcessDefinitionExt; -import org.jbpm.preview.model.Property; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.model.ProcessDefinitionExt; +import org.jbpm.incubator.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/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,7 +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; +import org.jbpm.incubator.model.NodeExt; /** * A {@link Token} that includes properties from the current {@link Node} 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ExitSignalInterceptor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,8 +24,8 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.preview.model.NodeExt; -import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/FlowHandlerInterceptor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,9 +24,9 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.preview.model.NodeExt; -import org.jbpm.preview.runtime.FlowHandler; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -27,7 +27,7 @@ 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.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MessageSender.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -29,11 +29,11 @@ import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; import org.jbpm.api.runtime.Attachments; -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.incubator.model.Message; +import org.jbpm.incubator.model.Participant; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/MutableToken.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,7 +26,7 @@ import org.hibernate.Session; import org.jbpm.api.client.Token; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.preview.client.PersistenceToken; +import org.jbpm.incubator.client.PersistenceToken; /** * A mutable extension to the Token. 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeContext.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -27,7 +27,7 @@ import java.util.List; import org.jbpm.api.client.Token; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.model.Process; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/SignalHandlerInterceptor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,8 +24,8 @@ //$Id$ import org.jbpm.api.client.Token; -import org.jbpm.preview.model.NodeExt; -import org.jbpm.preview.runtime.SignalHandler; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -35,8 +35,8 @@ 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.jbpm.incubator.runtime.FlowHandler; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -40,7 +40,7 @@ import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.runtime.Attachments.Key; import org.jbpm.api.service.ProcessService; -import org.jbpm.preview.runtime.TokenExecutor; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TransactionInterceptor.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -31,10 +31,10 @@ 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.incubator.model.Group; +import org.jbpm.incubator.model.NodeExt; +import org.jbpm.incubator.model.Property; +import org.jbpm.incubator.model.Group.GroupType; 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -38,13 +38,13 @@ import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessService; -import org.jbpm.preview.client.ProcessExt; -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.ExecutionService; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Signal.SignalType; +import org.jbpm.incubator.runtime.TokenExecutor; +import org.jbpm.incubator.service.ExecutionService; +import org.jbpm.incubator.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/MessageBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageBuilderServiceImpl.java 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageBuilderServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,9 +24,9 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.model.builder.MessageBuilder; -import org.jbpm.preview.service.MessageBuilderService; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/MessageServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -28,9 +28,9 @@ import org.hibernate.Transaction; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.preview.client.MessageListener; -import org.jbpm.preview.model.Message; -import org.jbpm.preview.service.MessageService; +import org.jbpm.incubator.client.MessageListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.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/ProcessBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,7 +26,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Process; import org.jbpm.api.service.ProcessBuilderService; -import org.jbpm.preview.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; import org.jbpm.ri.model.builder.ProcessBuilderImpl; /** 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalBuilderServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,9 +24,9 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.preview.model.Signal; -import org.jbpm.preview.model.builder.SignalBuilder; -import org.jbpm.preview.service.SignalBuilderService; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.SignalBuilder; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/SignalServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -24,7 +24,7 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ComplexGatewayPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.preview.model.ComplexGateway; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -27,10 +27,10 @@ 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.Signal.SignalType; +import org.jbpm.incubator.model.EndEventExt; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/InclusiveGatewayPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.preview.model.InclusiveGateway; +import org.jbpm.incubator.model.InclusiveGateway; 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ParallelGatewayPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.preview.model.ParallelGateway; +import org.jbpm.incubator.model.ParallelGateway; import org.jbpm.ri.model.ParallelGatewayImpl; /** 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -27,10 +27,10 @@ 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.StartEventExt; -import org.jbpm.preview.model.Signal.SignalType; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.StartEventExt; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/TaskPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -33,11 +33,11 @@ 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.InputSet; -import org.jbpm.preview.model.OutputSet; -import org.jbpm.preview.model.TaskExt; -import org.jbpm.preview.model.Assignment.AssignTime; +import org.jbpm.incubator.model.Assignment; +import org.jbpm.incubator.model.InputSet; +import org.jbpm.incubator.model.OutputSet; +import org.jbpm.incubator.model.TaskExt; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/UserTaskPersistenceTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -26,8 +26,8 @@ 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.incubator.model.Message; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -32,9 +32,9 @@ 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.Assignment.AssignTime; -import org.jbpm.preview.model.builder.ProcessBuilderExt; -import org.jbpm.preview.model.builder.TaskBuilder; +import org.jbpm.incubator.model.Assignment.AssignTime; +import org.jbpm.incubator.model.builder.ProcessBuilderExt; +import org.jbpm.incubator.model.builder.TaskBuilder; /** * 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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -18,15 +18,15 @@ import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.service.ProcessService; -import org.jbpm.preview.client.MessageListener; -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.builder.MessageBuilder; -import org.jbpm.preview.service.MessageBuilderService; -import org.jbpm.preview.service.MessageService; -import org.jbpm.preview.service.SignalService; +import org.jbpm.incubator.client.MessageListener; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.client.SignalListener; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.Signal; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.service.MessageBuilderService; +import org.jbpm.incubator.service.MessageService; +import org.jbpm.incubator.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-18 07:05:14 UTC (rev 2971) +++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-11-18 07:25:07 UTC (rev 2972) @@ -29,14 +29,14 @@ 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; -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.builder.MessageBuilder; -import org.jbpm.preview.service.MessageBuilderService; -import org.jbpm.preview.service.MessageService; +import org.jbpm.incubator.client.MessageListener; +import org.jbpm.incubator.client.ProcessExt; +import org.jbpm.incubator.client.UserTaskCallback; +import org.jbpm.incubator.model.Message; +import org.jbpm.incubator.model.UserTask; +import org.jbpm.incubator.model.builder.MessageBuilder; +import org.jbpm.incubator.service.MessageBuilderService; +import org.jbpm.incubator.service.MessageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory;

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2971 - jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-18 02:05:14 -0500 (Tue, 18 Nov 2008) New Revision: 2971 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java Log: applied fix for JBPM-1186 to the soa branch Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java 2008-11-18 07:02:47 UTC (rev 2970) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java 2008-11-18 07:05:14 UTC (rev 2971) @@ -107,4 +107,9 @@ } return defaultValue; } + + public void destroy() { + super.destroy(); + jbpmConfiguration.close(); + } }

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2970 - in jbpm3/branches/jpdl-3.2.2-SOA-4.2: enterprise/src/test/java/org/jbpm/persistence and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-18 02:02:47 -0500 (Tue, 18 Nov 2008) New Revision: 2970 Added: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/persistence/ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/persistence/jta/ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java Log: ported JBPM-1179 to soa branch Added: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java (rev 0) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-11-18 07:02:47 UTC (rev 2970) @@ -0,0 +1,203 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.persistence.jta; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.transaction.UserTransaction; + +import org.apache.cactus.ServletTestCase; +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +public class JtaDbPersistenceTest extends ServletTestCase { + + private JbpmConfiguration jbpmConfiguration; + private UserTransaction tx; + private boolean rollback; + + private static long definitionId; + + protected void setUp() throws Exception { + jbpmConfiguration = JbpmConfiguration.getInstance(); + getUserTransaction(); + } + + public void testUserTx() throws Exception { + tx = getUserTransaction(); + testServiceTx(); + } + + public void testUserTxRollback() throws Exception { + tx = getUserTransaction(); + testServiceTxRollback(); + } + + public void testServiceTx() throws Exception { + long definitionId = deployProcess(); + long instanceId = launchProcess(definitionId); + signal(instanceId); + assertTrue(hasEnded(instanceId)); + } + + public void testServiceTxRollback() throws Exception { + rollback = true; + long definitionId = deployProcess(); + long instanceId = launchProcess(definitionId); + signal(instanceId); + assertFalse(hasEnded(instanceId)); + } + + private long deployProcess() throws Exception { + if (definitionId == 0) { + try { + if (tx != null) tx.begin(); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + assertEquals(tx == null, isTxCreatedByService(jbpmContext)); + ProcessDefinition definition = ProcessDefinition.parseXmlString("<process-definition name='tx'>" + + " <start-state name='start'>" + + " <transition to='midway' />" + + " </start-state>" + + " <state name='midway'>" + + " <transition to='end' />" + + " </state>" + + " <end-state name='end' />" + + "</process-definition>"); + jbpmContext.deployProcessDefinition(definition); + definitionId = definition.getId(); + } + catch (RuntimeException e) { + if (tx == null) jbpmContext.setRollbackOnly(); + throw e; + } + finally { + jbpmContext.close(); + } + if (tx != null) tx.commit(); + } + catch (Exception e) { + if (tx != null) tx.rollback(); + throw e; + } + } + return definitionId; + } + + private long launchProcess(long definitionId) throws Exception { + try { + if (tx != null) tx.begin(); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + ProcessInstance instance; + try { + assertEquals(tx == null, isTxCreatedByService(jbpmContext)); + ProcessDefinition definition = jbpmContext.getGraphSession().loadProcessDefinition( + definitionId); + instance = new ProcessInstance(definition); + instance.signal(); + jbpmContext.save(instance); + } + catch (RuntimeException e) { + if (tx == null) jbpmContext.setRollbackOnly(); + throw e; + } + finally { + jbpmContext.close(); + } + if (tx != null) tx.commit(); + return instance.getId(); + } + catch (Exception e) { + if (tx != null) tx.rollback(); + throw e; + } + } + + private void signal(long instanceId) throws Exception { + try { + if (tx != null) tx.begin(); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + assertEquals(tx == null, isTxCreatedByService(jbpmContext)); + ProcessInstance instance = jbpmContext.loadProcessInstanceForUpdate(instanceId); + instance.signal(); + if (rollback && tx == null) jbpmContext.setRollbackOnly(); + } + catch (RuntimeException e) { + if (tx == null) jbpmContext.setRollbackOnly(); + throw e; + } + finally { + jbpmContext.close(); + } + if (tx != null) { + if (rollback) + tx.rollback(); + else + tx.commit(); + } + } + catch (Exception e) { + if (tx != null) tx.rollback(); + throw e; + } + } + + private boolean hasEnded(long instanceId) throws Exception { + try { + if (tx != null) tx.begin(); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + ProcessInstance instance; + try { + assertEquals(tx == null, isTxCreatedByService(jbpmContext)); + instance = jbpmContext.loadProcessInstanceForUpdate(instanceId); + } + catch (RuntimeException e) { + if (tx == null) jbpmContext.setRollbackOnly(); + throw e; + } + finally { + jbpmContext.close(); + } + if (tx != null) tx.commit(); + return instance.hasEnded(); + } + catch (Exception e) { + if (tx != null) tx.rollback(); + throw e; + } + } + + private boolean isTxCreatedByService(JbpmContext jbpmContext) { + JtaDbPersistenceService persistenceService = (JtaDbPersistenceService) jbpmContext.getServices() + .getPersistenceService(); + return persistenceService.isJtaTxCreated(); + } + + private static UserTransaction getUserTransaction() throws NamingException { + Context initial = new InitialContext(); + return (UserTransaction) initial.lookup("java:comp/UserTransaction"); + } +} Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2008-11-18 00:50:30 UTC (rev 2969) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2008-11-18 07:02:47 UTC (rev 2970) @@ -1,6 +1,28 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.persistence.jta; import javax.naming.InitialContext; +import javax.naming.NamingException; import javax.transaction.SystemException; import javax.transaction.UserTransaction; @@ -19,55 +41,45 @@ private static Log log = LogFactory.getLog(JbpmContext.class); - boolean isJtaTxCreated = false; + private UserTransaction userTransaction; public JtaDbPersistenceService(DbPersistenceServiceFactory persistenceServiceFactory) { super(persistenceServiceFactory); - if (! isCurrentJtaTransactionAvailable()) { + if (!isJtaTransactionInProgress()) { beginJtaTransaction(); - isJtaTxCreated = true; } } protected boolean isTransactionActive() { - return isJtaTxCreated() ; + return isJtaTxCreated() ; } public void close() { super.close(); - if (isJtaTxCreated) { + if (userTransaction != null) { endJtaTransaction(); } } - boolean isCurrentJtaTransactionAvailable() { - SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) persistenceServiceFactory.getSessionFactory(); - return JTAHelper.isTransactionInProgress(sessionFactoryImplementor); + boolean isJtaTransactionInProgress() { + SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) persistenceServiceFactory.getSessionFactory(); + return JTAHelper.isTransactionInProgress(sessionFactory); } void beginJtaTransaction() { try { log.debug("start user JTA transaction"); - getUserTransaction().begin(); + userTransaction = getUserTransaction(); + userTransaction.begin(); } catch (Exception e) { throw new JbpmException("couldn't start JTA transaction", e); } } void endJtaTransaction() { - int status = -1; - log.debug("end user JTA transaction"); - UserTransaction userTransaction = getUserTransaction(); - try { - status = userTransaction.getStatus(); - } catch (SystemException e) { - throw new JbpmException("couldn't get status for user transaction", e); - } - - boolean isRollback = JTAHelper.isRollback(status); - if (isRollback || isRollbackOnly()) { + if (isRollbackOnly() || JTAHelper.isMarkedForRollback(getJtaTransactionStatus())) { log.debug("end jta transation with ROLLBACK"); try { userTransaction.rollback(); @@ -83,25 +95,37 @@ } } } - + UserTransaction getUserTransaction() { - UserTransaction userTransaction = null; - if (userTransaction == null) { - String jndiName = "UserTransaction"; - try { - userTransaction = (UserTransaction) new InitialContext().lookup(jndiName); - } catch (Exception e) { - throw new JbpmException("couldn't lookup UserTransaction in JNDI with name "+jndiName, e); - } + String jndiName = persistenceServiceFactory.getConfiguration().getProperty("jta.UserTransaction"); + if (jndiName == null) { + /* + * EJB 2.1 section 20.9 The container must make the UserTransaction interface available to + * enterprise beans that are allowed to use this interface (only session and message- + * driven beans with bean-managed transaction demarcation are allowed to use this + * interface) in JNDI under the name java:comp/UserTransaction. + * J2EE 1.4 section 4.2.1.1 The J2EE platform must provide an object implementing the + * UserTransaction interface to all web components. The platform must publish the + * UserTransaction object in JNDI under the name java:comp/UserTransaction. + */ + jndiName = "java:comp/UserTransaction"; } - return userTransaction; + try { + return (UserTransaction) new InitialContext().lookup(jndiName); + } catch (NamingException e) { + throw new JbpmException("couldn't lookup UserTransaction in JNDI with name "+jndiName, e); + } } + int getJtaTransactionStatus() { + try { + return userTransaction.getStatus(); + } catch (SystemException e) { + throw new JbpmException("couldn't get status for user transaction", e); + } + } public boolean isJtaTxCreated() { - return isJtaTxCreated; + return userTransaction != null; } - public void setJtaTxCreated(boolean isJtaTxCreated) { - this.isJtaTxCreated = isJtaTxCreated; - } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java 2008-11-18 00:50:30 UTC (rev 2969) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java 2008-11-18 07:02:47 UTC (rev 2970) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.persistence.jta; import org.jbpm.persistence.db.DbPersistenceServiceFactory; @@ -3,5 +24,23 @@ import org.jbpm.svc.Service; - +/** + * The JTA persistence service enables jBPM to participate in JTA transactions. + * If an existing transaction is underway, {@link JtaDbPersistenceService} + * clings to it; otherwise it starts a new transaction. + * + * <h3>Configuration</h3> + * + * The JTA persistence service factory has the configurable fields described + * below. + * + * <ul> + * <li><code>isCurrentSessionEnabled</code></li> + * <li><code>isTransactionEnabled</code></li> + * </ul> + * + * Refer to the jBPM manual for details. + * + * @author Tom Baeyens + */ public class JtaDbPersistenceServiceFactory extends DbPersistenceServiceFactory { @@ -10,13 +49,10 @@ public JtaDbPersistenceServiceFactory() { setCurrentSessionEnabled(true); - setTransactionEnabled(true); + setTransactionEnabled(false); } public Service openService() { return new JtaDbPersistenceService(this); } - - public void close() { - } }

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2969 - jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-17 19:50:30 -0500 (Mon, 17 Nov 2008) New Revision: 2969 Added: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorTests.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java Log: applied JBPM-1072 changes to soa branch Added: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorTests.java (rev 0) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/JobExecutorTests.java 2008-11-18 00:50:30 UTC (rev 2969) @@ -0,0 +1,17 @@ +package org.jbpm.job.executor; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class JobExecutorTests { + + public static Test suite() { + TestSuite suite = new TestSuite("Test for org.jbpm.job.executor"); + // $JUnit-BEGIN$ + suite.addTestSuite(JobExecutorDbTest.class); + suite.addTestSuite(MultiJobExecutorTest.class); + // $JUnit-END$ + return suite; + } + +} Added: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java (rev 0) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/job/executor/MultiJobExecutorTest.java 2008-11-18 00:50:30 UTC (rev 2969) @@ -0,0 +1,166 @@ +package org.jbpm.job.executor; + +import java.sql.SQLException; + +import junit.framework.TestCase; + +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.command.CommandService; +import org.jbpm.command.SignalCommand; +import org.jbpm.command.StartProcessInstanceCommand; +import org.jbpm.command.impl.CommandServiceImpl; +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ExecutionContext; +import org.jbpm.graph.exe.ProcessInstance; + +/** + * Test case for JBPM-1072. + * @author Jiri Pechanec + */ +public class MultiJobExecutorTest extends TestCase { + + private static final int EXECUTOR_COUNT = 20; + public static final String PROCESS_NAME = "TestProcess"; + + private JobExecutor[] executors = new JobExecutor[EXECUTOR_COUNT]; + + private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); + private static CommandService commandService = new CommandServiceImpl(jbpmConfiguration); + + public static final String PROCESS_DEFINITION = "<?xml version='1.0' encoding='UTF-8'?>" + + "<process-definition name='TestProcess'>" + + "<event type='process-end'>" + + "<action name='endAction' class='" + + EndAction.class.getName() + + "' />" + + "</event>" + + "<start-state name='start-state1'>" + + "<transition to='Service 1'></transition>" + + "</start-state>" + + "<node name='Service 1'>" + + "<action name='esbAction' " + + "class='" + + SimpleAction.class.getName() + + "'>" + + "</action>" + + "<transition to='Service 2'></transition>" + + "</node>" + + "<node name='Service 2' async='true'>" + + "<action name='esbAction' " + + "class='" + + SimpleAction2.class.getName() + + "'>" + + "</action>" + + "<transition to='end-state1'></transition>" + + "</node>" + + "<end-state name='end-state1'></end-state>" + + "</process-definition>"; + + protected void setUp() throws SQLException { + jbpmConfiguration.createSchema(); + + // deploy process definition + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_DEFINITION)); + System.out.println("Isolation " + jbpmContext.getConnection().getTransactionIsolation()); + } + finally { + jbpmContext.close(); + } + } + + public void testMultipleExecutors() { + // start job executors + for (int i = 0; i < executors.length; i++) { + executors[i] = (JobExecutor) JbpmConfiguration.Configs.getObjectFactory().createObject( + "jbpm.job.executor"); + executors[i].setName("JbpmJobExecutor/" + (i + 1)); + executors[i].start(); + } + + // kick off process instance + StartProcessInstanceCommand startCommand = new StartProcessInstanceCommand(); + startCommand.setProcessName(PROCESS_NAME); + ProcessInstance pi = (ProcessInstance) commandService.execute(startCommand); + + // signal service 1 + SignalCommand signalCommand = new SignalCommand(); + signalCommand.setTokenId(pi.getRootToken().getId()); + commandService.execute(signalCommand); + + // wait for process end + EndAction.waitFor(); + + // stop job executors + for (int i = executors.length - 1; i >= 0; i--) { + try { + executors[i].stopAndJoin(); + } + catch (InterruptedException e) { + // continue to next executor + } + } + + assertEquals(1, SimpleAction2.getExecutionCount()); + } + + protected void tearDown() { + jbpmConfiguration.dropSchema(); + } + + public static class SimpleAction implements ActionHandler { + + private static final long serialVersionUID = -9065054081909009083L; + + public void execute(ExecutionContext ctx) throws Exception { + System.out.println("Action 1"); + } + + } + + public static class SimpleAction2 implements ActionHandler { + + private static int executionCount = 0; + + private static final long serialVersionUID = -9065054081909009083L; + + public void execute(ExecutionContext ctx) throws Exception { + System.out.println("Action 2: " + incrementCount()); + ctx.getNode().leave(ctx); + } + + private static synchronized int incrementCount() { + return ++executionCount; + } + + public static synchronized int getExecutionCount() { + return executionCount; + } + } + + public static class EndAction implements ActionHandler { + + private static final Object monitor = new Object(); + + private static final long serialVersionUID = 1L; + + public void execute(ExecutionContext executionContext) throws Exception { + synchronized (monitor) { + monitor.notify(); + } + } + + public static void waitFor() { + try { + synchronized (monitor) { + monitor.wait(60000); + } + } + catch (InterruptedException e) { + } + } + } +}

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2968 - in jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src: main/java/org/jbpm/svc and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-17 19:17:53 -0500 (Mon, 17 Nov 2008) New Revision: 2968 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AllDbTests.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java Log: applied JBPM-1072 changes to soa branch Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-11-17 23:03:50 UTC (rev 2967) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-11-18 00:17:53 UTC (rev 2968) @@ -4,6 +4,7 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -11,7 +12,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Hibernate; -import org.hibernate.StaleStateException; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.db.JobSession; @@ -94,60 +94,69 @@ currentIdleInterval = currentIdleInterval*2; } } - } catch (Throwable t) { - t.printStackTrace(); + } catch (Exception e) { + // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. + e.printStackTrace(); } finally { log.info(getName()+" leaves cyberspace"); } } protected Collection acquireJobs() { - Collection acquiredJobs = null; + Collection acquiredJobs; synchronized (jobExecutor) { Collection jobsToLock = new ArrayList(); log.debug("acquiring jobs for execution..."); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - try { - JobSession jobSession = jbpmContext.getJobSession(); - log.debug("querying for acquirable job..."); - Job job = jobSession.getFirstAcquirableJob(getName()); - if (job!=null) { - if (job.isExclusive()) { - log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx..."); - List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); - jobsToLock.addAll(otherExclusiveJobs); - log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'"); - } else { - log.debug("trying to obtain a lock for '"+job+"'"); - jobsToLock.add(job); - } - - Iterator iter = jobsToLock.iterator(); - while (iter.hasNext()) { - job = (Job) iter.next(); - job.setLockOwner(getName()); - job.setLockTime(new Date()); - // jbpmContext.getSession().update(job); - } - - // HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1 - if (job instanceof Timer) { - Hibernate.initialize(((Timer)job).getGraphElement()); - } - + JobSession jobSession = jbpmContext.getJobSession(); + log.debug("querying for acquirable job..."); + Job job = jobSession.getFirstAcquirableJob(getName()); + if (job!=null) { + if (job.isExclusive()) { + log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx..."); + List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); + jobsToLock.addAll(otherExclusiveJobs); + log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'"); } else { - log.debug("no acquirable jobs in job table"); + log.debug("trying to obtain a lock for '"+job+"'"); + jobsToLock.add(job); } - } finally { + Iterator iter = jobsToLock.iterator(); + while (iter.hasNext()) { + job = (Job) iter.next(); + job.setLockOwner(getName()); + job.setLockTime(new Date()); + // jbpmContext.getSession().update(job); + } + + // HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1 + if (job instanceof Timer) { + Hibernate.initialize(((Timer)job).getGraphElement()); + } + } else { + log.debug("no acquirable jobs in job table"); + } + } finally { + try { jbpmContext.close(); + acquiredJobs = jobsToLock; + log.debug("obtained lock on jobs: "+acquiredJobs); } - acquiredJobs = jobsToLock; - log.debug("obtained locks on following jobs: "+acquiredJobs); - - } catch (StaleStateException e) { - log.debug("couldn't acquire lock on job(s): "+jobsToLock); + catch (JbpmPersistenceException e) { + // if this is a stale object exception, the jbpm configuration has control over the logging + if ("org.hibernate.StaleObjectStateException".equals(e.getCause().getClass().getName())) { + log.info("problem committing job acquisition transaction: optimistic locking failed"); + StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job acquisition transaction: optimistic locking failed", e); + } else { + // TODO run() will log this exception, log it here too? + log.error("problem committing job acquisition transaction", e); + throw e; + } + acquiredJobs = Collections.EMPTY_LIST; + log.debug("couldn't obtain lock on jobs: "+jobsToLock); + } } } return acquiredJobs; @@ -188,12 +197,10 @@ log.info("problem committing job execution transaction: optimistic locking failed"); StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job execution transaction: optimistic locking failed", e); } else { + // TODO run() will log this exception, log it here too? log.error("problem committing job execution transaction", e); + throw e; } - } catch (RuntimeException e) { - log.error("problem committing job execution transaction", e); - - throw e; } } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java 2008-11-17 23:03:50 UTC (rev 2967) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java 2008-11-18 00:17:53 UTC (rev 2968) @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.StaleObjectStateException; import org.jbpm.JbpmContext; import org.jbpm.JbpmException; import org.jbpm.graph.exe.ProcessInstance; @@ -214,7 +213,7 @@ public void close() { if (services!=null) { Map closeExceptions = new HashMap(); - Throwable firstException = null; + Exception firstException = null; Iterator iter = serviceNames.iterator(); while (iter.hasNext()) { String serviceName = (String) iter.next(); @@ -231,6 +230,10 @@ } else { log.error("problem closing service '"+serviceName+"'", e); } + closeExceptions.put(serviceName, e); + if (firstException==null) { + firstException = e; + } } catch (Exception e) { // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. log.error("problem closing service '"+serviceName+"'", e); @@ -241,8 +244,12 @@ } } } - if (! closeExceptions.isEmpty()) { - throw new JbpmException("problem closing services "+closeExceptions, firstException); + if (!closeExceptions.isEmpty()) { + if (firstException instanceof JbpmException) { + throw (JbpmException) firstException; + } else { + throw new JbpmException("problem closing services: "+closeExceptions, firstException); + } } } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AllDbTests.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AllDbTests.java 2008-11-17 23:03:50 UTC (rev 2967) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AllDbTests.java 2008-11-18 00:17:53 UTC (rev 2968) @@ -37,6 +37,7 @@ import org.jbpm.graph.log.GraphLogDbTests; import org.jbpm.graph.node.GraphNodeDbTests; import org.jbpm.jcr.JcrDbTests; +import org.jbpm.job.executor.JobExecutorTests; import org.jbpm.jpdl.el.JpdlElDbTests; import org.jbpm.jpdl.exe.JpdlExeDbTests; import org.jbpm.jpdl.par.JpdlParDbTests; @@ -75,6 +76,7 @@ suite.addTest(PersistenceDbTests.suite()); suite.addTest(ScenarioDbTests.suite()); suite.addTest(SchedulerExeDbTests.suite()); + suite.addTest(JobExecutorTests.suite()); suite.addTest(TaskMgmtDefDbTests.suite()); suite.addTest(TaskMgmtExeDbTests.suite()); suite.addTest(TaskMgmtLogDbTests.suite()); Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java 2008-11-17 23:03:50 UTC (rev 2967) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java 2008-11-18 00:17:53 UTC (rev 2968) @@ -26,8 +26,6 @@ import java.util.List; import java.util.Set; -import junit.framework.AssertionFailedError; - import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.def.Node; @@ -82,7 +80,7 @@ assertEquals(processDefinition.getNode("one"), processInstance.getRootToken().getNode()); assertEquals(1, getNbrOfJobsAvailable()); - processJobs(5000); + processJobs(30000); assertEquals(0, getNbrOfJobsAvailable());

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2967 - in jbpm3/branches/jpdl-3.2.2-SOA-4.2: jpdl/jar/src/main/java/org/jbpm/job/executor and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-17 18:03:50 -0500 (Mon, 17 Nov 2008) New Revision: 2967 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java Log: reverted r2965 in order to apply issue fixes separately and incorporate test cases Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java 2008-11-17 22:14:39 UTC (rev 2966) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java 2008-11-17 23:03:50 UTC (rev 2967) @@ -36,28 +36,18 @@ import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.command.Command; -import org.jbpm.command.DeployProcessCommand; -import org.jbpm.command.StartProcessInstanceCommand; import org.jbpm.ejb.LocalCommandService; import org.jbpm.ejb.LocalCommandServiceHome; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; public class AsyncProcessingTest extends ServletTestCase { - - private LocalCommandService commandService; - + static int nbrOfConcurrentProcessExecutions = 20; static int maxWaitTime = 30000; protected static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); - protected void setUp() throws Exception { - InitialContext initialContext = new InitialContext(); - LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); - commandService = localCommandServiceHome.create(); - } - public void testBulkJobs() { Recorder.resetCollections(); deleteAllJobs(); @@ -69,7 +59,7 @@ assertEquals(expectedResults, Recorder.collectedResults); } - protected void deleteAllJobs() { + public void deleteAllJobs() { execute( new Command() { private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { @@ -80,59 +70,86 @@ }); } - protected Object execute(Command command) { - return commandService.execute(command); + public static Object execute(Command command) { + Object returnValue; + try { + InitialContext initialContext = new InitialContext(); + LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("CommandServiceBean"); + LocalCommandService localCommandService = localCommandServiceHome.create(); + returnValue = localCommandService.execute(command); + localCommandService.remove(); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException("couldn't execute command", e); + } + return returnValue; } - protected void deployProcess() { + public void deployProcess() { log.debug("start deploy process"); - execute(new DeployProcessCommand( - "<process-definition name='bulk messages'>" + - " <start-state>" + - " <transition to='a' />" + - " </start-state>" + - " <node name='a' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='b' />" + - " </node>" + - " <node name='b' async='true'>" + - " <event type='node-enter'>" + - " <action name='X' async='true' class='"+ActionRecorder.class.getName()+"' />" + - " </event>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='c' />" + - " </node>" + - " <node name='c' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='d'>" + - " <action name='Y' async='true' class='"+ActionRecorder.class.getName()+"' />" + - " </transition>" + - " </node>" + - " <node name='d' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='e' />" + - " <event type='node-leave'>" + - " <action name='Z' async='true' class='"+ActionRecorder.class.getName()+"' />" + - " </event>" + - " </node>" + - " <node name='e' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='end' />" + - " </node>" + - " <end-state name='end'/>" + - "</process-definition>")); + execute(new Command() { + private static final long serialVersionUID = 1L; + public Object execute(JbpmContext jbpmContext) throws Exception { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( + "<process-definition name='bulk messages'>" + + " <start-state>" + + " <transition to='a' />" + + " </start-state>" + + " <node name='a' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='b' />" + + " </node>" + + " <node name='b' async='true'>" + + " <event type='node-enter'>" + + " <action name='X' async='true' class='"+ActionRecorder.class.getName()+"' />" + + " </event>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='c' />" + + " </node>" + + " <node name='c' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='d'>" + + " <action name='Y' async='true' class='"+ActionRecorder.class.getName()+"' />" + + " </transition>" + + " </node>" + + " <node name='d' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='e' />" + + " <event type='node-leave'>" + + " <action name='Z' async='true' class='"+ActionRecorder.class.getName()+"' />" + + " </event>" + + " </node>" + + " <node name='e' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='end' />" + + " </node>" + + " <end-state name='end'/>" + + "</process-definition>" + ); + + log.debug("deploying process"); + jbpmContext.deployProcessDefinition(processDefinition); + + return processDefinition; + } + }); } - protected void launchProcesses() { + public void launchProcesses() { for (int i=0; i<nbrOfConcurrentProcessExecutions; i++) { - StartProcessInstanceCommand command = new StartProcessInstanceCommand(); - command.setProcessName("bulk messages"); - execute(command); + execute(new Command() { + private static final long serialVersionUID = 1L; + public Object execute(JbpmContext jbpmContext) throws Exception { + ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("bulk messages"); + processInstance.signal(); + return processInstance; + } + }); } } - protected Set createExpectedResults() { + public Set createExpectedResults() { Set expectedResults = new TreeSet(); Iterator iter = Recorder.collectedProcessInstanceIds.iterator(); while (iter.hasNext()) { @@ -178,7 +195,7 @@ } } - protected int getNbrOfJobsAvailable() { + public static int getNbrOfJobsAvailable() { Integer nbrOfJobsAvailable = (Integer) execute( new Command() { private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java 2008-11-17 22:14:39 UTC (rev 2966) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java 2008-11-17 23:03:50 UTC (rev 2967) @@ -107,9 +107,4 @@ } return defaultValue; } - - public void destroy() { - super.destroy(); - jbpmConfiguration.close(); - } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-11-17 22:14:39 UTC (rev 2966) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-11-17 23:03:50 UTC (rev 2967) @@ -4,7 +4,6 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -12,6 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Hibernate; +import org.hibernate.StaleStateException; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.db.JobSession; @@ -94,69 +94,60 @@ currentIdleInterval = currentIdleInterval*2; } } - } catch (Exception e) { - // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. - e.printStackTrace(); + } catch (Throwable t) { + t.printStackTrace(); } finally { log.info(getName()+" leaves cyberspace"); } } protected Collection acquireJobs() { - Collection acquiredJobs; + Collection acquiredJobs = null; synchronized (jobExecutor) { Collection jobsToLock = new ArrayList(); log.debug("acquiring jobs for execution..."); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - JobSession jobSession = jbpmContext.getJobSession(); - log.debug("querying for acquirable job..."); - Job job = jobSession.getFirstAcquirableJob(getName()); - if (job!=null) { - if (job.isExclusive()) { - log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx..."); - List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); - jobsToLock.addAll(otherExclusiveJobs); - log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'"); + try { + JobSession jobSession = jbpmContext.getJobSession(); + log.debug("querying for acquirable job..."); + Job job = jobSession.getFirstAcquirableJob(getName()); + if (job!=null) { + if (job.isExclusive()) { + log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx..."); + List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); + jobsToLock.addAll(otherExclusiveJobs); + log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'"); + } else { + log.debug("trying to obtain a lock for '"+job+"'"); + jobsToLock.add(job); + } + + Iterator iter = jobsToLock.iterator(); + while (iter.hasNext()) { + job = (Job) iter.next(); + job.setLockOwner(getName()); + job.setLockTime(new Date()); + // jbpmContext.getSession().update(job); + } + + // HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1 + if (job instanceof Timer) { + Hibernate.initialize(((Timer)job).getGraphElement()); + } + } else { - log.debug("trying to obtain a lock for '"+job+"'"); - jobsToLock.add(job); + log.debug("no acquirable jobs in job table"); } - Iterator iter = jobsToLock.iterator(); - while (iter.hasNext()) { - job = (Job) iter.next(); - job.setLockOwner(getName()); - job.setLockTime(new Date()); - // jbpmContext.getSession().update(job); - } - - // HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1 - if (job instanceof Timer) { - Hibernate.initialize(((Timer)job).getGraphElement()); - } - } else { - log.debug("no acquirable jobs in job table"); - } - } finally { - try { + } finally { jbpmContext.close(); - acquiredJobs = jobsToLock; - log.debug("obtained lock on jobs: "+acquiredJobs); } - catch (JbpmPersistenceException e) { - // if this is a stale object exception, the jbpm configuration has control over the logging - if ("org.hibernate.StaleObjectStateException".equals(e.getCause().getClass().getName())) { - log.info("problem committing job acquisition transaction: optimistic locking failed"); - StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job acquisition transaction: optimistic locking failed", e); - } else { - // TODO run() will log this exception, log it here too? - log.error("problem committing job acquisition transaction", e); - throw e; - } - acquiredJobs = Collections.EMPTY_LIST; - log.debug("couldn't obtain lock on jobs: "+jobsToLock); - } + acquiredJobs = jobsToLock; + log.debug("obtained locks on following jobs: "+acquiredJobs); + + } catch (StaleStateException e) { + log.debug("couldn't acquire lock on job(s): "+jobsToLock); } } return acquiredJobs; @@ -197,10 +188,12 @@ log.info("problem committing job execution transaction: optimistic locking failed"); StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job execution transaction: optimistic locking failed", e); } else { - // TODO run() will log this exception, log it here too? log.error("problem committing job execution transaction", e); - throw e; } + } catch (RuntimeException e) { + log.error("problem committing job execution transaction", e); + + throw e; } } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2008-11-17 22:14:39 UTC (rev 2966) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2008-11-17 23:03:50 UTC (rev 2967) @@ -1,28 +1,6 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.persistence.jta; import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.transaction.SystemException; import javax.transaction.UserTransaction; @@ -41,45 +19,55 @@ private static Log log = LogFactory.getLog(JbpmContext.class); - private UserTransaction userTransaction; + boolean isJtaTxCreated = false; public JtaDbPersistenceService(DbPersistenceServiceFactory persistenceServiceFactory) { super(persistenceServiceFactory); - if (!isJtaTransactionInProgress()) { + if (! isCurrentJtaTransactionAvailable()) { beginJtaTransaction(); + isJtaTxCreated = true; } } protected boolean isTransactionActive() { - return isJtaTxCreated() ; + return isJtaTxCreated() ; } public void close() { super.close(); - if (userTransaction != null) { + if (isJtaTxCreated) { endJtaTransaction(); } } - boolean isJtaTransactionInProgress() { - SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) persistenceServiceFactory.getSessionFactory(); - return JTAHelper.isTransactionInProgress(sessionFactory); + boolean isCurrentJtaTransactionAvailable() { + SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) persistenceServiceFactory.getSessionFactory(); + return JTAHelper.isTransactionInProgress(sessionFactoryImplementor); } void beginJtaTransaction() { try { log.debug("start user JTA transaction"); - userTransaction = getUserTransaction(); - userTransaction.begin(); + getUserTransaction().begin(); } catch (Exception e) { throw new JbpmException("couldn't start JTA transaction", e); } } void endJtaTransaction() { - if (isRollbackOnly() || JTAHelper.isMarkedForRollback(getJtaTransactionStatus())) { + int status = -1; + log.debug("end user JTA transaction"); + UserTransaction userTransaction = getUserTransaction(); + try { + status = userTransaction.getStatus(); + } catch (SystemException e) { + throw new JbpmException("couldn't get status for user transaction", e); + } + + boolean isRollback = JTAHelper.isRollback(status); + if (isRollback || isRollbackOnly()) { log.debug("end jta transation with ROLLBACK"); try { userTransaction.rollback(); @@ -95,37 +83,25 @@ } } } - + UserTransaction getUserTransaction() { - String jndiName = persistenceServiceFactory.getConfiguration().getProperty("jta.UserTransaction"); - if (jndiName == null) { - /* - * EJB 2.1 �20.9 The container must make the UserTransaction interface available to the - * enterprise beans that are allowed to use this interface (only session and message- - * driven beans with bean-managed transaction demarcation are allowed to use this - * interface) in JNDI under the name java:comp/UserTransaction. - * J2EE 1.4 �4.2.1.1 The J2EE platform must provide an object implementing the - * UserTransaction interface to all web components. The platform must publish the - * UserTransaction object in JNDI under the name java:comp/UserTransaction. - */ - jndiName = "java:comp/UserTransaction"; + UserTransaction userTransaction = null; + if (userTransaction == null) { + String jndiName = "UserTransaction"; + try { + userTransaction = (UserTransaction) new InitialContext().lookup(jndiName); + } catch (Exception e) { + throw new JbpmException("couldn't lookup UserTransaction in JNDI with name "+jndiName, e); + } } - try { - return (UserTransaction) new InitialContext().lookup(jndiName); - } catch (NamingException e) { - throw new JbpmException("couldn't lookup UserTransaction in JNDI with name "+jndiName, e); - } + return userTransaction; } - int getJtaTransactionStatus() { - try { - return userTransaction.getStatus(); - } catch (SystemException e) { - throw new JbpmException("couldn't get status for user transaction", e); - } - } public boolean isJtaTxCreated() { - return userTransaction != null; + return isJtaTxCreated; } + public void setJtaTxCreated(boolean isJtaTxCreated) { + this.isJtaTxCreated = isJtaTxCreated; + } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java 2008-11-17 22:14:39 UTC (rev 2966) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java 2008-11-17 23:03:50 UTC (rev 2967) @@ -16,4 +16,7 @@ public Service openService() { return new JtaDbPersistenceService(this); } + + public void close() { + } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java 2008-11-17 22:14:39 UTC (rev 2966) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java 2008-11-17 23:03:50 UTC (rev 2967) @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.StaleObjectStateException; import org.jbpm.JbpmContext; import org.jbpm.JbpmException; import org.jbpm.graph.exe.ProcessInstance; @@ -213,7 +214,7 @@ public void close() { if (services!=null) { Map closeExceptions = new HashMap(); - Exception firstException = null; + Throwable firstException = null; Iterator iter = serviceNames.iterator(); while (iter.hasNext()) { String serviceName = (String) iter.next(); @@ -230,10 +231,6 @@ } else { log.error("problem closing service '"+serviceName+"'", e); } - closeExceptions.put(serviceName, e); - if (firstException==null) { - firstException = e; - } } catch (Exception e) { // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. log.error("problem closing service '"+serviceName+"'", e); @@ -244,12 +241,8 @@ } } } - if (!closeExceptions.isEmpty()) { - if (firstException instanceof JbpmException) { - throw (JbpmException) firstException; - } else { - throw new JbpmException("problem closing services: "+closeExceptions, firstException); - } + if (! closeExceptions.isEmpty()) { + throw new JbpmException("problem closing services "+closeExceptions, firstException); } } }

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2966 - jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-17 17:14:39 -0500 (Mon, 17 Nov 2008) New Revision: 2966 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Day.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/DayPart.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Duration.java Log: JBPM-1098: business calendar test fails in locales that use ',' as the decimal separator Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Day.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Day.java 2008-11-17 17:00:21 UTC (rev 2965) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Day.java 2008-11-17 22:14:39 UTC (rev 2966) @@ -77,7 +77,7 @@ findNextDayPartStart(dayPartIndex+1, date, result); } } else { - // descend recustively + // descend recursively date = businessCalendar.findStartOfNextDay(date); Day nextDay = businessCalendar.findDay(date); nextDay.findNextDayPartStart(0, date, result); Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/DayPart.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/DayPart.java 2008-11-17 17:00:21 UTC (rev 2965) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/DayPart.java 2008-11-17 22:14:39 UTC (rev 2966) @@ -79,9 +79,7 @@ int hour = calendar.get(Calendar.HOUR_OF_DAY); int minute = calendar.get(Calendar.MINUTE); - long dateMillis = hour * Duration.HOUR + minute * Duration.MINUTE; - long dayPartEndMillis = toHour * Duration.HOUR + toMinute * Duration.MINUTE; - long millisInThisDayPart = dayPartEndMillis - dateMillis; + long millisInThisDayPart = (toHour - hour) * Duration.HOUR + (toMinute - minute) * Duration.MINUTE; long durationMillis = duration.getMilliseconds(); if (durationMillis <= millisInThisDayPart) { Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Duration.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Duration.java 2008-11-17 17:00:21 UTC (rev 2965) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/calendar/Duration.java 2008-11-17 22:14:39 UTC (rev 2966) @@ -28,6 +28,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.Properties; @@ -71,7 +72,7 @@ String businessYearText = businessCalendarProperties.getProperty("business.year.expressed.in.business.days"); try { - NumberFormat format = NumberFormat.getNumberInstance(); + NumberFormat format = NumberFormat.getNumberInstance(Locale.US); BUSINESS_DAY = multiply(format.parse(businessDayText), HOUR); BUSINESS_WEEK = multiply(format.parse(businessWeekText), HOUR); BUSINESS_MONTH = multiply(format.parse(businessMonthText), BUSINESS_DAY); @@ -89,6 +90,10 @@ static Map calendarFields = new HashMap(); static { + Integer millisecondField = new Integer(Calendar.MILLISECOND); + calendarFields.put("millisecond", millisecondField); + calendarFields.put("milliseconds", millisecondField); + Integer secondField = new Integer(Calendar.SECOND); calendarFields.put("second", secondField); calendarFields.put("seconds", secondField); @@ -198,7 +203,7 @@ ++index; // parse quantity - NumberFormat format = NumberFormat.getNumberInstance(); + NumberFormat format = NumberFormat.getNumberInstance(Locale.US); index = indexOfNonWhite(duration, index); ParsePosition position = new ParsePosition(index); Number quantity = format.parse(duration, position);

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2965 - in jbpm3/branches/jpdl-3.2.2-SOA-4.2: jpdl/jar/src/main/java/org/jbpm/job/executor and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-17 12:00:21 -0500 (Mon, 17 Nov 2008) New Revision: 2965 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java Log: juliens fixes for JBPM-1072, JBPM-1186 and JBPM-1179 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java 2008-11-17 16:59:31 UTC (rev 2964) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java 2008-11-17 17:00:21 UTC (rev 2965) @@ -36,18 +36,28 @@ import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.command.Command; +import org.jbpm.command.DeployProcessCommand; +import org.jbpm.command.StartProcessInstanceCommand; import org.jbpm.ejb.LocalCommandService; import org.jbpm.ejb.LocalCommandServiceHome; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; public class AsyncProcessingTest extends ServletTestCase { - + + private LocalCommandService commandService; + static int nbrOfConcurrentProcessExecutions = 20; static int maxWaitTime = 30000; protected static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(); + protected void setUp() throws Exception { + InitialContext initialContext = new InitialContext(); + LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); + commandService = localCommandServiceHome.create(); + } + public void testBulkJobs() { Recorder.resetCollections(); deleteAllJobs(); @@ -59,7 +69,7 @@ assertEquals(expectedResults, Recorder.collectedResults); } - public void deleteAllJobs() { + protected void deleteAllJobs() { execute( new Command() { private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { @@ -70,86 +80,59 @@ }); } - public static Object execute(Command command) { - Object returnValue; - try { - InitialContext initialContext = new InitialContext(); - LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("CommandServiceBean"); - LocalCommandService localCommandService = localCommandServiceHome.create(); - returnValue = localCommandService.execute(command); - localCommandService.remove(); - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException("couldn't execute command", e); - } - return returnValue; + protected Object execute(Command command) { + return commandService.execute(command); } - public void deployProcess() { + protected void deployProcess() { log.debug("start deploy process"); - execute(new Command() { - private static final long serialVersionUID = 1L; - public Object execute(JbpmContext jbpmContext) throws Exception { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition name='bulk messages'>" + - " <start-state>" + - " <transition to='a' />" + - " </start-state>" + - " <node name='a' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='b' />" + - " </node>" + - " <node name='b' async='true'>" + - " <event type='node-enter'>" + - " <action name='X' async='true' class='"+ActionRecorder.class.getName()+"' />" + - " </event>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='c' />" + - " </node>" + - " <node name='c' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='d'>" + - " <action name='Y' async='true' class='"+ActionRecorder.class.getName()+"' />" + - " </transition>" + - " </node>" + - " <node name='d' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='e' />" + - " <event type='node-leave'>" + - " <action name='Z' async='true' class='"+ActionRecorder.class.getName()+"' />" + - " </event>" + - " </node>" + - " <node name='e' async='true'>" + - " <action class='"+Recorder.class.getName()+"' />" + - " <transition to='end' />" + - " </node>" + - " <end-state name='end'/>" + - "</process-definition>" - ); - - log.debug("deploying process"); - jbpmContext.deployProcessDefinition(processDefinition); - - return processDefinition; - } - }); + execute(new DeployProcessCommand( + "<process-definition name='bulk messages'>" + + " <start-state>" + + " <transition to='a' />" + + " </start-state>" + + " <node name='a' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='b' />" + + " </node>" + + " <node name='b' async='true'>" + + " <event type='node-enter'>" + + " <action name='X' async='true' class='"+ActionRecorder.class.getName()+"' />" + + " </event>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='c' />" + + " </node>" + + " <node name='c' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='d'>" + + " <action name='Y' async='true' class='"+ActionRecorder.class.getName()+"' />" + + " </transition>" + + " </node>" + + " <node name='d' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='e' />" + + " <event type='node-leave'>" + + " <action name='Z' async='true' class='"+ActionRecorder.class.getName()+"' />" + + " </event>" + + " </node>" + + " <node name='e' async='true'>" + + " <action class='"+Recorder.class.getName()+"' />" + + " <transition to='end' />" + + " </node>" + + " <end-state name='end'/>" + + "</process-definition>")); } - public void launchProcesses() { + protected void launchProcesses() { for (int i=0; i<nbrOfConcurrentProcessExecutions; i++) { - execute(new Command() { - private static final long serialVersionUID = 1L; - public Object execute(JbpmContext jbpmContext) throws Exception { - ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("bulk messages"); - processInstance.signal(); - return processInstance; - } - }); + StartProcessInstanceCommand command = new StartProcessInstanceCommand(); + command.setProcessName("bulk messages"); + execute(command); } } - public Set createExpectedResults() { + protected Set createExpectedResults() { Set expectedResults = new TreeSet(); Iterator iter = Recorder.collectedProcessInstanceIds.iterator(); while (iter.hasNext()) { @@ -195,7 +178,7 @@ } } - public static int getNbrOfJobsAvailable() { + protected int getNbrOfJobsAvailable() { Integer nbrOfJobsAvailable = (Integer) execute( new Command() { private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java 2008-11-17 16:59:31 UTC (rev 2964) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorServlet.java 2008-11-17 17:00:21 UTC (rev 2965) @@ -107,4 +107,9 @@ } return defaultValue; } + + public void destroy() { + super.destroy(); + jbpmConfiguration.close(); + } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-11-17 16:59:31 UTC (rev 2964) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-11-17 17:00:21 UTC (rev 2965) @@ -4,6 +4,7 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -11,7 +12,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Hibernate; -import org.hibernate.StaleStateException; import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.db.JobSession; @@ -94,60 +94,69 @@ currentIdleInterval = currentIdleInterval*2; } } - } catch (Throwable t) { - t.printStackTrace(); + } catch (Exception e) { + // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. + e.printStackTrace(); } finally { log.info(getName()+" leaves cyberspace"); } } protected Collection acquireJobs() { - Collection acquiredJobs = null; + Collection acquiredJobs; synchronized (jobExecutor) { Collection jobsToLock = new ArrayList(); log.debug("acquiring jobs for execution..."); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - try { - JobSession jobSession = jbpmContext.getJobSession(); - log.debug("querying for acquirable job..."); - Job job = jobSession.getFirstAcquirableJob(getName()); - if (job!=null) { - if (job.isExclusive()) { - log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx..."); - List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); - jobsToLock.addAll(otherExclusiveJobs); - log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'"); - } else { - log.debug("trying to obtain a lock for '"+job+"'"); - jobsToLock.add(job); - } - - Iterator iter = jobsToLock.iterator(); - while (iter.hasNext()) { - job = (Job) iter.next(); - job.setLockOwner(getName()); - job.setLockTime(new Date()); - // jbpmContext.getSession().update(job); - } - - // HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1 - if (job instanceof Timer) { - Hibernate.initialize(((Timer)job).getGraphElement()); - } - + JobSession jobSession = jbpmContext.getJobSession(); + log.debug("querying for acquirable job..."); + Job job = jobSession.getFirstAcquirableJob(getName()); + if (job!=null) { + if (job.isExclusive()) { + log.debug("exclusive acquirable job found ("+job+"). querying for other exclusive jobs to lock them all in one tx..."); + List otherExclusiveJobs = jobSession.findExclusiveJobs(getName(), job.getProcessInstance()); + jobsToLock.addAll(otherExclusiveJobs); + log.debug("trying to obtain a process-instance exclusive locks for '"+otherExclusiveJobs+"'"); } else { - log.debug("no acquirable jobs in job table"); + log.debug("trying to obtain a lock for '"+job+"'"); + jobsToLock.add(job); } - } finally { + Iterator iter = jobsToLock.iterator(); + while (iter.hasNext()) { + job = (Job) iter.next(); + job.setLockOwner(getName()); + job.setLockTime(new Date()); + // jbpmContext.getSession().update(job); + } + + // HACKY HACK : this is a workaround for a hibernate problem that is fixed in hibernate 3.2.1 + if (job instanceof Timer) { + Hibernate.initialize(((Timer)job).getGraphElement()); + } + } else { + log.debug("no acquirable jobs in job table"); + } + } finally { + try { jbpmContext.close(); + acquiredJobs = jobsToLock; + log.debug("obtained lock on jobs: "+acquiredJobs); } - acquiredJobs = jobsToLock; - log.debug("obtained locks on following jobs: "+acquiredJobs); - - } catch (StaleStateException e) { - log.debug("couldn't acquire lock on job(s): "+jobsToLock); + catch (JbpmPersistenceException e) { + // if this is a stale object exception, the jbpm configuration has control over the logging + if ("org.hibernate.StaleObjectStateException".equals(e.getCause().getClass().getName())) { + log.info("problem committing job acquisition transaction: optimistic locking failed"); + StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job acquisition transaction: optimistic locking failed", e); + } else { + // TODO run() will log this exception, log it here too? + log.error("problem committing job acquisition transaction", e); + throw e; + } + acquiredJobs = Collections.EMPTY_LIST; + log.debug("couldn't obtain lock on jobs: "+jobsToLock); + } } } return acquiredJobs; @@ -188,12 +197,10 @@ log.info("problem committing job execution transaction: optimistic locking failed"); StaleObjectLogConfigurer.staleObjectExceptionsLog.error("problem committing job execution transaction: optimistic locking failed", e); } else { + // TODO run() will log this exception, log it here too? log.error("problem committing job execution transaction", e); + throw e; } - } catch (RuntimeException e) { - log.error("problem committing job execution transaction", e); - - throw e; } } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2008-11-17 16:59:31 UTC (rev 2964) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2008-11-17 17:00:21 UTC (rev 2965) @@ -1,6 +1,28 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.persistence.jta; import javax.naming.InitialContext; +import javax.naming.NamingException; import javax.transaction.SystemException; import javax.transaction.UserTransaction; @@ -19,55 +41,45 @@ private static Log log = LogFactory.getLog(JbpmContext.class); - boolean isJtaTxCreated = false; + private UserTransaction userTransaction; public JtaDbPersistenceService(DbPersistenceServiceFactory persistenceServiceFactory) { super(persistenceServiceFactory); - if (! isCurrentJtaTransactionAvailable()) { + if (!isJtaTransactionInProgress()) { beginJtaTransaction(); - isJtaTxCreated = true; } } protected boolean isTransactionActive() { - return isJtaTxCreated() ; + return isJtaTxCreated() ; } public void close() { super.close(); - if (isJtaTxCreated) { + if (userTransaction != null) { endJtaTransaction(); } } - boolean isCurrentJtaTransactionAvailable() { - SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) persistenceServiceFactory.getSessionFactory(); - return JTAHelper.isTransactionInProgress(sessionFactoryImplementor); + boolean isJtaTransactionInProgress() { + SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) persistenceServiceFactory.getSessionFactory(); + return JTAHelper.isTransactionInProgress(sessionFactory); } void beginJtaTransaction() { try { log.debug("start user JTA transaction"); - getUserTransaction().begin(); + userTransaction = getUserTransaction(); + userTransaction.begin(); } catch (Exception e) { throw new JbpmException("couldn't start JTA transaction", e); } } void endJtaTransaction() { - int status = -1; - log.debug("end user JTA transaction"); - UserTransaction userTransaction = getUserTransaction(); - try { - status = userTransaction.getStatus(); - } catch (SystemException e) { - throw new JbpmException("couldn't get status for user transaction", e); - } - - boolean isRollback = JTAHelper.isRollback(status); - if (isRollback || isRollbackOnly()) { + if (isRollbackOnly() || JTAHelper.isMarkedForRollback(getJtaTransactionStatus())) { log.debug("end jta transation with ROLLBACK"); try { userTransaction.rollback(); @@ -83,25 +95,37 @@ } } } - + UserTransaction getUserTransaction() { - UserTransaction userTransaction = null; - if (userTransaction == null) { - String jndiName = "UserTransaction"; - try { - userTransaction = (UserTransaction) new InitialContext().lookup(jndiName); - } catch (Exception e) { - throw new JbpmException("couldn't lookup UserTransaction in JNDI with name "+jndiName, e); - } + String jndiName = persistenceServiceFactory.getConfiguration().getProperty("jta.UserTransaction"); + if (jndiName == null) { + /* + * EJB 2.1 �20.9 The container must make the UserTransaction interface available to the + * enterprise beans that are allowed to use this interface (only session and message- + * driven beans with bean-managed transaction demarcation are allowed to use this + * interface) in JNDI under the name java:comp/UserTransaction. + * J2EE 1.4 �4.2.1.1 The J2EE platform must provide an object implementing the + * UserTransaction interface to all web components. The platform must publish the + * UserTransaction object in JNDI under the name java:comp/UserTransaction. + */ + jndiName = "java:comp/UserTransaction"; } - return userTransaction; + try { + return (UserTransaction) new InitialContext().lookup(jndiName); + } catch (NamingException e) { + throw new JbpmException("couldn't lookup UserTransaction in JNDI with name "+jndiName, e); + } } + int getJtaTransactionStatus() { + try { + return userTransaction.getStatus(); + } catch (SystemException e) { + throw new JbpmException("couldn't get status for user transaction", e); + } + } public boolean isJtaTxCreated() { - return isJtaTxCreated; + return userTransaction != null; } - public void setJtaTxCreated(boolean isJtaTxCreated) { - this.isJtaTxCreated = isJtaTxCreated; - } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java 2008-11-17 16:59:31 UTC (rev 2964) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceServiceFactory.java 2008-11-17 17:00:21 UTC (rev 2965) @@ -16,7 +16,4 @@ public Service openService() { return new JtaDbPersistenceService(this); } - - public void close() { - } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java 2008-11-17 16:59:31 UTC (rev 2964) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/svc/Services.java 2008-11-17 17:00:21 UTC (rev 2965) @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.StaleObjectStateException; import org.jbpm.JbpmContext; import org.jbpm.JbpmException; import org.jbpm.graph.exe.ProcessInstance; @@ -214,7 +213,7 @@ public void close() { if (services!=null) { Map closeExceptions = new HashMap(); - Throwable firstException = null; + Exception firstException = null; Iterator iter = serviceNames.iterator(); while (iter.hasNext()) { String serviceName = (String) iter.next(); @@ -231,6 +230,10 @@ } else { log.error("problem closing service '"+serviceName+"'", e); } + closeExceptions.put(serviceName, e); + if (firstException==null) { + firstException = e; + } } catch (Exception e) { // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. log.error("problem closing service '"+serviceName+"'", e); @@ -241,8 +244,12 @@ } } } - if (! closeExceptions.isEmpty()) { - throw new JbpmException("problem closing services "+closeExceptions, firstException); + if (!closeExceptions.isEmpty()) { + if (firstException instanceof JbpmException) { + throw (JbpmException) firstException; + } else { + throw new JbpmException("problem closing services: "+closeExceptions, firstException); + } } } }

17 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits November 2008