JBoss JBPM SVN: r3475 - in projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm: incubator/pattern/control and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-20 05:01:26 -0500 (Sat, 20 Dec 2008)
New Revision: 3475
Removed:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/exclusivechoice/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/
Log:
WIP
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3474 - in projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts: feature and 8 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-20 05:00:20 -0500 (Sat, 20 Dec 2008)
New Revision: 3474
Added:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/
Removed:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/
Modified:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessDefinitionServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessEngineTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessInstanceServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequencePersistenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequenceTest.java
Log:
WIP
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java (from rev 3473, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/DeploymentXMLTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.cts.feature.deployment;
+
+// $Id$
+
+import java.net.URL;
+
+import org.jboss.bpm.api.deployment.Deployment;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.DeploymentService;
+import org.jboss.bpm.api.test.APITestCase;
+
+/**
+ * Test simple XML deployment
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Nov-2008
+ */
+public class DeploymentXMLTest extends APITestCase
+{
+ public void testSimpleXMLDeploy() throws Exception
+ {
+ URL pdURL = getResourceURL("cts/deployment/simple-process-" + getDialect() + ".xml");
+
+ DeploymentService depService = getProcessEngine().getService(DeploymentService.class);
+ Deployment dep = depService.createDeployment(pdURL);
+
+ ProcessDefinition procDef = depService.deploy(dep);
+ assertNotNull("ProcDef not null", procDef);
+
+ ProcessInstance proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
+ assertEquals("Node name", "a", token.getNode().getName());
+
+ token.signal();
+ assertEquals("Node name", "b", token.getNode().getName());
+
+ token.signal();
+ assertEquals("Node name", "c", token.getNode().getName());
+
+ token.signal();
+ assertEquals("Node name", "end", token.getNode().getName());
+
+ assertEquals(ProcessStatus.Completed, proc.getProcessStatus());
+
+ // Undeploy the process
+ assertTrue("Undeploy successful", depService.undeploy(dep));
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive (from rev 3473, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/exclusive)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.cts.gateway.exclusive;
+package org.jboss.bpm.cts.feature.gateway.exclusive;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service (from rev 3473, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessDefinitionServiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessDefinitionServiceTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.cts.service;
+package org.jboss.bpm.cts.feature.service;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessEngineTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessEngineTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessEngineTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.cts.service;
+package org.jboss.bpm.cts.feature.service;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessInstanceServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessInstanceServiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessInstanceServiceTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.cts.service;
+package org.jboss.bpm.cts.feature.service;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice (from rev 3473, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/exclusivechoice)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.incubator.pattern.control.exclusivechoice;
+package org.jboss.bpm.cts.pattern.control.exclusivechoice;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence (from rev 3473, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequencePersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequencePersistenceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequencePersistenceTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.incubator.pattern.control.sequence;
+package org.jboss.bpm.cts.pattern.control.sequence;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequenceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequenceTest.java 2008-12-20 10:00:20 UTC (rev 3474)
@@ -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.jboss.bpm.incubator.pattern.control.sequence;
+package org.jboss.bpm.cts.pattern.control.sequence;
// $Id$
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3473 - in projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm: cts and 28 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-20 04:31:54 -0500 (Sat, 20 Dec 2008)
New Revision: 3473
Added:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/endevent/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/executioncontext/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/process/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/control/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/data/
Removed:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/processengine/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/endevent/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/executioncontext/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/process/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/control/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/data/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/
Modified:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/DeploymentXMLTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessDefinitionServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessEngineTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessInstanceServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/endevent/EndEventMessageTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/executioncontext/ExecutionContextTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/parallel/ParallelGatewayMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/parallel/ParallelGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodeInputSetTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodeOutputSetTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodePropertyTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/multichoice/MultiChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/parallelsplit/ParallelSplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequencePersistenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/simplemerge/SimpleMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/synchronization/SynchronizationTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/data/casedata/CaseDataTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/data/taskdata/TaskDataTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/process/ProcessPropertyTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalMultithreadTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent/StartEventSignalTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/java/JavaTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/receive/ReceiveTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/send/SendTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/user/UserTaskCallbackTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/user/UserTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/TxRequiredMarshallerTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/TxRequiredTest.java
Log:
WIP
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts)
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/deployment)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/DeploymentXMLTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/deployment/DeploymentXMLTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/deployment/DeploymentXMLTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.cts.deployment;
+package org.jboss.bpm.cts.deployment;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.cts.gateway.exclusive;
+package org.jboss.bpm.cts.gateway.exclusive;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessDefinitionServiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessDefinitionServiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.cts.service;
+package org.jboss.bpm.cts.service;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessEngineTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessEngineTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessEngineTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.cts.service;
+package org.jboss.bpm.cts.service;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessInstanceServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessInstanceServiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/service/ProcessInstanceServiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.cts.service;
+package org.jboss.bpm.cts.service;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator)
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/endevent (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/endevent/EndEventMessageTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/endevent/EndEventMessageTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.endevent;
+package org.jboss.bpm.incubator.endevent;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/executioncontext (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/executioncontext)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/executioncontext/ExecutionContextTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/executioncontext/ExecutionContextTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/executioncontext/ExecutionContextTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.executioncontext;
+package org.jboss.bpm.incubator.executioncontext;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.gateway.exclusive;
+package org.jboss.bpm.incubator.gateway.exclusive;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.gateway.inclusive;
+package org.jboss.bpm.incubator.gateway.inclusive;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.gateway.inclusive;
+package org.jboss.bpm.incubator.gateway.inclusive;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.gateway.parallel;
+package org.jboss.bpm.incubator.gateway.parallel;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.gateway.parallel;
+package org.jboss.bpm.incubator.gateway.parallel;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodeInputSetTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodeInputSetTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.node;
+package org.jboss.bpm.incubator.node;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodeOutputSetTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodeOutputSetTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.node;
+package org.jboss.bpm.incubator.node;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodePropertyTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/node/NodePropertyTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.node;
+package org.jboss.bpm.incubator.node;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.exclusivechoice;
+package org.jboss.bpm.incubator.pattern.control.exclusivechoice;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/multichoice/MultiChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/multichoice/MultiChoiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.multichoice;
+package org.jboss.bpm.incubator.pattern.control.multichoice;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/parallelsplit/ParallelSplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.parallelsplit;
+package org.jboss.bpm.incubator.pattern.control.parallelsplit;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequencePersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequencePersistenceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.sequence;
+package org.jboss.bpm.incubator.pattern.control.sequence;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/sequence/SequenceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.sequence;
+package org.jboss.bpm.incubator.pattern.control.sequence;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.simplemerge;
+package org.jboss.bpm.incubator.pattern.control.simplemerge;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/synchronization/SynchronizationTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/control/synchronization/SynchronizationTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.control.synchronization;
+package org.jboss.bpm.incubator.pattern.control.synchronization;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/data/casedata/CaseDataTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/data/casedata/CaseDataTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.data.casedata;
+package org.jboss.bpm.incubator.pattern.data.casedata;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/data/taskdata/TaskDataTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/pattern/data/taskdata/TaskDataTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.pattern.data.taskdata;
+package org.jboss.bpm.incubator.pattern.data.taskdata;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/process (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/process/ProcessPropertyTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/process/ProcessPropertyTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.process;
+package org.jboss.bpm.incubator.process;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalMultithreadTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalMultithreadTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalMultithreadTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.service.signal;
+package org.jboss.bpm.incubator.service.signal;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/service/signal/SignalServiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalServiceTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.service.signal;
+package org.jboss.bpm.incubator.service.signal;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent/StartEventSignalTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent/StartEventSignalTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.startevent;
+package org.jboss.bpm.incubator.startevent;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/java/JavaTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/java/JavaTaskTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.task.java;
+package org.jboss.bpm.incubator.task.java;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/receive/ReceiveTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/receive/ReceiveTaskTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.task.receive;
+package org.jboss.bpm.incubator.task.receive;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/send/SendTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/send/SendTaskTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.task.send;
+package org.jboss.bpm.incubator.task.send;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/user/UserTaskCallbackTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/user/UserTaskCallbackTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.task.user;
+package org.jboss.bpm.incubator.task.user;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/user/UserTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/user/UserTaskTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.task.user;
+package org.jboss.bpm.incubator.task.user;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/TxRequiredMarshallerTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/TxRequiredMarshallerTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.transaction;
+package org.jboss.bpm.incubator.transaction;
// $Id$
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/TxRequiredTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-12-20 00:32:15 UTC (rev 3472)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/transaction/TxRequiredTest.java 2008-12-20 09:31:54 UTC (rev 3473)
@@ -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.jboss.bpm.test.incubator.transaction;
+package org.jboss.bpm.incubator.transaction;
// $Id$
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern)
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/control (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control)
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/pattern/data (from rev 3472, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data)
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3472 - in projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test: cts/service and 14 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 19:32:15 -0500 (Fri, 19 Dec 2008)
New Revision: 3472
Added:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessDefinitionServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessEngineTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessInstanceServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java
Removed:
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/
Log:
Refactor CTS
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessDefinitionServiceTest.java (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessDefinitionServiceTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessDefinitionServiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.cts.service;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessInstanceService;
+import org.jboss.bpm.api.test.CTSTestCase;
+
+/**
+ * Test the ProcessDefinition
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Sep-2008
+ */
+public abstract class ProcessDefinitionServiceTest extends CTSTestCase
+{
+ public void testBasicProcess() throws Exception
+ {
+ ProcessDefinition procDef = getProcessDefinition();
+
+ ProcessEngine engine = procDef.getProcessEngine();
+ assertNotNull("ProcessEngine not null", engine);
+
+ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
+ assertNotNull("ProcessDefinitionService not null", procDefService);
+
+ Set<ObjectName> procDefs = procDefService.getProcessDefinitions();
+ assertEquals("ProcessDefinition not automatically registered", 0, procDefs.size());
+ }
+
+ public void testNewInstance() throws Exception
+ {
+ ProcessDefinition procDef = getProcessDefinition();
+
+ ProcessEngine engine = procDef.getProcessEngine();
+ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+
+ ProcessInstance proc = procDef.newInstance();
+ assertNotNull("Process not null", proc);
+ assertNull("Process not automatically registered", procService.getInstance(proc.getKey()));
+ assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey()));
+ }
+
+ public void testRegister() throws Exception
+ {
+ ProcessDefinition procDef = getProcessDefinition();
+
+ ProcessEngine engine = procDef.getProcessEngine();
+ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
+
+ procDef = procDefService.registerProcessDefinition(procDef);
+ assertNotNull("Registered ProcessDefinition not null", procDef);
+
+ boolean success = procDefService.unregisterProcessDefinition(procDef.getKey());
+ assertTrue("ProcessDefinition unregistered", success);
+ }
+
+ protected abstract ProcessDefinition getProcessDefinition() throws IOException;
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessEngineTest.java (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessEngineTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessEngineTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.cts.service;
+
+// $Id$
+
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.test.CTSTestCase;
+
+/**
+ * Test the ProcessEngine
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Sep-2008
+ */
+public class ProcessEngineTest extends CTSTestCase
+{
+ public void testDefaultProcessEngine() throws Exception
+ {
+ ProcessEngine engine = Configuration.getProcessEngine();
+ assertNotNull("ProcessEngine not null", engine);
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessInstanceServiceTest.java (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessInstanceServiceTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessInstanceServiceTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/ProcessInstanceServiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.cts.service;
+
+// $Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
+import org.jboss.bpm.api.test.CTSTestCase;
+
+/**
+ * Test the ProcessService
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public abstract class ProcessInstanceServiceTest extends CTSTestCase
+{
+ public void testRegisterProcess() throws Exception
+ {
+ ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+
+ ProcessDefinition procDef = getProcessDefinition();
+ ProcessInstance proc = procDef.newInstance();
+
+ assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey()));
+ assertNull("Process not registered automatically", procService.getInstance(proc.getKey()));
+
+ // Register the process
+ proc = procService.registerInstance(proc);
+ assertNotNull("Proc not null", proc);
+ assertNotNull("ProcessDefinition registered", procDefService.getProcessDefinition(procDef.getKey()));
+ assertNotNull("Process registered", procService.getInstance(proc.getKey()));
+
+ // Unregister the process
+ procService.unregisterInstance(proc.getKey());
+ assertNull("Process unregistered", procService.getInstance(proc.getKey()));
+ assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey()));
+
+ procDefService.unregisterProcessDefinition(procDef.getKey());
+ assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey()));
+ }
+
+ public void testStartProcess() throws Exception
+ {
+ ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+
+ ProcessDefinition procDef = getProcessDefinition();
+ ProcessInstance proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
+ assertNotNull("Token not null", token);
+
+ ObjectName procID = proc.getKey();
+ assertNotNull("Process registered", procService.getInstance(procID));
+
+ // Unregister the process
+ procService.unregisterInstance(procID);
+ assertNull("Process unregistered", procService.getInstance(procID));
+ assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey()));
+
+ procDefService.unregisterProcessDefinition(procDef.getKey());
+ assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey()));
+ }
+
+ protected abstract ProcessDefinition getProcessDefinition();
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.exclusivechoice;
-
-// $Id$
-
-import java.io.IOException;
-import java.util.List;
-
-import org.jboss.bpm.api.model.Gateway;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.builder.GatewayBuilder;
-import org.jboss.bpm.api.runtime.BasicAttachments;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Signal;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Exclusive data-based gateway that has conditional outgoing sequence flows.
- * Only one of the gates is taken. It is an error if no gate is applicable.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 06-Aug-2008
- */
-public class ExclusiveChoiceTest extends CTSTestCase
-{
- public void testGateA() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- BasicAttachments att = new BasicAttachments();
- att.addAttachment("foo", "5");
- proc.startProcessAsync(att);
- proc.waitForEnd();
-
- List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
- assertEquals(1, endSignals.size());
- assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name"));
- }
-
- public void testGateB() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- BasicAttachments att = new BasicAttachments();
- att.addAttachment("foo", "15");
- proc.startProcessAsync(att);
- proc.waitForEnd();
-
- List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
- assertEquals(1, endSignals.size());
- assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name"));
- }
-
- public void testInvalidGate() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- BasicAttachments att = new BasicAttachments();
- att.addAttachment("foo", "10");
- proc.startProcessAsync(att);
- try
- {
- proc.waitForEnd();
- fail("No gate defined for foo==10");
- }
- catch (RuntimeException rte)
- {
- // expected
- }
- }
-
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10");
- procBuilder.addEndEventExt("EndA").addEndEventExt("EndB");
- return procBuilder.getProcessDefinition();
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.exclusivechoice;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.Signal;
+import org.jboss.bpm.api.runtime.BasicAttachments;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Gateway;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.builder.GatewayBuilder;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Exclusive data-based gateway that has conditional outgoing sequence flows.
+ * Only one of the gates is taken. It is an error if no gate is applicable.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class ExclusiveChoiceTest extends CTSTestCase
+{
+ public void testGateA() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("foo", "5");
+ proc.startProcessAsync(att);
+ proc.waitForEnd();
+
+ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ assertEquals(1, endSignals.size());
+ assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name"));
+ }
+
+ public void testGateB() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("foo", "15");
+ proc.startProcessAsync(att);
+ proc.waitForEnd();
+
+ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ assertEquals(1, endSignals.size());
+ assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name"));
+ }
+
+ public void testInvalidGate() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("foo", "10");
+ proc.startProcessAsync(att);
+ try
+ {
+ proc.waitForEnd();
+ fail("No gate defined for foo==10");
+ }
+ catch (RuntimeException rte)
+ {
+ // expected
+ }
+ }
+
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
+ gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10");
+ procBuilder.addEndEventExt("EndA").addEndEventExt("EndB");
+ return procBuilder.getProcessDefinition();
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.multichoice;
-
-// $Id$
-
-import java.io.IOException;
-import java.util.List;
-
-import org.jboss.bpm.api.model.Gateway;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.builder.GatewayBuilder;
-import org.jboss.bpm.api.runtime.BasicAttachments;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Signal;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Inclusive gateway that has conditional outgoing sequence flows.
- * One or more of them can be taken.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 06-Aug-2008
- */
-public class MultiChoiceTest extends CTSTestCase
-{
- public void testGateA() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- BasicAttachments att = new BasicAttachments();
- att.addAttachment("foo", "5");
- proc.startProcessAsync(att);
- proc.waitForEnd();
-
- List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
- assertEquals(2, endSignals.size());
- }
-
- public void testGateB() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- BasicAttachments att = new BasicAttachments();
- att.addAttachment("foo", "15");
- proc.startProcessAsync(att);
- proc.waitForEnd();
-
- List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
- assertEquals(1, endSignals.size());
- assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name"));
- }
-
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split");
- GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
- gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
- gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20");
- procBuilder.addEndEventExt("EndA").addEndEventExt("EndB");
- return procBuilder.getProcessDefinition();
- }
-}
\ No newline at end of file
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/multichoice/MultiChoiceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.multichoice;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.Signal;
+import org.jboss.bpm.api.runtime.BasicAttachments;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Gateway;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.builder.GatewayBuilder;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Inclusive gateway that has conditional outgoing sequence flows.
+ * One or more of them can be taken.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class MultiChoiceTest extends CTSTestCase
+{
+ public void testGateA() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("foo", "5");
+ proc.startProcessAsync(att);
+ proc.waitForEnd();
+
+ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ assertEquals(2, endSignals.size());
+ }
+
+ public void testGateB() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ BasicAttachments att = new BasicAttachments();
+ att.addAttachment("foo", "15");
+ proc.startProcessAsync(att);
+ proc.waitForEnd();
+
+ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ assertEquals(1, endSignals.size());
+ assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name"));
+ }
+
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess("MultiChoiceTest").addStartEvent("Start").addSequenceFlow("Split");
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive);
+ gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10");
+ gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20");
+ procBuilder.addEndEventExt("EndA").addEndEventExt("EndB");
+ return procBuilder.getProcessDefinition();
+ }
+}
\ No newline at end of file
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.parallelsplit;
-
-// $Id$
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.Gateway;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Signal;
-import org.jboss.bpm.incubator.model.Signal.SignalType;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Parallel gateway that has uncontrolled outgoing sequence flows.
- * All of them are taken, which leads to parallel paths of execution.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 06-Aug-2008
- */
-public class ParallelSplitTest extends CTSTestCase
-{
- public void testParallelSplit() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- proc.startProcessAsync();
- proc.waitForEnd();
-
- // Validate received signals
- List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER);
- assertEquals(2, signals.size());
- ObjectName fromRef0 = signals.get(0).getFromRef();
- ObjectName fromRef1 = signals.get(1).getFromRef();
- String fromRefs = fromRef0.getKeyProperty("name") + fromRef1.getKeyProperty("name");
- assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA"));
- assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB"));
- }
-
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
- addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB");
- return procBuilder.getProcessDefinition();
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.parallelsplit;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.Signal;
+import org.jboss.bpm.api.model.Signal.SignalType;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Gateway;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Parallel gateway that has uncontrolled outgoing sequence flows.
+ * All of them are taken, which leads to parallel paths of execution.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class ParallelSplitTest extends CTSTestCase
+{
+ public void testParallelSplit() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ proc.startProcessAsync();
+ proc.waitForEnd();
+
+ // Validate received signals
+ List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER);
+ assertEquals(2, signals.size());
+ ObjectName fromRef0 = signals.get(0).getFromRef();
+ ObjectName fromRef1 = signals.get(1).getFromRef();
+ String fromRefs = fromRef0.getKeyProperty("name") + fromRef1.getKeyProperty("name");
+ assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndA"));
+ assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB"));
+ }
+
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel).
+ addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB");
+ return procBuilder.getProcessDefinition();
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequencePersistenceTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.sequence;
-
-// $Id$
-
-import java.io.IOException;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.incubator.service.PersistenceService;
-
-/**
- * Test the basic execution sequence
- *
- * @author thomas.diesler(a)jboss.com
- * @since 03-Jul-2008
- */
-public class SequencePersistenceTest extends SequenceTest
-{
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessDefinition procDef = super.getProcessDefinition();
-
- // Save the process definition
- PersistenceService service = getProcessEngine().getService(PersistenceService.class);
- ObjectName procDefID = service.saveProcessDefinition(procDef);
-
- // Reload the process defintion
- return service.loadProcessDefinition(procDefID);
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequencePersistenceTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequencePersistenceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.sequence;
+
+// $Id$
+
+import java.io.IOException;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.incubator.service.PersistenceService;
+
+/**
+ * Test the basic execution sequence
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class SequencePersistenceTest extends SequenceTest
+{
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessDefinition procDef = super.getProcessDefinition();
+
+ // Save the process definition
+ PersistenceService service = getProcessEngine().getService(PersistenceService.class);
+ ObjectName procDefID = service.saveProcessDefinition(procDef);
+
+ // Reload the process defintion
+ return service.loadProcessDefinition(procDefID);
+ }
+}
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.sequence;
-
-// $Id$
-
-import java.io.IOException;
-import java.util.List;
-
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Signal;
-import org.jboss.bpm.incubator.model.Signal.SignalType;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Test the basic execution sequence
- *
- * @author thomas.diesler(a)jboss.com
- * @since 03-Jul-2008
- */
-public class SequenceTest extends CTSTestCase
-{
- public void testSequence() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
-
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- // Start the Process
- proc.startProcessAsync();
- proc.waitForEnd();
-
- // Validate received signals
- List<Signal> signals = getSignals();
- assertEquals(SignalType.SYSTEM_PROCESS_ENTER, signals.get(0).getSignalType());
- assertEquals(SignalType.SYSTEM_START_EVENT_ENTER, signals.get(1).getSignalType());
- assertEquals(SignalType.SYSTEM_START_EVENT_EXIT, signals.get(2).getSignalType());
- assertEquals(SignalType.SYSTEM_TASK_ENTER, signals.get(3).getSignalType());
- assertEquals(SignalType.SYSTEM_TASK_EXIT, signals.get(4).getSignalType());
- assertEquals(SignalType.SYSTEM_END_EVENT_ENTER, signals.get(5).getSignalType());
- assertEquals(SignalType.SYSTEM_END_EVENT_EXIT, signals.get(6).getSignalType());
- assertEquals(SignalType.SYSTEM_PROCESS_EXIT, signals.get(7).getSignalType());
- }
-
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
- procBuilder.addTaskExt("Task").addSequenceFlow("End").addEndEvent("End");
- return procBuilder.getProcessDefinition();
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/sequence/SequenceTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.sequence;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.Signal;
+import org.jboss.bpm.api.model.Signal.SignalType;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Test the basic execution sequence
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Jul-2008
+ */
+public class SequenceTest extends CTSTestCase
+{
+ public void testSequence() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ // Start the Process
+ proc.startProcessAsync();
+ proc.waitForEnd();
+
+ // Validate received signals
+ List<Signal> signals = getSignals();
+ assertEquals(SignalType.SYSTEM_PROCESS_ENTER, signals.get(0).getSignalType());
+ assertEquals(SignalType.SYSTEM_START_EVENT_ENTER, signals.get(1).getSignalType());
+ assertEquals(SignalType.SYSTEM_START_EVENT_EXIT, signals.get(2).getSignalType());
+ assertEquals(SignalType.SYSTEM_TASK_ENTER, signals.get(3).getSignalType());
+ assertEquals(SignalType.SYSTEM_TASK_EXIT, signals.get(4).getSignalType());
+ assertEquals(SignalType.SYSTEM_END_EVENT_ENTER, signals.get(5).getSignalType());
+ assertEquals(SignalType.SYSTEM_END_EVENT_EXIT, signals.get(6).getSignalType());
+ assertEquals(SignalType.SYSTEM_PROCESS_EXIT, signals.get(7).getSignalType());
+ }
+
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
+ procBuilder.addTaskExt("Task").addSequenceFlow("End").addEndEvent("End");
+ return procBuilder.getProcessDefinition();
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.simplemerge;
-
-// $Id$
-
-import java.io.IOException;
-import java.util.List;
-
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Gateway.GatewayType;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Signal;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows
- * proceeds unconditionally along the outgoing sequence flow. The inclusive join is stateless.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 06-Aug-2008
- */
-public class SimpleMergeTest extends CTSTestCase
-{
- public void testSimpleMerge() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- // Start the process
- proc.startProcessAsync();
-
- // Wait for the process to end
- proc.waitForEnd(5000);
-
- List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
- assertEquals("Two end signals expected", 2, endSignals.size());
- }
-
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split");
- procBuilder.addGateway("Split", GatewayType.Inclusive).addSequenceFlow("TaskA").addSequenceFlow("TaskB");
- procBuilder.addTaskExt("TaskA").addSequenceFlow("Merge");
- procBuilder.addTaskExt("TaskB").addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
- procBuilder.addEndEvent("End");
- return procBuilder.getProcessDefinition();
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.simplemerge;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.Signal;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Gateway.GatewayType;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Inclusive gateway that has multiple incoming sequence flows. All tokens arriving from incoming sequence flows
+ * proceeds unconditionally along the outgoing sequence flow. The inclusive join is stateless.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class SimpleMergeTest extends CTSTestCase
+{
+ public void testSimpleMerge() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ // Start the process
+ proc.startProcessAsync();
+
+ // Wait for the process to end
+ proc.waitForEnd(5000);
+
+ List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT);
+ assertEquals("Two end signals expected", 2, endSignals.size());
+ }
+
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split");
+ procBuilder.addGateway("Split", GatewayType.Inclusive).addSequenceFlow("TaskA").addSequenceFlow("TaskB");
+ procBuilder.addTaskExt("TaskA").addSequenceFlow("Merge");
+ procBuilder.addTaskExt("TaskB").addSequenceFlow("Merge");
+ procBuilder.addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End");
+ procBuilder.addEndEvent("End");
+ return procBuilder.getProcessDefinition();
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.control.synchronization;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Event.EventDetailType;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.Gateway.GatewayType;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Message;
-import org.jboss.bpm.incubator.model.Assignment.AssignTime;
-import org.jboss.bpm.incubator.model.builder.MessageBuilder;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow
- * is stored in the gateway until a token has arrived from each incoming sequence flow. The tokens are merged together
- * and leave the gateway as a one.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 06-Aug-2008
- */
-public class SynchronizationTest extends CTSTestCase
-{
- public void testParallelMerge() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- // Start the process
- proc.startProcessAsync();
-
- // Wait for the process to end
- proc.waitForEnd();
-
- // Verify the result
- Message endMessage = getMessages().get(0);
- assertEquals("TaskA", endMessage.getProperty("taskValueA").getValue());
- assertEquals("TaskB", endMessage.getProperty("taskValueB").getValue());
- }
-
- public ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split");
- procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("TaskA").addSequenceFlow("TaskB");
- procBuilder.addTaskExt("TaskA").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA").addSequenceFlow("Merge");
- procBuilder.addTaskExt("TaskB").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB").addSequenceFlow("Merge");
- procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("End");
- procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true);
- return procBuilder.getProcessDefinition();
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/control/synchronization/SynchronizationTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.control.synchronization;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.api.model.Message;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.builder.MessageBuilder;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Assignment.AssignTime;
+import org.jboss.bpm.incubator.model.Event.EventDetailType;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.Gateway.GatewayType;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Parallel gateway that that has multiple incoming sequence flows. Each token arriving from an incoming sequence flow
+ * is stored in the gateway until a token has arrived from each incoming sequence flow. The tokens are merged together
+ * and leave the gateway as a one.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Aug-2008
+ */
+public class SynchronizationTest extends CTSTestCase
+{
+ public void testParallelMerge() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ // Start the process
+ proc.startProcessAsync();
+
+ // Wait for the process to end
+ proc.waitForEnd();
+
+ // Verify the result
+ Message endMessage = getMessages().get(0);
+ assertEquals("TaskA", endMessage.getProperty("taskValueA").getValue());
+ assertEquals("TaskB", endMessage.getProperty("taskValueB").getValue());
+ }
+
+ public ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess("ParallelGatewayMerge").addStartEvent("Start").addSequenceFlow("Split");
+ procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("TaskA").addSequenceFlow("TaskB");
+ procBuilder.addTaskExt("TaskA").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA").addSequenceFlow("Merge");
+ procBuilder.addTaskExt("TaskB").addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB").addSequenceFlow("Merge");
+ procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("End");
+ procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true);
+ return procBuilder.getProcessDefinition();
+ }
+}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.data.casedata;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Event.EventDetailType;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Message;
-import org.jboss.bpm.incubator.model.Assignment.AssignTime;
-import org.jboss.bpm.incubator.model.builder.MessageBuilder;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-
-/**
- * Data elements are supported which are specific to a process instance or case. They can be accessed by all components
- * of the process during the execution of the case.
- *
- * https://jira.jboss.org/jira/browse/JBPM-1519
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class CaseDataTest extends CTSTestCase
-{
- public void testCaseProperties() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- proc.startProcessAsync();
- proc.waitForEnd();
-
- Message endMessage = getMessages().get(0);
- assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getProperty("propValue").getValue());
- }
-
- protected ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess("CaseData");
- procBuilder.addProcessAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "propValue");
- procBuilder.addProcessProperty("foo", "bar").addStartEvent("Start").addSequenceFlow("TaskA");
- procBuilder.addTaskExt("TaskA").addSequenceFlow("End");
- procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
- return procBuilder.getProcessDefinition();
- }
-}
\ No newline at end of file
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/casedata/CaseDataTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.data.casedata;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.api.model.Message;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.builder.MessageBuilder;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Assignment.AssignTime;
+import org.jboss.bpm.incubator.model.Event.EventDetailType;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Data elements are supported which are specific to a process instance or case. They can be accessed by all components
+ * of the process during the execution of the case.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1519
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class CaseDataTest extends CTSTestCase
+{
+ public void testCaseProperties() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ proc.startProcessAsync();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getProperty("propValue").getValue());
+ }
+
+ protected ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess("CaseData");
+ procBuilder.addProcessAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "propValue");
+ procBuilder.addProcessProperty("foo", "bar").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addTaskExt("TaskA").addSequenceFlow("End");
+ procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
+ return procBuilder.getProcessDefinition();
+ }
+}
\ No newline at end of file
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata (from rev 3446, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata)
Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java 2008-12-19 16:48:49 UTC (rev 3446)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.test.pattern.data.taskdata;
-
-// $Id$
-
-import java.io.IOException;
-
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Event.EventDetailType;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessInstanceExt;
-import org.jboss.bpm.incubator.model.Message;
-import org.jboss.bpm.incubator.model.Assignment.AssignTime;
-import org.jboss.bpm.incubator.model.builder.MessageBuilder;
-import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
-import org.jboss.bpm.incubator.model.builder.TaskBuilder;
-
-/**
- * Data elements can be defined by tasks which are accessible only within the context of individual execution instances
- * of that task.
- *
- * https://jira.jboss.org/jira/browse/JBPM-1515
- *
- * @author thomas.diesler(a)jboss.com
- * @since 15-Aug-2008
- */
-public class TaskDataTest extends CTSTestCase
-{
- public void testTaskDataRead() throws Exception
- {
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
-
- proc.startProcessAsync();
- proc.waitForEnd();
-
- Message endMessage = getMessages().get(0);
- assertNotNull("EndMessage expected", endMessage);
- assertEquals("bar", endMessage.getProperty("foo").getValue());
- }
-
- protected ProcessDefinition getProcessDefinition() throws IOException
- {
- ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
- ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
- procBuilder.addProcess("TaskData").addStartEvent("Start").addSequenceFlow("TaskA");
- TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA");
- taskBuilder.addNodeProperty("foo", "bar").addSequenceFlow("End");
- taskBuilder.addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskData_TaskA_foo", "foo");
- procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage");
- MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage");
- msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
- return procBuilder.getProcessDefinition();
- }
-}
Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java (from rev 3471, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java)
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/pattern/data/taskdata/TaskDataTest.java 2008-12-20 00:32:15 UTC (rev 3472)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.test.incubator.pattern.data.taskdata;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jboss.bpm.api.model.Message;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.builder.MessageBuilder;
+import org.jboss.bpm.api.test.CTSTestCase;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Assignment.AssignTime;
+import org.jboss.bpm.incubator.model.Event.EventDetailType;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
+import org.jboss.bpm.incubator.model.builder.TaskBuilder;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
+
+/**
+ * Data elements can be defined by tasks which are accessible only within the context of individual execution instances
+ * of that task.
+ *
+ * https://jira.jboss.org/jira/browse/JBPM-1515
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 15-Aug-2008
+ */
+public class TaskDataTest extends CTSTestCase
+{
+ public void testTaskDataRead() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+
+ proc.startProcessAsync();
+ proc.waitForEnd();
+
+ Message endMessage = getMessages().get(0);
+ assertNotNull("EndMessage expected", endMessage);
+ assertEquals("bar", endMessage.getProperty("foo").getValue());
+ }
+
+ protected ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class);
+ ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder();
+ procBuilder.addProcess("TaskData").addStartEvent("Start").addSequenceFlow("TaskA");
+ TaskBuilder taskBuilder = procBuilder.addTaskExt("TaskA");
+ taskBuilder.addNodeProperty("foo", "bar").addSequenceFlow("End");
+ taskBuilder.addNodeAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "TaskData_TaskA_foo", "foo");
+ procBuilder.addEndEventExt("End", EventDetailType.Message).addMessageRef("EndMessage");
+ MessageBuilder msgBuilder = procBuilder.addProcessMessage("EndMessage");
+ msgBuilder.addToRef(getTestID()).addProperty("foo", null, true);
+ return procBuilder.getProcessDefinition();
+ }
+}
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3471 - in projects/gwt-console/trunk/server: src/main/java/org/jboss/bpm/console/server/integration/spec and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 19:13:52 -0500 (Fri, 19 Dec 2008)
New Revision: 3471
Modified:
projects/gwt-console/trunk/server/pom.xml
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/InvocationProxy.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
Log:
Use bpm-spec-1.0.0-SNAPSHOT
Modified: projects/gwt-console/trunk/server/pom.xml
===================================================================
--- projects/gwt-console/trunk/server/pom.xml 2008-12-20 00:02:55 UTC (rev 3470)
+++ projects/gwt-console/trunk/server/pom.xml 2008-12-20 00:13:52 UTC (rev 3471)
@@ -16,7 +16,7 @@
<!-- Properties -->
<properties>
- <jboss.bpm.version>1.0.0-Alpha3</jboss.bpm.version>
+ <bpm.spec.version>1.0.0-SNAPSHOT</bpm.spec.version>
<balalaika.version>1.0.0-SNAPSHOT</balalaika.version>
<json-lib.version>2.2.3</json-lib.version>
</properties>
@@ -47,8 +47,8 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
- <version>${jboss.bpm.version}</version>
+ <artifactId>bpm-spec-api</artifactId>
+ <version>${bpm.spec.version}</version>
<scope>provided</scope>
</dependency>
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/InvocationProxy.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/InvocationProxy.java 2008-12-20 00:02:55 UTC (rev 3470)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/InvocationProxy.java 2008-12-20 00:13:52 UTC (rev 3471)
@@ -26,8 +26,8 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.ContextService;
/**
* Decorates management invocations with common system aspects.
@@ -51,8 +51,8 @@
public Object invoke(Object proxy, Method m, Object[] args) throws Throwable
{
- ExecutionContextService ctxService = ProcessEngineFactory.getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = ProcessEngineFactory.getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
return m.invoke(obj, args);
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-20 00:02:55 UTC (rev 3470)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-20 00:13:52 UTC (rev 3471)
@@ -29,12 +29,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.SingleOutFlowSupport;
import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
@@ -46,6 +43,9 @@
import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE;
import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
import org.jboss.bpm.console.server.integration.ProcessManagement;
+import org.jboss.bpm.incubator.model.Gateway;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.SingleOutFlowSupport;
/**
* An implementation that delegates to a BPM Spec.
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-20 00:02:55 UTC (rev 3470)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-20 00:13:52 UTC (rev 3471)
@@ -29,15 +29,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SingleOutFlowSupport;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.ExecutionService;
+import org.jboss.bpm.api.service.TokenService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.server.integration.TaskManagement;
+import org.jboss.bpm.incubator.model.SingleOutFlowSupport;
import org.jboss.bpm.incubator.service.TaskInstanceService;
import org.jboss.bpm.incubator.task.TaskInstance;
@@ -152,10 +152,10 @@
return taskService;
}
- private ExecutionService getExecutionService()
+ private TokenService getExecutionService()
{
ProcessEngine engine = ProcessEngineFactory.getProcessEngine();
- ExecutionService exService = engine.getService(ExecutionService.class);
+ TokenService exService = engine.getService(TokenService.class);
return exService;
}
}
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3470 - jbpm3/trunk/modules/enterprise/src/main/etc.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 19:02:55 -0500 (Fri, 19 Dec 2008)
New Revision: 3470
Added:
jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml
Log:
Restore jbpm.cfg.xml
Copied: jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml (from rev 3439, jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml)
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2008-12-20 00:02:55 UTC (rev 3470)
@@ -0,0 +1,19 @@
+<jbpm-configuration>
+
+ <jbpm-context>
+ <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
+ <service name="message" factory="org.jbpm.msg.jms.JmsMessageServiceFactory" />
+ <service name="scheduler" factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
+ <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
+ </jbpm-context>
+
+ <!--
+ Note, that the default job executor needs to be overwritten with a null value.
+ In the enterprise configuration there should be no job executor.
+ Async messaging is there bound to jms and timers to ejb timers.
+ -->
+ <null name="jbpm.job.executor" />
+
+</jbpm-configuration>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3469 - jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 18:32:42 -0500 (Fri, 19 Dec 2008)
New Revision: 3469
Removed:
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java
Log:
Move DeploymentXMLTest to CTS
Deleted: jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java
===================================================================
--- jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java 2008-12-19 23:20:54 UTC (rev 3468)
+++ jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java 2008-12-19 23:32:42 UTC (rev 3469)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.test.integration.spec.deployment;
-
-// $Id$
-
-import java.net.URL;
-
-import org.jboss.bpm.api.deployment.Deployment;
-import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.service.internal.AbstractDeploymentService;
-import org.jboss.bpm.api.test.APITestCase;
-
-/**
- * Test simple XML deployment
- *
- * @author thomas.diesler(a)jboss.com
- * @since 24-Nov-2008
- */
-public class DeploymentXMLTest extends APITestCase
-{
- public void testSimpleXMLDeploy() throws Exception
- {
- URL pdURL = getResourceURL("deployment/simple-process.xml");
-
- DeploymentService depService = getProcessEngine().getService(AbstractDeploymentService.class);
- Deployment dep = depService.createDeployment(pdURL);
-
- ProcessDefinition procDef = depService.deploy(dep);
- assertNotNull("ProcDef not null", procDef);
-
- ProcessInstance proc = procDef.newInstance();
-
- Token token = proc.startProcess();
- assertEquals("Node name", "a", token.getNode().getName());
-
- token.signal();
- assertEquals("Node name", "b", token.getNode().getName());
-
- token.signal();
- assertEquals("Node name", "c", token.getNode().getName());
-
- token.signal();
- assertEquals("Node name", "end", token.getNode().getName());
-
- assertEquals(ProcessStatus.Completed, proc.getProcessStatus());
-
- // Undeploy the process
- assertTrue("Undeploy successful", depService.undeploy(dep));
- }
-}
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3468 - projects/spec/trunk/modules/integration/jboss42/src/main/etc.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 18:20:54 -0500 (Fri, 19 Dec 2008)
New Revision: 3468
Modified:
projects/spec/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml
Log:
Fix bean config
Modified: projects/spec/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml
===================================================================
--- projects/spec/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-12-19 23:15:33 UTC (rev 3467)
+++ projects/spec/trunk/modules/integration/jboss42/src/main/etc/jboss-beans.xml 2008-12-19 23:20:54 UTC (rev 3468)
@@ -13,50 +13,35 @@
<bean name="BPMProcessEngine" class="org.jbpm.integration.spec.service.ProcessEngineImpl">
<property name="services">
<set elementClass="org.jboss.bpm.api.service.Service">
+ <inject bean="BPMContextService"/>
<inject bean="BPMDeploymentService"/>
<inject bean="BPMDialectHandlerService"/>
- <inject bean="BPMExecutionContextService"/>
- <inject bean="BPMExecutionService"/>
<inject bean="BPMIdentityService"/>
- <inject bean="BPMProcessBuilderService"/>
<inject bean="BPMProcessDefinitionService"/>
- <inject bean="BPMProcessService"/>
- <inject bean="BPMTaskService"/>
+ <inject bean="BPMProcessInstanceService"/>
+ <inject bean="BPMTaskInstanceService"/>
+ <inject bean="BPMTokenService"/>
</set>
</property>
</bean>
- <!-- The PersistenceService -->
- <bean name="BPMPersistenceService" class="org.jbpm.integration.spec.service.NoopPersistenceServiceImpl" />
-
- <!-- The ProcessService -->
- <bean name="BPMProcessService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl">
- <property name="interceptors">
- <list elementClass="java.lang.String">
- <value>org.jbpm.integration.spec.runtime.NodeExecuteInterceptor</value>
- </list>
- </property>
- </bean>
-
<!-- The DialectHandlerService -->
<bean name="BPMDialectHandlerService" class="org.jbpm.integration.spec.service.DialectHandlerServiceImpl">
<property name="dialectHandlers">
<map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler">
- <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry>
<entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry>
</map>
</property>
</bean>
- <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" />
<bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.spec.jpdl32.DialectHandlerImpl" />
<!-- Other Services -->
+ <bean name="BPMContextService" class="org.jbpm.integration.spec.service.ContextServiceImpl" />
<bean name="BPMDeploymentService" class="org.jbpm.integration.spec.service.DeploymentServiceImpl" />
- <bean name="BPMExecutionContextService" class="org.jbpm.integration.spec.service.ExecutionContextServiceImpl" />
- <bean name="BPMExecutionService" class="org.jbpm.integration.spec.service.ExecutionServiceImpl" />
<bean name="BPMIdentityService" class="org.jbpm.integration.spec.service.IdentityServiceImpl" />
- <bean name="BPMProcessBuilderService" class="org.jbpm.integration.spec.service.ProcessBuilderServiceImpl" />
<bean name="BPMProcessDefinitionService" class="org.jbpm.integration.spec.service.ProcessDefinitionServiceImpl" />
- <bean name="BPMTaskService" class="org.jbpm.integration.spec.service.TaskServiceImpl" />
+ <bean name="BPMProcessInstanceService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl"/>
+ <bean name="BPMTaskInstanceService" class="org.jbpm.integration.spec.service.TaskInstanceServiceImpl" />
+ <bean name="BPMTokenService" class="org.jbpm.integration.spec.service.TokenServiceImpl" />
</deployment>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3467 - in jbpm3/trunk: modules/distribution and 10 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 18:15:33 -0500 (Fri, 19 Dec 2008)
New Revision: 3467
Added:
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
jbpm3/trunk/modules/integration/src/test/resources/deployment/
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
jbpm3/trunk/modules/integration/src/test/resources/jndi.properties
Removed:
jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
jbpm3/trunk/pom.xml
Log:
Fix dependencies and restore DeploymentPARTest
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -103,19 +103,15 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <artifactId>bpm-spec-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
<classifier>config</classifier>
</dependency>
@@ -127,12 +123,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
- <classifier>soa</classifier>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<type>war</type>
</dependency>
@@ -297,6 +287,14 @@
<profiles>
<profile>
<id>soa</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <classifier>soa</classifier>
+ <type>war</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -54,7 +54,7 @@
<outputDirectory>resources/jbpm-integration-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jboss-bpm-integration-jboss42:jar:config</include>
+ <include>*:bpm-spec-integration-jboss42:jar:config</include>
<include>*:jbpm-integration-spec:jar:config</include>
</includes>
<unpack>true</unpack>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -160,8 +160,8 @@
<include name="dom4j.jar" />
<include name="hibernate.jar" />
<include name="hsqldb.jar" />
- <include name="jboss-bpm-api.jar" />
- <include name="jboss-bpm-integration-jboss42.jar" />
+ <include name="bpm-spec-api.jar" />
+ <include name="bpm-spec-integration-jboss42.jar" />
<include name="jbpm-enterprise-bundle.ear" />
<include name="jbpm-integration-spec.jar"/>
<include name="jbpm-jpdl.jar" />
@@ -198,7 +198,6 @@
<!-- jbpm/jbpm-integration.beans -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans" override="true">
- <include name="jboss-bpm-dialect-api10.jar" />
<include name="jbpm-integration-spec.jar" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-integration.beans/META-INF" override="true">
@@ -214,8 +213,8 @@
<include name="bpm-process-deployer.xml" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
- <include name="jboss-bpm-api.jar" />
- <include name="jboss-bpm-integration-jboss42.jar" />
+ <include name="bpm-spec-api.jar" />
+ <include name="bpm-spec-integration-jboss42.jar" />
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
<include name="slf4j-api.jar" />
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <artifactId>bpm-spec-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Deleted: jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -1,19 +0,0 @@
-<jbpm-configuration>
-
- <jbpm-context>
- <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
- <service name="message" factory="org.jbpm.msg.jms.JmsMessageServiceFactory" />
- <service name="scheduler" factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
- <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
- <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
- <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
- </jbpm-context>
-
- <!--
- Note, that the default job executor needs to be overwritten with a null value.
- In the enterprise configuration there should be no job executor.
- Async messaging is there bound to jms and timers to ejb timers.
- -->
- <null name="jbpm.job.executor" />
-
-</jbpm-configuration>
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-19 23:15:33 UTC (rev 3467)
@@ -21,6 +21,8 @@
*/
package org.jbpm.enterprise.config;
+// $Id$
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -31,7 +33,7 @@
import junit.framework.TestCase;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.model.ObjectNameFactory;
import org.jboss.bpm.api.test.IntegrationTestHelper;
/**
Copied: jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment (from rev 3353, jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment)
Deleted: jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
===================================================================
--- jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-12 08:26:18 UTC (rev 3353)
+++ jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-19 23:15:33 UTC (rev 3467)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * 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.integration.spec.deployment;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.jboss.bpm.api.deployment.Deployment;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.DeploymentService;
-import org.jboss.bpm.api.test.APITestCase;
-import org.jboss.bpm.incubator.service.TaskInstanceService;
-
-/**
- * Test simple PAR deployment
- *
- * @author thomas.diesler(a)jboss.com
- * @since 24-Nov-2008
- */
-public class DeploymentPARTest extends APITestCase
-{
-
- public void testSimplePARDeploy() throws Exception
- {
- URL parURL = getTestArchiveURL("fork-join-example.par");
-
- DeploymentService depService = getProcessEngine().getService(DeploymentService.class);
- Deployment dep = depService.createDeployment(parURL);
-
- ProcessDefinition procDef = depService.deploy(dep);
- assertNotNull("ProcDef not null", procDef);
-
- ProcessInstance proc = procDef.newInstance();
-
- Token token = proc.startProcess();
-
- assertEquals("fork1", token.getNode().getName());
- assertEquals(2, token.getChildTokens().size());
-
- // Get the child tokens
- Token childOne = getChildToken(token, "Review Order");
- assertNotNull("Review Order", childOne);
-
- Token childTwo = getChildToken(token, "Prepare shipping");
- assertNotNull("Review Order", childTwo);
-
- TaskInstanceService taskService = getProcessEngine().getService(TaskInstanceService.class);
- assertEquals(2, taskService.getTasksByProcess(proc.getKey()).size());
-
- // Undeploy the process
- assertTrue("Undeploy successful", depService.undeploy(dep));
- }
-
- private Token getChildToken(Token token, String nodeName)
- {
- Map<String, Token> childToks = new HashMap<String, Token>();
- Iterator<Token> itTok = token.getChildTokens().iterator();
- while (itTok.hasNext())
- {
- Token child = itTok.next();
- childToks.put(child.getNode().getName(), child);
- }
- return childToks.get(nodeName);
- }
-}
Copied: jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java (from rev 3353, jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java (rev 0)
+++ jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-19 23:15:33 UTC (rev 3467)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.integration.spec.deployment;
+
+// $Id$
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jboss.bpm.api.deployment.Deployment;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.DeploymentService;
+import org.jboss.bpm.api.test.APITestCase;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
+
+/**
+ * Test simple PAR deployment
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Nov-2008
+ */
+public class DeploymentPARTest extends APITestCase
+{
+
+ public void testSimplePARDeploy() throws Exception
+ {
+ URL parURL = getTestArchiveURL("fork-join-example.par");
+
+ DeploymentService depService = getProcessEngine().getService(DeploymentService.class);
+ Deployment dep = depService.createDeployment(parURL);
+
+ ProcessDefinition procDef = depService.deploy(dep);
+ assertNotNull("ProcDef not null", procDef);
+
+ ProcessInstance proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
+
+ assertEquals("fork1", token.getNode().getName());
+ assertEquals(2, token.getChildTokens().size());
+
+ // Get the child tokens
+ Token childOne = getChildToken(token, "Review Order");
+ assertNotNull("Review Order", childOne);
+
+ Token childTwo = getChildToken(token, "Prepare shipping");
+ assertNotNull("Review Order", childTwo);
+
+ TaskInstanceService taskService = getProcessEngine().getService(TaskInstanceService.class);
+ assertEquals(2, taskService.getTasksByProcess(proc.getKey()).size());
+
+ // Undeploy the process
+ assertTrue("Undeploy successful", depService.undeploy(dep));
+ }
+
+ private Token getChildToken(Token token, String nodeName)
+ {
+ Map<String, Token> childToks = new HashMap<String, Token>();
+ Iterator<Token> itTok = token.getChildTokens().iterator();
+ while (itTok.hasNext())
+ {
+ Token child = itTok.next();
+ childToks.put(child.getNode().getName(), child);
+ }
+ return childToks.get(nodeName);
+ }
+}
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment (from rev 3353, jbpm3/trunk/modules/integration/src/test/resources/deployment)
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example (from rev 3353, jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example)
Deleted: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml 2008-12-12 08:26:18 UTC (rev 3353)
+++ jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="ForkJoinExample3" width="658" height="421">
- <node name="start" x="150" y="25" width="140" height="40">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="fork1" x="96" y="95" width="252" height="24">
- <edge>
- <label x="5" y="-10" />
- </edge>
- <edge>
- <label x="-92" y="-11" />
- </edge>
- </node>
- <node name="Review Order" x="69" y="172" width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="Prepare shipping" x="293" y="171" width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="join1" x="118" y="256" width="252" height="24">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="Review results" x="183" y="299" width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="Wrap up" x="367" y="320" width="132" height="36">
- <edge>
- <label x="5" y="-10" />
- </edge>
- </node>
- <node name="end" x="176" y="359" width="140" height="40" />
-</root-container>
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml (from rev 3353, jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml)
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml (rev 0)
+++ jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/gpd.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<root-container name="ForkJoinExample3" width="658" height="421">
+ <node name="start" x="150" y="25" width="140" height="40">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="fork1" x="96" y="95" width="252" height="24">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ <edge>
+ <label x="-92" y="-11" />
+ </edge>
+ </node>
+ <node name="Review Order" x="69" y="172" width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="Prepare shipping" x="293" y="171" width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="join1" x="118" y="256" width="252" height="24">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="Review results" x="183" y="299" width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="Wrap up" x="367" y="320" width="132" height="36">
+ <edge>
+ <label x="5" y="-10" />
+ </edge>
+ </node>
+ <node name="end" x="176" y="359" width="140" height="40" />
+</root-container>
Deleted: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml 2008-12-12 08:26:18 UTC (rev 3353)
+++ jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="ForkJoinExample3">
- <start-state name="start">
- <transition to="fork1"></transition>
- </start-state>
- <fork name="fork1">
- <transition to="Prepare shipping" name="to Prepare shipping"></transition>
- <transition to="Review Order" name="to Review Order"></transition>
- </fork>
-
- <task-node name="Review Order">
- <task name="Do review order">
- <assignment pooled-actors="sales"></assignment>
- </task>
- <transition to="join1" name="done with review order"></transition>
- </task-node>
-
- <task-node name="Prepare shipping">
- <task name="Do prepare shipping">
- <assignment pooled-actors="sales,hr"></assignment>
- </task>
- <transition to="join1" name="done with prepare shipping"></transition>
- </task-node>
-
- <join name="join1">
- <transition to="Review results"></transition>
- </join>
-
- <task-node name="Review results">
- <task name="Review previous steps">
- <assignment pooled-actors="user"></assignment>
- </task>
- <transition to="Wrap up" name="review ok"></transition>
- </task-node>
-
- <task-node name="Wrap up">
- <task name="Wrap up">
- <assignment actor-id="fred"></assignment>
- </task>
- <transition to="end" name="finish this one"></transition>
- </task-node>
-
- <end-state name="end"></end-state>
-</process-definition>
\ No newline at end of file
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml (from rev 3353, jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml)
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml (rev 0)
+++ jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processdefinition.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="ForkJoinExample3">
+ <start-state name="start">
+ <transition to="fork1"></transition>
+ </start-state>
+ <fork name="fork1">
+ <transition to="Prepare shipping" name="to Prepare shipping"></transition>
+ <transition to="Review Order" name="to Review Order"></transition>
+ </fork>
+
+ <task-node name="Review Order">
+ <task name="Do review order">
+ <assignment pooled-actors="sales"></assignment>
+ </task>
+ <transition to="join1" name="done with review order"></transition>
+ </task-node>
+
+ <task-node name="Prepare shipping">
+ <task name="Do prepare shipping">
+ <assignment pooled-actors="sales,hr"></assignment>
+ </task>
+ <transition to="join1" name="done with prepare shipping"></transition>
+ </task-node>
+
+ <join name="join1">
+ <transition to="Review results"></transition>
+ </join>
+
+ <task-node name="Review results">
+ <task name="Review previous steps">
+ <assignment pooled-actors="user"></assignment>
+ </task>
+ <transition to="Wrap up" name="review ok"></transition>
+ </task-node>
+
+ <task-node name="Wrap up">
+ <task name="Wrap up">
+ <assignment actor-id="fred"></assignment>
+ </task>
+ <transition to="end" name="finish this one"></transition>
+ </task-node>
+
+ <end-state name="end"></end-state>
+</process-definition>
\ No newline at end of file
Deleted: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg
===================================================================
(Binary files differ)
Copied: jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg (from rev 3353, jbpm3/trunk/modules/integration/src/test/resources/deployment/fork-join-example/processimage.jpg)
===================================================================
(Binary files differ)
Copied: jbpm3/trunk/modules/integration/src/test/resources/jndi.properties (from rev 3352, jbpm3/trunk/modules/integration/src/test/resources/jndi.properties)
===================================================================
--- jbpm3/trunk/modules/integration/src/test/resources/jndi.properties (rev 0)
+++ jbpm3/trunk/modules/integration/src/test/resources/jndi.properties 2008-12-19 23:15:33 UTC (rev 3467)
@@ -0,0 +1,3 @@
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming.client
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
+++ jbpm3/trunk/pom.xml 2008-12-19 23:15:33 UTC (rev 3467)
@@ -159,7 +159,7 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
<classifier>config</classifier>
<version>${bpm.spec.version}</version>
</dependency>
17 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3466 - in jbpm3/trunk: modules/integration and 10 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 17:53:18 -0500 (Fri, 19 Dec 2008)
New Revision: 3466
Added:
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java
jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml
Removed:
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml
jbpm3/trunk/modules/integration/src/test/java/org/jbpm/test/integration/spec/deployment/
jbpm3/trunk/modules/integration/src/test/resources/deployment/
Modified:
jbpm3/trunk/modules/integration/pom.xml
jbpm3/trunk/modules/integration/scripts/assembly-config.xml
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java
jbpm3/trunk/pom.xml
Log:
Upgrade bpm-spec-1.0.0
Modified: jbpm3/trunk/modules/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/integration/pom.xml 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
@@ -15,7 +15,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM3 - Spec Integration</name>
+ <name>JBoss jBPM3 - Integration</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-integration-spec</artifactId>
<packaging>jar</packaging>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <artifactId>bpm-spec-api</artifactId>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
@@ -81,13 +81,8 @@
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <artifactId>bpm-spec-cts</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-cts</artifactId>
- <scope>test</scope>
<type>zip</type>
</dependency>
</dependencies>
@@ -181,7 +176,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-cts</artifactId>
+ <artifactId>bpm-spec-cts</artifactId>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -194,13 +189,27 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
- <exclude>jbpm-cfg-beans.xml</exclude>
+ <exclude>bpm-spec-jbpm3-beans.xml</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <systemProperties>
+ <property>
+ <name>bpm.dialect</name>
+ <value>jbpm3</value>
+ </property>
+ <property>
+ <name>bpm.dialect.uri</name>
+ <value>urn:jbpm.org:jpdl-3.2</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${basedir}/target</value>
+ </property>
+ </systemProperties>
<excludes>
<exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude>
<exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude>
Modified: jbpm3/trunk/modules/integration/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/integration/scripts/assembly-config.xml 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/scripts/assembly-config.xml 2008-12-19 22:53:18 UTC (rev 3466)
@@ -10,7 +10,7 @@
<directory>${basedir}/src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>jbpm-cfg-beans.xml</include>
+ <include>bpm-spec-jbpm3-beans.xml</include>
</includes>
</fileSet>
</fileSets>
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/jpdl32/DialectHandlerImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,8 +31,8 @@
import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.AbstractDialectHandler;
import org.jboss.bpm.api.service.DialectHandler;
-import org.jboss.bpm.api.service.internal.AbstractDialectHandler;
import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,8 +22,8 @@
package org.jbpm.integration.spec.model;
import org.jboss.bpm.api.model.AbstractElement;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.ContextService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.Identifiable;
@@ -85,8 +85,8 @@
objID = currID;
tempObj = null;
- ExecutionContextService execService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = execService.getExecutionContext(true);
+ ContextService execService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = execService.getContext(true);
try
{
JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,10 +24,10 @@
import java.util.List;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.EndEvent;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.EndEvent;
+import org.jboss.bpm.incubator.model.SequenceFlow;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.EndState;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/EventImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -21,9 +21,9 @@
*/
package org.jbpm.integration.spec.model;
-import org.jboss.bpm.api.model.Event;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Event;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -23,13 +23,13 @@
// $Id$
-import org.jboss.bpm.api.model.ExclusiveGateway;
-import org.jboss.bpm.api.model.Expression;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.ExclusiveGateway;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.SequenceFlow.ConditionType;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.node.Decision;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ExpressionImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.api.model.Expression;
+import org.jboss.bpm.incubator.model.Expression;
/**
* An Expression, which is used in the definition of attributes for @{link StartEvent},
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,10 +24,10 @@
import java.util.List;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Gateway;
+import org.jboss.bpm.incubator.model.SequenceFlow;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,12 +31,12 @@
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.SequenceFlow.ConditionType;
import org.jbpm.graph.def.Transition;
import org.jbpm.integration.spec.runtime.InvocationProxy;
@@ -77,7 +77,7 @@
return procDef;
}
- public ProcessInstance getProcess()
+ public ProcessInstance getProcessInstance()
{
throw new NotImplementedException();
}
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,8 +22,8 @@
package org.jbpm.integration.spec.model;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Task;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Task;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -30,13 +30,13 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Expression;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.SequenceFlow.ConditionType;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.def.Node.NodeType;
import org.jbpm.integration.spec.runtime.InvocationProxy;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -21,6 +21,7 @@
*/
package org.jbpm.integration.spec.model;
+// $Idimport java.util.Date;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -30,15 +31,15 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
+import org.jboss.bpm.api.runtime.Context;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Attachments.Key;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ContextService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jbpm.JbpmContext;
@@ -180,8 +181,8 @@
public Token startProcess(Attachments contextData)
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
// Register the Process implicitly
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/SequenceFlowImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -21,9 +21,9 @@
*/
package org.jbpm.integration.spec.model;
-import org.jboss.bpm.api.model.Expression;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.Transition;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -25,9 +25,9 @@
import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.StartEvent;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.StartEvent;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.StartState;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -25,9 +25,9 @@
import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.Task;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
+import org.jboss.bpm.incubator.model.Task;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,10 +22,10 @@
package org.jbpm.integration.spec.model;
import org.jboss.bpm.api.NotImplementedException;
+import org.jboss.bpm.api.model.Message;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.client.UserTaskCallback;
-import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.UserTask;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.TaskNode;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -22,8 +22,8 @@
package org.jbpm.integration.spec.model;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.WaitState;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.WaitState;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.State;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/GatewayBuilderImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,8 +24,8 @@
//$Id$
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.builder.GatewayBuilder;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.builder.GatewayBuilder;
/**
* The GatewayBuilder can be used to build a Gateway dynamically.
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -29,17 +29,17 @@
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.EndEvent;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.StartEvent;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
-import org.jboss.bpm.api.model.Gateway.GatewayType;
-import org.jboss.bpm.api.model.Task.TaskType;
-import org.jboss.bpm.api.model.builder.GatewayBuilder;
-import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.EndEvent;
+import org.jboss.bpm.incubator.model.StartEvent;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
+import org.jboss.bpm.incubator.model.Gateway.GatewayType;
+import org.jboss.bpm.incubator.model.Task.TaskType;
+import org.jboss.bpm.incubator.model.builder.GatewayBuilder;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilder;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.def.Node.NodeType;
import org.jbpm.graph.node.Decision;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/ExpressionEvaluator.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -26,11 +26,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.bpm.api.model.Expression;
-import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Attachments.Key;
+import org.jboss.bpm.incubator.model.Expression;
+import org.jboss.bpm.incubator.model.Expression.ExpressionLanguage;
import org.mvel.MVEL;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -28,8 +28,8 @@
import java.util.Arrays;
import java.util.List;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.ContextService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessEngineSupport;
import org.slf4j.Logger;
@@ -100,8 +100,8 @@
{
Throwable targetException = null;
- ExecutionContextService ctxService = engine.getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = engine.getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
return m.invoke(obj, args);
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -29,15 +29,15 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ObjectNameFactory;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
+import org.jboss.bpm.api.runtime.Context;
import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ContextService;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.SequenceFlow;
import org.jbpm.JbpmContext;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.Transition;
@@ -174,8 +174,8 @@
private void signalInternal(String name)
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
NodeImpl<?> currNode = (NodeImpl<?>)getNode();
Copied: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java (from rev 3445, jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ContextServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.integration.spec.service;
+
+// $Id$
+
+import org.jboss.bpm.api.runtime.BasicAttachments;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.ContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jbpm.JbpmContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The ContextService is the entry point to create or get an Context.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 02-Dec-2008
+ */
+public class ContextServiceImpl extends AbstractService implements ContextService, MutableService
+{
+ // Provide logging
+ final static Logger log = LoggerFactory.getLogger(ContextServiceImpl.class);
+
+ private static ThreadLocal<ContextImpl> contextAssociation = new ThreadLocal<ContextImpl>();
+
+ @Override
+ public void setProcessEngine(ProcessEngine engine)
+ {
+ super.setProcessEngine(engine);
+ }
+
+ public Context createContext()
+ {
+ ProcessEngineImpl engineImpl = (ProcessEngineImpl)getProcessEngine();
+ JbpmContext jbpmContext = engineImpl.getJbpmConfiguration().createJbpmContext();
+ ContextImpl currContext = new ContextImpl(jbpmContext);
+ contextAssociation.set(currContext);
+ return currContext;
+ }
+
+ public Context getContext(boolean create)
+ {
+ ContextImpl currContext = contextAssociation.get();
+
+ if (currContext == null && create == true)
+ currContext = (ContextImpl)createContext();
+
+ if (currContext != null)
+ currContext.clientCount++;
+
+ return currContext;
+ }
+
+ class ContextImpl extends BasicAttachments implements Context
+ {
+ private JbpmContext jbpmContext;
+ private int clientCount;
+
+ ContextImpl(JbpmContext jbpmContext)
+ {
+ this.jbpmContext = jbpmContext;
+ addAttachment(JbpmContext.class, jbpmContext);
+ }
+
+ public void close()
+ {
+ clientCount--;
+
+ if (clientCount < 0)
+ throw new IllegalStateException("PersistenceContext already closed");
+
+ if (clientCount == 0)
+ {
+ contextAssociation.set(null);
+ jbpmContext.close();
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -30,9 +30,10 @@
import org.jboss.bpm.api.deployment.Deployment;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.DeploymentService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractDeploymentService;
import org.jbpm.integration.spec.deployment.PARDeployment;
import org.jbpm.integration.spec.deployment.XMLDeployment;
import org.slf4j.Logger;
@@ -44,7 +45,7 @@
* @author thomas.diesler(a)jboss.com
* @since 28-Nov-2008
*/
-public class DeploymentServiceImpl extends AbstractDeploymentService implements MutableService
+public class DeploymentServiceImpl extends AbstractService implements DeploymentService, MutableService
{
// Provide logging
final Logger log = LoggerFactory.getLogger(DeploymentServiceImpl.class);
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -26,9 +26,9 @@
import java.net.URI;
import java.util.Map;
+import org.jboss.bpm.api.service.AbstractDialectHandlerService;
import org.jboss.bpm.api.service.DialectHandler;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractDialectHandlerService;
/**
* A registry that maps namespaceURI to a {@link DialectHandler}
Deleted: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.integration.spec.service;
-
-// $Id$
-
-import org.jboss.bpm.api.runtime.BasicAttachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractExecutionContextService;
-import org.jbpm.JbpmContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The ExecutionContextService is the entry point to create or get an ExecutionContext.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 02-Dec-2008
- */
-public class ExecutionContextServiceImpl extends AbstractExecutionContextService implements MutableService
-{
- // Provide logging
- final static Logger log = LoggerFactory.getLogger(ExecutionContextServiceImpl.class);
-
- private static ThreadLocal<ExecutionContextImpl> contextAssociation = new ThreadLocal<ExecutionContextImpl>();
-
- @Override
- public void setProcessEngine(ProcessEngine engine)
- {
- super.setProcessEngine(engine);
- }
-
- public ExecutionContext createExecutionContext()
- {
- ProcessEngineImpl engineImpl = (ProcessEngineImpl)getProcessEngine();
- JbpmContext jbpmContext = engineImpl.getJbpmConfiguration().createJbpmContext();
- ExecutionContextImpl currContext = new ExecutionContextImpl(jbpmContext);
- contextAssociation.set(currContext);
- return currContext;
- }
-
- public ExecutionContext getExecutionContext(boolean create)
- {
- ExecutionContextImpl currContext = contextAssociation.get();
-
- if (currContext == null && create == true)
- currContext = (ExecutionContextImpl)createExecutionContext();
-
- if (currContext != null)
- currContext.clientCount++;
-
- return currContext;
- }
-
- class ExecutionContextImpl extends BasicAttachments implements ExecutionContext
- {
- private JbpmContext jbpmContext;
- private int clientCount;
-
- ExecutionContextImpl(JbpmContext jbpmContext)
- {
- this.jbpmContext = jbpmContext;
- addAttachment(JbpmContext.class, jbpmContext);
- }
-
- public void close()
- {
- clientCount--;
-
- if (clientCount < 0)
- throw new IllegalStateException("PersistenceContext already closed");
-
- if (clientCount == 0)
- {
- contextAssociation.set(null);
- jbpmContext.close();
- }
- }
- }
-}
\ No newline at end of file
Deleted: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * 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.integration.spec.service;
-
-// $Id$
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.ExecutionService;
-import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessInstanceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The ExecutionService manages Tokens
- *
- * @author thomas.diesler(a)jboss.com
- * @since 28-Nov-2008
- */
-public class ExecutionServiceImpl extends ExecutionService implements MutableService
-{
- // Provide logging
- final Logger log = LoggerFactory.getLogger(ExecutionServiceImpl.class);
-
- public void setProcessEngine(ProcessEngine engine)
- {
- super.setProcessEngine(engine);
- }
-
- @Override
- public Set<Token> getTokens()
- {
- Set<Token> tokens = new HashSet<Token>();
- ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
- for (ObjectName procID : procService.getInstance())
- {
- ProcessInstance proc = procService.getInstance(procID);
- for (Token aux : proc.getTokens())
- {
- tokens.add(aux);
- }
- }
- return tokens;
- }
-
- @Override
- public Token getToken(ObjectName tokenID)
- {
- Token token = null;
-
- // [TODO] is there a better way than iterating over all processes and tokens?
- ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
- for (ObjectName procID : procService.getInstance())
- {
- ProcessInstance proc = procService.getInstance(procID);
- for (Token aux : proc.getTokens())
- {
- if (aux.getKey().equals(tokenID))
- {
- token = aux;
- break;
- }
- }
- }
- return token;
- }
-}
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -28,8 +28,9 @@
import java.util.Set;
import org.jboss.bpm.api.NotImplementedException;
+import org.jboss.bpm.api.service.AbstractService;
import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.internal.AbstractIdentityService;
+import org.jboss.bpm.incubator.service.IdentityService;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.identity.Group;
@@ -44,7 +45,7 @@
* @author thomas.diesler(a)jboss.com
* @since 28-Nov-2008
*/
-public class IdentityServiceImpl extends AbstractIdentityService implements MutableService
+public class IdentityServiceImpl extends AbstractService implements IdentityService, MutableService
{
// Provide logging
final Logger log = LoggerFactory.getLogger(IdentityServiceImpl.class);
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,8 +31,8 @@
import org.hibernate.Session;
import org.jboss.bpm.api.ProcessNotFoundException;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.slf4j.Logger;
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -24,9 +24,9 @@
// $Id$
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.builder.ProcessBuilder;
-import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.incubator.model.builder.ProcessBuilder;
+import org.jboss.bpm.incubator.service.ProcessBuilderService;
import org.jbpm.integration.spec.model.builder.ProcessBuilderImpl;
/**
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -30,12 +30,11 @@
import javax.management.ObjectName;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
-import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractProcessDefinitionService;
+import org.jboss.bpm.api.service.ContextService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessInstanceService;
-import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService;
import org.jbpm.JbpmContext;
import org.jbpm.db.GraphSession;
import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
@@ -49,7 +48,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class ProcessDefinitionServiceImpl extends AbstractProcessDefinitionService implements ProcessDefinitionService, MutableService
+public class ProcessDefinitionServiceImpl extends AbstractProcessDefinitionService implements MutableService
{
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessDefinitionServiceImpl.class);
@@ -62,8 +61,8 @@
public ProcessDefinition getProcessDefinition(ObjectName procDefID)
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
ProcessDefinition procDef = null;
@@ -85,8 +84,8 @@
public Set<ObjectName> getProcessDefinitions()
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
Set<ObjectName> procDefs = new HashSet<ObjectName>();
@@ -108,8 +107,8 @@
public ProcessDefinition registerProcessDefinition(ProcessDefinition procDef)
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
log.debug("registerProcessDefinition: " + procDef);
@@ -134,8 +133,8 @@
{
boolean removed = false;
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
ProcessDefinition procDef = getProcessDefinition(procDefID);
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ProcessInstanceServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -31,15 +31,15 @@
import javax.management.ObjectName;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.ContextService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessInstanceService;
-import org.jboss.bpm.api.service.internal.AbstractProcessService;
import org.jbpm.JbpmContext;
import org.jbpm.db.GraphSession;
import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
@@ -55,7 +55,7 @@
* @author thomas.diesler(a)jboss.com
* @since 18-Jun-2008
*/
-public class ProcessInstanceServiceImpl extends AbstractProcessService implements ProcessInstanceService, MutableService
+public class ProcessInstanceServiceImpl extends AbstractService implements ProcessInstanceService, MutableService
{
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessInstanceServiceImpl.class);
@@ -86,8 +86,8 @@
*/
public ProcessInstance getInstance(ObjectName procID)
{
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
ProcessInstance proc = null;
@@ -114,8 +114,8 @@
{
Set<ObjectName> procs = new HashSet<ObjectName>();
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class);
@@ -148,8 +148,8 @@
{
Set<ObjectName> procs = new HashSet<ObjectName>();
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
Long id = adaptKey(procDefID);
@@ -176,8 +176,8 @@
{
log.debug("registerProcess: " + proc);
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
if (getInstance(proc.getKey()) != null)
@@ -223,8 +223,8 @@
{
boolean removed = false;
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
try
{
ProcessInstance proc = getInstance(procID);
Copied: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java (from rev 3445, jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskInstanceServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.integration.spec.service;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Context;
+import org.jboss.bpm.api.service.AbstractService;
+import org.jboss.bpm.api.service.ContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessInstanceService;
+import org.jboss.bpm.incubator.service.TaskInstanceService;
+import org.jboss.bpm.incubator.task.TaskInstance;
+import org.jbpm.JbpmContext;
+import org.jbpm.integration.spec.model.ProcessInstanceImpl;
+import org.jbpm.integration.spec.runtime.InvocationProxy;
+import org.jbpm.integration.spec.task.TaskInstanceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The TaskService manages Tasks.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 28-Nov-2008
+ */
+public class TaskInstanceServiceImpl extends AbstractService implements TaskInstanceService, MutableService
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(TaskInstanceServiceImpl.class);
+
+ public void setProcessEngine(ProcessEngine engine)
+ {
+ super.setProcessEngine(engine);
+ }
+
+ public List<TaskInstance> getTasksByProcess(ObjectName procID)
+ {
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
+ try
+ {
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessInstance proc = procService.getInstance(procID);
+ if (proc == null)
+ throw new IllegalStateException("Cannot obtain process: " + procID);
+
+ List<TaskInstance> tasks = new ArrayList<TaskInstance>();
+ ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
+ Collection<org.jbpm.taskmgmt.exe.TaskInstance> oldTaskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
+ for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : oldTaskInstances)
+ {
+ TaskInstance task = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+ tasks.add(task);
+ }
+
+ return tasks;
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
+ }
+
+ public TaskInstance getTask(ObjectName taskID)
+ {
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
+ try
+ {
+ JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
+ org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
+ return TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public List<TaskInstance> getTasksByActor(String actor)
+ {
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
+ try
+ {
+ List<TaskInstance> tasks = new ArrayList<TaskInstance>();
+ JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
+ for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : (List<org.jbpm.taskmgmt.exe.TaskInstance>)jbpmContext.getTaskList(actor))
+ {
+ TaskInstance taskInst = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
+ tasks.add(taskInst);
+ }
+ return tasks;
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
+ }
+
+ public void closeTask(ObjectName taskID, String signalName)
+ {
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
+ try
+ {
+ TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
+ org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
+
+ if (signalName != null)
+ oldTaskInst.end(signalName);
+ else
+ oldTaskInst.end();
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
+ }
+
+ public void reassignTask(ObjectName taskID, String actor)
+ {
+ ContextService ctxService = getProcessEngine().getService(ContextService.class);
+ Context bpmContext = ctxService.getContext(true);
+ try
+ {
+ TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
+ org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
+
+ if (oldTaskInst.getStart() != null)
+ {
+ log.warn("Force stop on task " + oldTaskInst.getId() + ". Will be restarted.");
+ oldTaskInst.setStart(null); // strange, but means isNotStarted()
+ }
+
+ oldTaskInst.start(actor, true);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
+ }
+
+ private Long adaptKey(ObjectName key)
+ {
+ String id = key.getKeyProperty("id");
+ if (id == null)
+ throw new IllegalStateException("Cannot obtain id property from: " + key);
+
+ return new Long(id);
+ }
+}
Deleted: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,199 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * 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.integration.spec.service;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.service.ExecutionContextService;
-import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessInstanceService;
-import org.jboss.bpm.api.service.internal.AbstractTaskService;
-import org.jboss.bpm.incubator.task.TaskInstance;
-import org.jbpm.JbpmContext;
-import org.jbpm.integration.spec.model.ProcessInstanceImpl;
-import org.jbpm.integration.spec.runtime.InvocationProxy;
-import org.jbpm.integration.spec.task.TaskInstanceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The TaskService manages Tasks.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 28-Nov-2008
- */
-public class TaskServiceImpl extends AbstractTaskService implements MutableService
-{
- // Provide logging
- final Logger log = LoggerFactory.getLogger(TaskServiceImpl.class);
-
- public void setProcessEngine(ProcessEngine engine)
- {
- super.setProcessEngine(engine);
- }
-
- public List<TaskInstance> getTasksByProcess(ObjectName procID)
- {
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
- ProcessInstance proc = procService.getInstance(procID);
- if (proc == null)
- throw new IllegalStateException("Cannot obtain process: " + procID);
-
- List<TaskInstance> tasks = new ArrayList<TaskInstance>();
- ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
- Collection<org.jbpm.taskmgmt.exe.TaskInstance> oldTaskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
- for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : oldTaskInstances)
- {
- TaskInstance task = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
- tasks.add(task);
- }
-
- return tasks;
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
- }
-
- public TaskInstance getTask(ObjectName taskID)
- {
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
- org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
- return TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
- }
-
- @SuppressWarnings("unchecked")
- public List<TaskInstance> getTasksByActor(String actor)
- {
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- List<TaskInstance> tasks = new ArrayList<TaskInstance>();
- JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
- for (org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst : (List<org.jbpm.taskmgmt.exe.TaskInstance>)jbpmContext.getTaskList(actor))
- {
- TaskInstance taskInst = TaskInstanceImpl.newInstance(getProcessEngine(), oldTaskInst);
- tasks.add(taskInst);
- }
- return tasks;
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
- }
-
- public void closeTask(ObjectName taskID, String signalName)
- {
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
- org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
-
- if (signalName != null)
- oldTaskInst.end(signalName);
- else
- oldTaskInst.end();
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
- }
-
- public void reassignTask(ObjectName taskID, String actor)
- {
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- TaskInstanceImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskInstanceImpl.class);
- org.jbpm.taskmgmt.exe.TaskInstance oldTaskInst = taskImpl.getDelegate();
-
- if (oldTaskInst.getStart() != null)
- {
- log.warn("Force stop on task " + oldTaskInst.getId() + ". Will be restarted.");
- oldTaskInst.setStart(null); // strange, but means isNotStarted()
- }
-
- oldTaskInst.start(actor, true);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
- }
-
- private Long adaptKey(ObjectName key)
- {
- String id = key.getKeyProperty("id");
- if (id == null)
- throw new IllegalStateException("Cannot obtain id property from: " + key);
-
- return new Long(id);
- }
-}
Copied: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java (from rev 3445, jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/service/TokenServiceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.integration.spec.service;
+
+// $Id$
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessInstanceService;
+import org.jboss.bpm.api.service.TokenService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The ExecutionService manages Tokens
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 28-Nov-2008
+ */
+public class TokenServiceImpl extends TokenService implements MutableService
+{
+ // Provide logging
+ final Logger log = LoggerFactory.getLogger(TokenServiceImpl.class);
+
+ public void setProcessEngine(ProcessEngine engine)
+ {
+ super.setProcessEngine(engine);
+ }
+
+ @Override
+ public Set<Token> getTokens()
+ {
+ Set<Token> tokens = new HashSet<Token>();
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance())
+ {
+ ProcessInstance proc = procService.getInstance(procID);
+ for (Token aux : proc.getTokens())
+ {
+ tokens.add(aux);
+ }
+ }
+ return tokens;
+ }
+
+ @Override
+ public Token getToken(ObjectName tokenID)
+ {
+ Token token = null;
+
+ // [TODO] is there a better way than iterating over all processes and tokens?
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance())
+ {
+ ProcessInstance proc = procService.getInstance(procID);
+ for (Token aux : proc.getTokens())
+ {
+ if (aux.getKey().equals(tokenID))
+ {
+ token = aux;
+ break;
+ }
+ }
+ }
+ return token;
+ }
+}
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/task/TaskInstanceImpl.java 2008-12-19 22:53:18 UTC (rev 3466)
@@ -28,10 +28,10 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.model.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.service.ExecutionService;
import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.TokenService;
import org.jboss.bpm.incubator.task.TaskInstance;
import org.jbpm.integration.spec.model.AbstractElementImpl;
import org.jbpm.integration.spec.runtime.InvocationProxy;
@@ -128,7 +128,7 @@
if (getDelegate().getToken() != null)
{
long tokenID = getDelegate().getToken().getId();
- ExecutionService exService = getProcessEngine().getService(ExecutionService.class);
+ TokenService exService = getProcessEngine().getService(TokenService.class);
for (Token auxTok : exService.getTokens())
{
TokenImpl tokenImpl = InvocationProxy.getUnderlying(auxTok, TokenImpl.class);
Added: jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml (rev 0)
+++ jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml 2008-12-19 22:53:18 UTC (rev 3466)
@@ -0,0 +1,47 @@
+<!--
+ Note, this uses the bean-deployer-2.0 schema
+ $Id$
+-->
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ </bean>
+
+ <!-- The ProcessEngine -->
+ <bean name="BPMProcessEngine" class="org.jbpm.integration.spec.service.ProcessEngineImpl">
+ <property name="services">
+ <set elementClass="org.jboss.bpm.api.service.Service">
+ <inject bean="BPMContextService"/>
+ <inject bean="BPMDeploymentService"/>
+ <inject bean="BPMDialectHandlerService"/>
+ <inject bean="BPMIdentityService"/>
+ <inject bean="BPMProcessDefinitionService"/>
+ <inject bean="BPMProcessInstanceService"/>
+ <inject bean="BPMTaskInstanceService"/>
+ <inject bean="BPMTokenService"/>
+ </set>
+ </property>
+ </bean>
+
+ <!-- The DialectHandlerService -->
+ <bean name="BPMDialectHandlerService" class="org.jbpm.integration.spec.service.DialectHandlerServiceImpl">
+ <property name="dialectHandlers">
+ <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler">
+ <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry>
+ </map>
+ </property>
+ </bean>
+ <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.spec.jpdl32.DialectHandlerImpl" />
+
+ <!-- Other Services -->
+ <bean name="BPMContextService" class="org.jbpm.integration.spec.service.ContextServiceImpl" />
+ <bean name="BPMDeploymentService" class="org.jbpm.integration.spec.service.DeploymentServiceImpl" />
+ <bean name="BPMIdentityService" class="org.jbpm.integration.spec.service.IdentityServiceImpl" />
+ <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.spec.service.ProcessDefinitionServiceImpl" />
+ <bean name="BPMProcessInstanceService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl"/>
+ <bean name="BPMTaskInstanceService" class="org.jbpm.integration.spec.service.TaskInstanceServiceImpl" />
+ <bean name="BPMTokenService" class="org.jbpm.integration.spec.service.TokenServiceImpl" />
+
+</deployment>
Property changes on: jbpm3/trunk/modules/integration/src/main/resources/bpm-spec-jbpm3-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/modules/integration/src/main/resources/jbpm-cfg-beans.xml 2008-12-19 22:53:18 UTC (rev 3466)
@@ -1,62 +0,0 @@
-<!--
- Note, this uses the bean-deployer-2.0 schema
- $Id: $
--->
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Locate the single instance of the kernel -->
- <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
- <!-- The ProcessEngine -->
- <bean name="BPMProcessEngine" class="org.jbpm.integration.spec.service.ProcessEngineImpl">
- <property name="services">
- <set elementClass="org.jboss.bpm.api.service.Service">
- <inject bean="BPMDeploymentService"/>
- <inject bean="BPMDialectHandlerService"/>
- <inject bean="BPMExecutionContextService"/>
- <inject bean="BPMExecutionService"/>
- <inject bean="BPMIdentityService"/>
- <inject bean="BPMProcessBuilderService"/>
- <inject bean="BPMProcessDefinitionService"/>
- <inject bean="BPMProcessService"/>
- <inject bean="BPMTaskService"/>
- </set>
- </property>
- </bean>
-
- <!-- The PersistenceService -->
- <bean name="BPMPersistenceService" class="org.jbpm.integration.spec.service.NoopPersistenceServiceImpl" />
-
- <!-- The ProcessService -->
- <bean name="BPMProcessService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl">
- <property name="interceptors">
- <list elementClass="java.lang.String">
- <value>org.jbpm.integration.spec.runtime.NodeExecuteInterceptor</value>
- </list>
- </property>
- </bean>
-
- <!-- The DialectHandlerService -->
- <bean name="BPMDialectHandlerService" class="org.jbpm.integration.spec.service.DialectHandlerServiceImpl">
- <property name="dialectHandlers">
- <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler">
- <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="BPMDialectHandlerAPI10"/></value></entry>
- <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry>
- </map>
- </property>
- </bean>
- <bean name="BPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl" />
- <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.spec.jpdl32.DialectHandlerImpl" />
-
- <!-- Other Services -->
- <bean name="BPMDeploymentService" class="org.jbpm.integration.spec.service.DeploymentServiceImpl" />
- <bean name="BPMExecutionContextService" class="org.jbpm.integration.spec.service.ExecutionContextServiceImpl" />
- <bean name="BPMExecutionService" class="org.jbpm.integration.spec.service.ExecutionServiceImpl" />
- <bean name="BPMIdentityService" class="org.jbpm.integration.spec.service.IdentityServiceImpl" />
- <bean name="BPMProcessBuilderService" class="org.jbpm.integration.spec.service.ProcessBuilderServiceImpl" />
- <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.spec.service.ProcessDefinitionServiceImpl" />
- <bean name="BPMTaskService" class="org.jbpm.integration.spec.service.TaskServiceImpl" />
-
-</deployment>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-12-19 22:44:25 UTC (rev 3465)
+++ jbpm3/trunk/pom.xml 2008-12-19 22:53:18 UTC (rev 3466)
@@ -46,6 +46,7 @@
<apache.cactus.version>1.8.0</apache.cactus.version>
<apache.jackrabbit.version>1.4.5</apache.jackrabbit.version>
<birt.version>2.2.2</birt.version>
+ <bpm.spec.version>1.0.0-SNAPSHOT</bpm.spec.version>
<bsh.version>1.3.0</bsh.version>
<commons.fileupload.version>1.2.1</commons.fileupload.version>
<commons.io.version>1.4</commons.io.version>
@@ -73,7 +74,6 @@
<jbpm.designer.version>3.1.5</jbpm.designer.version>
<jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version>
<jbpm.jsf-console.version>3.3.1-SNAPSHOT</jbpm.jsf-console.version>
- <jboss.bpm.version>1.0.0-Alpha3</jboss.bpm.version>
<jboss.client.version>4.2.2.GA</jboss.client.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
@@ -144,29 +144,29 @@
<!-- BPM Spec Dependencies-->
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
- <version>${jboss.bpm.version}</version>
+ <artifactId>bpm-spec-api</artifactId>
+ <version>${bpm.spec.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
- <version>${jboss.bpm.version}</version>
+ <artifactId>bpm-spec-dialect-api10</artifactId>
+ <version>${bpm.spec.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-integration-jboss42</artifactId>
- <version>${jboss.bpm.version}</version>
+ <artifactId>bpm-spec-integration-jboss42</artifactId>
+ <version>${bpm.spec.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
<artifactId>jboss-bpm-integration-jboss42</artifactId>
<classifier>config</classifier>
- <version>${jboss.bpm.version}</version>
+ <version>${bpm.spec.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-cts</artifactId>
- <version>${jboss.bpm.version}</version>
+ <artifactId>bpm-spec-cts</artifactId>
+ <version>${bpm.spec.version}</version>
<type>zip</type>
</dependency>
17 years, 4 months
- 1
- 0