[jbpm-commits] JBoss JBPM SVN: r3480 - in projects/spec/trunk/modules: cts and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Dec 20 07:56:31 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-12-20 07:56:31 -0500 (Sat, 20 Dec 2008)
New Revision: 3480

Added:
   projects/spec/trunk/modules/cts/src/test/resources/cts/common/
   projects/spec/trunk/modules/cts/src/test/resources/cts/common/simple-sequence-jbpm3.xml
Removed:
   projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequencePersistenceTest.java
Modified:
   projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalBuilderService.java
   projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalService.java
   projects/spec/trunk/modules/cts/pom.xml
   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/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/SequenceTest.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/receive/ReceiveTaskTest.java
Log:
Add jbpm3 signal support

Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalBuilderService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalBuilderService.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalBuilderService.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -23,7 +23,6 @@
 
 //$Id$
 
-import org.jboss.bpm.api.config.Configuration;
 import org.jboss.bpm.api.model.Signal;
 import org.jboss.bpm.api.model.builder.SignalBuilder;
 
@@ -36,16 +35,6 @@
 public abstract class SignalBuilderService extends AbstractService
 {
   /**
-   * Locate the default SignalBuilder
-   */
-  public static SignalBuilder locateSignalBuilder()
-  {
-    ProcessEngine engine = Configuration.getProcessEngine();
-    SignalBuilderService builderService = engine.getService(SignalBuilderService.class);
-    return builderService.getSignalBuilder();
-  }
-  
-  /**
    * Get the SignalBuilder
    */
   public abstract SignalBuilder getSignalBuilder();

Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalService.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/SignalService.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -27,7 +27,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jboss.bpm.api.config.Configuration;
 import org.jboss.bpm.api.model.Signal;
 import org.jboss.bpm.api.model.SignalListener;
 import org.slf4j.Logger;
@@ -49,15 +48,6 @@
   private Set<SignalListener> listeners = new HashSet<SignalListener>();
 
   /**
-   * Locate the default SignalService
-   */
-  public static SignalService locateSignalService()
-  {
-    ProcessEngine engine = Configuration.getProcessEngine();
-    return engine.getService(SignalService.class);
-  }
-  
-  /**
    * Add a SignalListener for a given source
    */
   public void addSignalListener(SignalListener listener)

Modified: projects/spec/trunk/modules/cts/pom.xml
===================================================================
--- projects/spec/trunk/modules/cts/pom.xml	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/pom.xml	2008-12-20 12:56:31 UTC (rev 3480)
@@ -85,10 +85,9 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <excludes>
-            <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude>
-            <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude>
-          </excludes>
+          <includes>
+            <include>org/jboss/bpm/cts/**/*Test.java</include>
+          </includes>
         </configuration>
       </plugin>
     </plugins>
@@ -105,7 +104,7 @@
       <id>no-impl</id>
       <activation>
         <property>
-          <name>!impl</name>
+          <name>_impl</name>
         </property>
       </activation>
       <build>
@@ -128,8 +127,8 @@
       <id>impl-jbpm3</id>
       <activation>
         <property>
-          <name>impl</name>
-          <value>jbpm3</value>
+          <name>!impl</name>
+          <!-- value>jbpm3</value -->
         </property>
       </activation>
       <dependencies>

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/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -40,7 +40,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public abstract class ExclusiveGatewaySplitTest extends CTSTestCase
+public abstract  class ExclusiveGatewaySplitTest extends CTSTestCase
 {
   public void testGateA() throws Exception
   {
@@ -95,5 +95,8 @@
     }
   }
 
-  protected abstract ProcessDefinition getProcessDefinition() throws IOException;
+  protected ProcessDefinition getProcessDefinition() throws IOException
+  {
+    return null;
+  }
 }

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/feature/service/ProcessDefinitionServiceTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessDefinitionServiceTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -85,5 +85,8 @@
     assertTrue("ProcessDefinition unregistered", success);
   }
   
-  protected abstract ProcessDefinition getProcessDefinition() throws IOException;
+  protected ProcessDefinition getProcessDefinition() throws IOException
+  {
+    return null;
+  }
 }

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/feature/service/ProcessInstanceServiceTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/service/ProcessInstanceServiceTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -23,6 +23,8 @@
 
 // $Id$
 
+import java.io.IOException;
+
 import javax.management.ObjectName;
 
 import org.jboss.bpm.api.model.ProcessDefinition;
@@ -89,5 +91,8 @@
     assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey()));
   }
   
-  protected abstract ProcessDefinition getProcessDefinition();
+  protected ProcessDefinition getProcessDefinition() throws IOException
+  {
+    return null;
+  }
 }

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/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -44,7 +44,7 @@
  * @author thomas.diesler at jboss.com
  * @since 06-Aug-2008
  */
-public class ExclusiveChoiceTest extends CTSTestCase
+public abstract class ExclusiveChoiceTest extends CTSTestCase
 {
   public void testGateA() throws Exception
   {

Deleted: 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/SequencePersistenceTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequencePersistenceTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -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.cts.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 at 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);
-  }
-}

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/cts/pattern/control/sequence/SequenceTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/sequence/SequenceTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -24,15 +24,17 @@
 // $Id$
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 
 import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
 import org.jboss.bpm.api.model.Signal;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
 import org.jboss.bpm.api.model.Signal.SignalType;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessDefinitionService;
 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
@@ -46,12 +48,16 @@
   {
     ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
 
-    ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
+    ProcessInstance proc = procDef.newInstance();
 
-    // Start the Process
-    proc.startProcessAsync();
-    proc.waitForEnd();
-
+    Token token = proc.startProcess();
+    assertEquals("Node name", "a", token.getNode().getName());
+    
+    token.signal();
+    assertEquals("Node name", "end", token.getNode().getName());
+    
+    assertEquals(ProcessStatus.Completed, proc.getProcessStatus());
+    
     // Validate received signals
     List<Signal> signals = getSignals();
     assertEquals(SignalType.SYSTEM_PROCESS_ENTER, signals.get(0).getSignalType());
@@ -60,16 +66,18 @@
     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());
+    
+    // TODO: Discuss whether SYSTEM_END_EVENT_EXIT should be emmited
+    //assertEquals(SignalType.SYSTEM_END_EVENT_EXIT, signals.get(6).getSignalType());
+    
+    assertEquals(SignalType.SYSTEM_PROCESS_EXIT, signals.get(6).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();
+    URL pdURL = getResourceURL("cts/common/simple-sequence-" + getDialect() + ".xml");
+    ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class);
+    ProcessDefinition procDef = pdService.parseProcessDefinition(pdURL);
+    return procDef;
   }
 }

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/incubator/service/signal/SignalMultithreadTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalMultithreadTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -37,7 +37,7 @@
  */
 public class SignalMultithreadTest extends CTSTestCase
 {
-  final SignalService sigService = SignalService.locateSignalService();
+  final SignalService sigService = getProcessEngine().getService(SignalService.class);
   final Signal sigA = newSignal(getTestID(), SignalType.USER_SIGNAL, "A");
   final Signal sigB = newSignal(getTestID(), SignalType.USER_SIGNAL, "B");
 

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/incubator/service/signal/SignalServiceTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/service/signal/SignalServiceTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -43,7 +43,7 @@
    */
   public void testSignalListener() throws Exception
   {
-    SignalService sigService = SignalService.locateSignalService();
+    SignalService sigService = getProcessEngine().getService(SignalService.class);
     Signal signal = newSignal(getTestID(), SignalType.USER_SIGNAL, "HelloWorld");
     sigService.throwSignal(signal);
     

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/incubator/startevent/StartEventSignalTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/startevent/StartEventSignalTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -76,7 +76,7 @@
     }
 
     // Send start trigger signal
-    SignalService sigService = SignalService.locateSignalService();
+    SignalService sigService = getProcessEngine().getService(SignalService.class);
     sigService.throwSignal(newSignal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A"));
 
     // Get the just started process 
@@ -128,7 +128,7 @@
     {
       if (nextSignal != null)
       {
-        SignalService sigService = SignalService.locateSignalService();
+        SignalService sigService = null; //getProcessEngine().getService(SignalService.class);
         sigService.throwSignal(nextSignal);
         nextSignal = null;
       }

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/incubator/task/receive/ReceiveTaskTest.java	2008-12-20 12:55:32 UTC (rev 3479)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/incubator/task/receive/ReceiveTaskTest.java	2008-12-20 12:56:31 UTC (rev 3480)
@@ -141,7 +141,7 @@
         }
       }
     };
-    SignalService sigManager = SignalService.locateSignalService();
+    SignalService sigManager = getProcessEngine().getService(SignalService.class);
     sigManager.addSignalListener(sigListener);
 
     try

Added: projects/spec/trunk/modules/cts/src/test/resources/cts/common/simple-sequence-jbpm3.xml
===================================================================
--- projects/spec/trunk/modules/cts/src/test/resources/cts/common/simple-sequence-jbpm3.xml	                        (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/resources/cts/common/simple-sequence-jbpm3.xml	2008-12-20 12:56:31 UTC (rev 3480)
@@ -0,0 +1,10 @@
+<process-definition name="simpleSequence" xmlns="urn:jbpm.org:jpdl-3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
+  <start-state name='start'>
+    <transition to='a' />
+  </start-state>
+  <state name='a'>
+    <transition to='end' />
+  </state>
+  <end-state name='end' />
+</process-definition>


Property changes on: projects/spec/trunk/modules/cts/src/test/resources/cts/common/simple-sequence-jbpm3.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF




More information about the jbpm-commits mailing list