[jbpm-commits] JBoss JBPM SVN: r1656 - in api/trunk: modules and 21 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jul 17 02:18:47 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-07-17 02:18:46 -0400 (Thu, 17 Jul 2008)
New Revision: 1656

Added:
   api/trunk/modules/impl/
Removed:
   api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ProcessEngineImpl.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/SignalManagerImpl.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/
   api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/internal/
   api/trunk/modules/impl/scripts/
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/EngineShutdownException.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/InvalidProcessException.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/JBPMException.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/NameNotUniqueException.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/NotImplementedException.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ExecutionManager.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessEngine.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessManager.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/SignalListener.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/SignalManager.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Activity.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/BPMNElement.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ComplexGateway.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/EndEvent.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Event.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Flow.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/FlowObject.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Gateway.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/GraphicalElement.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MessageFlow.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/NamedFlowObject.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ParallelGateway.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Process.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Result.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SequenceFlow.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Signal.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/StartEvent.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SubProcess.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SuportingElement.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Task.java
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/runtime/
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/test/
   api/trunk/modules/impl/src/main/resources/
   api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/MockEngineTestCase.java
   api/trunk/modules/testsuite/src/test/resources/jbpm-mock-beans.xml
Modified:
   api/trunk/.classpath
   api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
   api/trunk/modules/dialects/jaxb/pom.xml
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessAdapter.java
   api/trunk/modules/impl/pom.xml
   api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
   api/trunk/modules/testsuite/pom.xml
   api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/client/ProcessEngineLocatorTest.java
   api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java
   api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java
   api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
   api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
   api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
   api/trunk/pom.xml
Log:
Add modules impl

Modified: api/trunk/.classpath
===================================================================
--- api/trunk/.classpath	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/.classpath	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="modules/api/target/classes" path="modules/api/src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="modules/api/target/classes" path="modules/api/src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="modules/api/target/test-classes" path="modules/api/src/test/resources"/>
+	<classpathentry kind="src" path="modules/impl/src/main/java"/>
 	<classpathentry kind="src" output="modules/dialects/jaxb/target/classes" path="modules/dialects/jaxb/src/main/java"/>
 	<classpathentry kind="src" output="modules/testsuite/target/test-classes" path="modules/testsuite/src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="modules/testsuite/target/test-classes" path="modules/testsuite/src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -32,7 +32,7 @@
 public class ProcessEngine
 {
   /** The process engine bean name - jBPMEngine */
-  public static final String BEAN_NAME_JBPMENGINE = "jBPMProcessEngine";
+  public static final String BEAN_NAME = "jBPMProcessEngine";
   /** The default bean config: jbpm-beans.xml */
   public static final String JBPM_ENGINE_CONFIG = "jbpm-beans.xml";
 

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -60,18 +60,18 @@
     {
       deployEngineConfiguration();
       kernel = KernelLocator.getKernel();
-      entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME_JBPMENGINE);
+      entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME);
     }
     else
     {
       try
       {
-        entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME_JBPMENGINE);
+        entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME);
       }
       catch (KernelRegistryEntryNotFoundException ex)
       {
         deployEngineConfiguration();
-        entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME_JBPMENGINE);
+        entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME);
       }
     }
 

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -33,7 +33,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.EngineShutdownException;
 import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.ProcessImpl;
 
 /**
  * The process manager is the entry point to create, find and otherwise manage processes.
@@ -144,17 +143,13 @@
    */
   public final boolean registerProcess(Process proc)
   {
-    // Only initialize if this has not already been done
-    if (proc.getProcessState() == Process.ProcessState.CREATED)
-      ((ProcessImpl)proc).initialize();
-    
-    return procs.add((ProcessImpl)proc);
+    return procs.add(proc);
   }
 
   /**
    * Remove a Process
    */
-  public void removeProcess(ProcessImpl proc)
+  public void removeProcess(Process proc)
   {
     procs.remove(proc.getName());
   }

Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,187 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client.internal;
-
-// $Id$
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.NotImplementedException;
-import org.jboss.bpm.client.ExecutionManager;
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.model.EndEvent;
-import org.jboss.bpm.model.Flow;
-import org.jboss.bpm.model.FlowObject;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.Result;
-import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.model.StartEvent;
-import org.jboss.bpm.model.internal.SequenceFlowImpl;
-import org.jboss.bpm.runtime.Attachments;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.FlowHandler;
-import org.jboss.bpm.runtime.MutableFlowScheduler;
-import org.jboss.bpm.runtime.RuntimeProcess;
-import org.jboss.bpm.runtime.SignalHandler;
-import org.jboss.bpm.runtime.Token;
-import org.jboss.bpm.runtime.FlowScheduler.Tuple;
-
-/**
- * The process manager is the entry point to create, find and otherwise manage processes.
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class ExecutionManagerImpl extends ExecutionManager
-{
-  // provide logging
-  private static final Log log = LogFactory.getLog(ExecutionManager.class);
-
-  public void setProcessEngine(ProcessEngine engine)
-  {
-    this.engine = engine;
-  }
-
-  @Override
-  public Future<Result> startProcess(RuntimeProcess rtProc, Attachments att)
-  {
-    Process proc = rtProc.getProcess();
-    throwSignal(new Signal(proc, Signal.Type.ENTER_PROCESS));
-    MutableFlowScheduler flowScheduler = rtProc.getFlowScheduler();
-    try
-    {
-      Token initalToken = new Token(proc, att);
-      StartEvent start = proc.getStartEvent();
-      Tuple tuple = new Tuple(new InitialFlow(start), initalToken);
-      flowScheduler.scheduleTuple(tuple);
-
-      while (flowScheduler.peekHeadTuple() != null)
-      {
-        // Peek the head flow
-        tuple = flowScheduler.peekHeadTuple();
-        Flow flow = tuple.getFlow();
-        Token token = tuple.getToken();
-
-        // Get the target and its handlers
-        FlowObject target = flow.getTarget();
-        ExecutionHandler exHandler = getExecutionHandler(target);
-        SignalHandler sigHandler = getSignalHandler(target);
-        FlowHandler flowHandler = getFlowHandler(target);
-
-        // Execute the FlowObject's ExecutionHandler
-        try
-        {
-          throwSignal(sigHandler.getEnterSignal());
-          exHandler.execute(token);
-        }
-        finally
-        {
-          throwSignal(sigHandler.getExitSignal());
-        }
-
-        // Remove the head tuple
-        flowScheduler.removeHeadTuple();
-        
-        // Transfer the token to the FlowHandler
-        flowHandler.execute(flowScheduler, token);
-      }
-    }
-    finally
-    {
-      throwSignal(new Signal(proc, Signal.Type.EXIT_PROCESS));
-    }
-    return new ResultFuture(proc);
-  }
-
-  /** 
-   * The initial flow 'to' the StartEvent
-   */
-  class InitialFlow extends SequenceFlowImpl
-  {
-    InitialFlow(StartEvent start)
-    {
-      super("start");
-      setTarget(start);
-    }
-  }
-  
-  /**
-   * A basic implementation of a Future 
-   */
-  class ResultFuture implements Future<Result>
-  {
-    private Result result;
-    private Process proc;
-
-    public ResultFuture(Process proc)
-    {
-      this.proc = proc;
-    }
-
-    public boolean cancel(boolean mayInterruptIfRunning)
-    {
-      throw new NotImplementedException();
-    }
-
-    public Result get() throws InterruptedException, ExecutionException
-    {
-      return getResult();
-    }
-
-    public Result get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
-    {
-      throw new NotImplementedException();
-    }
-
-    public boolean isCancelled()
-    {
-      return false;
-    }
-
-    public boolean isDone()
-    {
-      boolean isDone = getResult() != null;
-      return isDone;
-    }
-
-    private Result getResult()
-    {
-      if (result == null)
-      {
-        for (EndEvent aux : proc.getEndEvents())
-        {
-          result = aux.getResult();
-          if (result != null)
-          {
-            break;
-          }
-        }
-      }
-      return result;
-    }
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ProcessEngineImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ProcessEngineImpl.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ProcessEngineImpl.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client.internal;
-
-//$Id$
-
-import org.jboss.bpm.client.ExecutionManager;
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.client.SignalManager;
-
-/**
- * A process engine with public access
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class ProcessEngineImpl extends ProcessEngine
-{
-  public void setProcessManager(ProcessManager processManager)
-  {
-    this.processManager = processManager;
-  }
-
-  public void setExecutionManager(ExecutionManager executionManager)
-  {
-    this.executionManager = executionManager;
-  }
-
-  public void setSignalManager(SignalManager signalManager)
-  {
-    this.signalManager = signalManager;
-  }
-}

Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/SignalManagerImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/SignalManagerImpl.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/SignalManagerImpl.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client.internal;
-
-// $Id$
-
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.client.SignalManager;
-import org.jboss.bpm.model.Signal;
-
-/**
- * An implementation of a signal manager
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class SignalManagerImpl extends SignalManager
-{
-  public void setProcessEngine(ProcessEngine engine)
-  {
-    this.engine = engine;
-  }
-
-  @Override
-  public void throwSignal(Signal signal)
-  {
-    super.throwSignal(signal);
-  }
-}

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -21,7 +21,9 @@
  */
 package org.jboss.bpm.model;
 
-import org.jboss.bpm.model.internal.ProcessBuilderImpl;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 
 //$Id$
 
@@ -33,17 +35,26 @@
  */
 public abstract class ProcessBuilderFactory
 {
+  /** The process engine bean name - jBPMEngine */
+  public static final String BEAN_NAME = "jBPMProcessBuilderFactory";
+  
   // Hide the constructor
-  private ProcessBuilderFactory()
+  protected ProcessBuilderFactory()
   {
   }
   
   /**
-   * Get a {@link ProcessBuilder} for a given process name.
+   * Get a ProcessBuilderFactory instance.
    */
-  public static ProcessBuilder newInstance(String procName)
+  public static ProcessBuilderFactory newInstance()
   {
-    return new ProcessBuilderImpl(procName);
+    Kernel kernel = KernelLocator.getKernel();
+    KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
+    return (ProcessBuilderFactory)entry.getTarget();
   }
   
+  /**
+   * Get a {@link ProcessBuilder} for a given process name.
+   */
+  public abstract ProcessBuilder newProcessBuilder(String procName);
 }
\ No newline at end of file

Modified: api/trunk/modules/dialects/jaxb/pom.xml
===================================================================
--- api/trunk/modules/dialects/jaxb/pom.xml	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/dialects/jaxb/pom.xml	2008-07-17 06:18:46 UTC (rev 1656)
@@ -27,12 +27,11 @@
 
   <!-- Dependencies -->
   <dependencies>
-  
-    <!-- Compile Dependencies -->
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
       <artifactId>jbpm-api</artifactId>
       <version>${version}</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   

Modified: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessAdapter.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessAdapter.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessAdapter.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -63,7 +63,7 @@
 
   public Process adaptProcess(JAXBProcess jaxbProc)
   {
-    builder = ProcessBuilderFactory.newInstance(jaxbProc.getName());
+    builder = ProcessBuilderFactory.newInstance().newProcessBuilder(jaxbProc.getName());
     for (JAXBFlowObject jaxbFlowObject : jaxbProc.getFlowObjects())
     {
       FlowObject apiFlowObject;

Copied: api/trunk/modules/impl (from rev 1655, api/trunk/modules/api)

Modified: api/trunk/modules/impl/pom.xml
===================================================================
--- api/trunk/modules/api/pom.xml	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/pom.xml	2008-07-17 06:18:46 UTC (rev 1656)
@@ -12,9 +12,9 @@
 <!-- $Id$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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 jBPM - API Source</name>
+  <name>JBoss jBPM - API Impl</name>
   <groupId>org.jboss.jbpm</groupId>
-  <artifactId>jbpm-api</artifactId>
+  <artifactId>jbpm-api-impl</artifactId>
   <packaging>jar</packaging>
 
   <!-- Parent -->
@@ -27,100 +27,12 @@
 
   <!-- Dependencies -->
   <dependencies>
-
-    <!-- Compile Dependencies -->
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.jboss.jbpm</groupId>
+      <artifactId>jbpm-api</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-kernel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    
-    <!-- Provided Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Runtime/System Dependencies -->
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-xjc</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
   
-  <!-- Plugins -->
-  <build>
-    <plugins>
-      <plugin>
-        <!--
-          ~/.m2/settings.xml 
-          <pluginGroups> 
-           <pluginGroup>com.sun.tools.jxc.maven2</pluginGroup>
-          </pluginGroups> 
-          
-          mvn jaxb-schemagen:generate
-        -->
-        <groupId>com.sun.tools.jxc.maven2</groupId>
-        <artifactId>maven-jaxb-schemagen-plugin</artifactId>
-        <configuration>
-          <srcdir>${basedir}/src/main/java/org/jboss/bpm/model/internal/jaxb</srcdir>
-          <destdir>target/schema</destdir>
-          <schemas>
-            <schema>
-              <namespace>urn:api.bpm.jboss:jpdl-0.1</namespace>
-              <file>jbpm-api-0.1.xsd</file>
-            </schema>
-          </schemas>
-          <includes>
-            <include>JAXBActivity.java</include>
-            <include>JAXBComplexGateway.java</include>
-            <include>JAXBEndEvent.java</include>
-            <include>JAXBEvent.java</include>
-            <include>JAXBExclusiveGateway.java</include>
-            <include>JAXBExecutionHandler.java</include>
-            <include>JAXBFlowHandler.java</include>
-            <include>JAXBFlow.java</include>
-            <include>JAXBFlowObject.java</include>
-            <include>JAXBGateway.java</include>
-            <include>JAXBHandler.java</include>
-            <include>JAXBInclusiveGateway.java</include>
-            <include>JAXBIntermediateEvent.java</include>
-            <include>JAXBMessageFlow.java</include>
-            <include>JAXBParallelGateway.java</include>
-            <include>JAXBProcess.java</include>
-            <include>JAXBSequenceFlow.java</include>
-            <include>JAXBSignalHandler.java</include>
-            <include>JAXBStartEvent.java</include>
-            <include>JAXBSubProcess.java</include>
-            <include>JAXBTask.java</include>
-            <include>ObjectFactory.java</include>
-            <include>package-info.java</include>
-          </includes>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <!-- Reporting -->
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <show>public</show>
-          <excludePackageNames>*.internal:*.incubation:*.test</excludePackageNames>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/EngineShutdownException.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/EngineShutdownException.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/EngineShutdownException.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm;
-
-// $Id$
-
-/**
- * A JBPMException that is thrown when an invalid operation is invoked on 
- * engine shutdown.
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class EngineShutdownException extends JBPMException {
-
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
-
-  public EngineShutdownException() {
-    super();
-  }
-
-  public EngineShutdownException(String message) {
-    super(message);
-  }
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/InvalidProcessException.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/InvalidProcessException.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/InvalidProcessException.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm;
-
-
-// $Id$
-
-/**
- * A RuntimeException that is thrown for invalid processes
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class InvalidProcessException extends JBPMException
-{
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
-
-  public InvalidProcessException()
-  {
-    super();
-  }
-
-  public InvalidProcessException(String message)
-  {
-    super(message);
-  }
-
-  public InvalidProcessException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-
-  public InvalidProcessException(Throwable cause)
-  {
-    super(cause);
-  }
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/JBPMException.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/JBPMException.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/JBPMException.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm;
-
-// $Id$
-
-/**
- * A RuntimeException that can be thrown for unrecoverable API errors
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class JBPMException extends RuntimeException {
-
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
-
-  public JBPMException() {
-    super();
-  }
-
-  public JBPMException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public JBPMException(String message) {
-    super(message);
-  }
-
-  public JBPMException(Throwable cause) {
-    super(cause);
-  }
-
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/NameNotUniqueException.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/NameNotUniqueException.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/NameNotUniqueException.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm;
-
-// $Id$
-
-/**
- * A JBPMException that is thrown when an element name is not unique.
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class NameNotUniqueException extends InvalidProcessException
-{
-  private static final long serialVersionUID = 1L;
-
-  public NameNotUniqueException()
-  {
-    super();
-  }
-
-  public NameNotUniqueException(String message)
-  {
-    super(message);
-  }
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/NotImplementedException.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/NotImplementedException.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/NotImplementedException.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm;
-
-// $Id$
-
-/**
- * A RuntimeException that should be thrown for unimplemented features
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class NotImplementedException extends RuntimeException {
-
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
-
-  public NotImplementedException() {
-    super();
-  }
-
-  public NotImplementedException(String message) {
-    super(message);
-  }
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ExecutionManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ExecutionManager.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client;
-
-// $Id$
-
-import java.util.concurrent.Future;
-
-import org.jboss.bpm.model.FlowObject;
-import org.jboss.bpm.model.Result;
-import org.jboss.bpm.model.Signal;
-import org.jboss.bpm.runtime.Attachments;
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.FlowHandler;
-import org.jboss.bpm.runtime.HandlerSupport;
-import org.jboss.bpm.runtime.RuntimeProcess;
-import org.jboss.bpm.runtime.SignalHandler;
-
-/**
- * The ExecutionManager executes processes 
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public abstract class ExecutionManager
-{
-  // Injected through the MC
-  protected ProcessEngine engine;
-
-  // Hide public constructor
-  protected ExecutionManager()
-  {
-  }
-
-  /**
-   * Start the Process and return a Future
-   * @param proc The Process to start
-   * @param att The Attachments in the ExecutionContext
-   * @return The Future from which to obtain the process result
-   */
-  public abstract Future<Result> startProcess(RuntimeProcess proc, Attachments att);
-  
-  /**
-   * Locate the signal manager
-   */
-  public static ExecutionManager locateExecutionManager()
-  {
-    ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
-    return engine.getExecutionManager();
-  }
-
-  protected ExecutionHandler getExecutionHandler(FlowObject target)
-  {
-    HandlerSupport exfo = getHandlerSupport(target);
-    return exfo.getExecutionHandler();
-  }
-
-  protected SignalHandler getSignalHandler(FlowObject target)
-  {
-    HandlerSupport exfo = getHandlerSupport(target);
-    return exfo.getSignalHandler();
-  }
-
-  protected FlowHandler getFlowHandler(FlowObject target)
-  {
-    HandlerSupport exfo = getHandlerSupport(target);
-    return exfo.getFlowHandler();
-  }
-
-  protected void throwSignal(Signal signal)
-  {
-    SignalManager sm = SignalManager.locateSignalManager();
-    sm.throwSignal(signal);
-  }
-
-  private HandlerSupport getHandlerSupport(FlowObject fo)
-  {
-    if (fo instanceof HandlerSupport == false)
-      throw new IllegalStateException("Flow object is not executable: " + fo);
-    return (HandlerSupport)fo;
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessEngine.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngine.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessEngine.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client;
-
-// $Id$
-
-/**
- * The process engine is an agregator of various manger objects used by the BPM engine
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class ProcessEngine
-{
-  /** The process engine bean name - jBPMEngine */
-  public static final String BEAN_NAME_JBPMENGINE = "jBPMProcessEngine";
-  /** The default bean config: jbpm-beans.xml */
-  public static final String JBPM_ENGINE_CONFIG = "jbpm-beans.xml";
-
-  // Injected through the MC
-  protected ProcessManager processManager;
-  // Injected through the MC
-  protected SignalManager signalManager;
-  // Injected through the MC
-  protected ExecutionManager executionManager;
-  // Flag to indicate that the Engine is shutting down
-  private boolean prepareForShutdown;
-
-  // Hide public constructor
-  protected ProcessEngine()
-  {
-  }
-
-  /**
-   * Prepare the engine for shutdown. During shutdown the creation of new processes is disallowed.
-   */
-  public void prepareForShutdown()
-  {
-    prepareForShutdown = true;
-  }
-
-  /**
-   * True, if engine is preparing for shutdown.
-   */
-  public boolean isPrepareForShutdown()
-  {
-    return prepareForShutdown;
-  }
-
-  /**
-   * Cancel the prepare for shutdown request
-   */
-  public void cancelShutdown()
-  {
-    prepareForShutdown = false;
-  }
-
-  /**
-   * Get the configured instance of the ProcessManager
-   * @return The ProcessManager
-   */
-  public ProcessManager getProcessManager()
-  {
-    if (processManager == null)
-      throw new IllegalStateException("ProcessManager not available through kernel configuration");
-
-    return processManager;
-  }
-
-  /**
-   * Get the configured instance of the SignalManager
-   * @return The SignalManager
-   */
-  public SignalManager getSignalManager()
-  {
-    if (signalManager == null)
-      throw new IllegalStateException("SignalManager not available through kernel configuration");
-
-    return signalManager;
-  }
-
-  /**
-   * Get the configured instance of the ExecutionManager
-   * @return The ExecutionManager
-   */
-  public ExecutionManager getExecutionManager()
-  {
-    if (executionManager == null)
-      throw new IllegalStateException("ExecutionManager not available through kernel configuration");
-
-    return executionManager;
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessEngineLocator.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -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.jboss.bpm.client;
-
-// $Id$
-
-import java.net.URL;
-
-import org.jboss.bpm.JBPMException;
-import org.jboss.bpm.client.internal.EmbeddedBeansDeployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.util.KernelLocator;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.kernel.spi.registry.KernelRegistryEntryNotFoundException;
-
-/**
- * The ProcessEngineLocator is the main entry point for all client operations. It locates the process engine instance shared by all clients.
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public abstract class ProcessEngineLocator
-{
-
-  // Hide the constructor
-  private ProcessEngineLocator()
-  {
-  }
-
-  /**
-   * Locate the ProcessEngine instance shared by all clients.
-   * 
-   * @return The configured instance of a process engine
-   */
-  @SuppressWarnings("deprecation")
-  public static ProcessEngine locateProcessEngine()
-  {
-    Kernel kernel = KernelLocator.getKernel();
-    KernelRegistryEntry entry = null;
-    if (kernel == null)
-    {
-      deployEngineConfiguration();
-      kernel = KernelLocator.getKernel();
-      entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME_JBPMENGINE);
-    }
-    else
-    {
-      try
-      {
-        entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME_JBPMENGINE);
-      }
-      catch (KernelRegistryEntryNotFoundException ex)
-      {
-        deployEngineConfiguration();
-        entry = kernel.getRegistry().getEntry(ProcessEngine.BEAN_NAME_JBPMENGINE);
-      }
-    }
-
-    ProcessEngine engine = (ProcessEngine)entry.getTarget();
-    return engine;
-  }
-
-  private static void deployEngineConfiguration()
-  {
-
-    String config = ProcessEngine.JBPM_ENGINE_CONFIG;
-    URL url = Thread.currentThread().getContextClassLoader().getResource(config);
-    if (url == null)
-      throw new JBPMException("Cannot find resource: " + config);
-
-    new EmbeddedBeansDeployer().deploy(url);
-  }
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,161 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client;
-
-// $Id$
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.EngineShutdownException;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.model.internal.ProcessImpl;
-
-/**
- * The process manager is the entry point to create, find and otherwise manage processes.
- * 
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public abstract class ProcessManager
-{
-  // provide logging
-  private static final Log log = LogFactory.getLog(ProcessManager.class);
-
-  // Injected through the MC
-  protected ProcessEngine engine;
-  // The set of process definitions
-  private Set<Process> procs = new HashSet<Process>();
-
-  // Hide public constructor
-  protected ProcessManager()
-  {
-  }
-
-  /**
-   * Get the associated process engine
-   */
-  public ProcessEngine getProcessEngine()
-  {
-    if (engine == null)
-      throw new IllegalStateException("ProcessEngine not available through kernel configuration");
-
-    return engine;
-  }
-
-  /**
-   * Locate the process definition manager
-   */
-  public static ProcessManager locateProcessManager()
-  {
-    ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
-    return engine.getProcessManager();
-  }
-
-  /**
-   * Create a Process from a XML string in one of the supported formats
-   */
-  public final Process createProcess(String procDescriptor)
-  {
-    if (engine.isPrepareForShutdown())
-      throw new EngineShutdownException("Cannot create new Process while engine is shutting down");
-
-    Process proc = createProcessOverride(procDescriptor);
-    registerProcess(proc);
-    return proc;
-  }
-
-  /**
-   * Create a Process from an URL to a XML descritor in one of the supported formats
-   */
-  public final Process createProcess(URL procURL) throws IOException
-  {
-    if (engine.isPrepareForShutdown())
-      throw new EngineShutdownException("Cannot create new Process while engine is shutting down");
-
-    Process proc = createProcessOverride(procURL);
-    registerProcess(proc);
-    return proc;
-  }
-
-  /**
-   * Override to implement Process creation
-   */
-  protected abstract Process createProcessOverride(String pXML);
-
-  /**
-   * Override to implement Process creation
-   */
-  protected abstract Process createProcessOverride(URL pURL) throws IOException;
-
-  /**
-   * Get the set of registered Processes
-   */
-  public Set<Process> getProcesses()
-  {
-    return Collections.unmodifiableSet(procs);
-  }
-
-  /**
-   * Find a Process for a given name
-   * 
-   * @return null if the process definition is not defined
-   */
-  public Process findProcess(String name)
-  {
-    Process proc = null;
-    for (Process aux : procs)
-    {
-      if (aux.getName().equals(name))
-      {
-        proc = aux;
-        break;
-      }
-    }
-    return proc;
-  }
-
-  /**
-   * Register a Process
-   */
-  public final boolean registerProcess(Process proc)
-  {
-    // Only initialize if this has not already been done
-    if (proc.getProcessState() == Process.ProcessState.CREATED)
-      ((ProcessImpl)proc).initialize();
-    
-    return procs.add((ProcessImpl)proc);
-  }
-
-  /**
-   * Remove a Process
-   */
-  public void removeProcess(ProcessImpl proc)
-  {
-    procs.remove(proc.getName());
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/SignalListener.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/SignalListener.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client;
-
-import org.jboss.bpm.model.Signal;
-
-//$Id$
-
-
-/**
- * A signal listener that can be registered with the ProcessEngine
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface SignalListener
-{
-  /** 
-   * Catch a signal from the process that this listener is registered with 
-   */
-  void catchSignal(Signal signal);
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/SignalManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/SignalManager.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,121 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.client;
-
-//$Id$
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.model.Signal;
-
-/**
- * The signal manager is the entry point for signal processing
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public abstract class SignalManager
-{
-  // provide logging
-  private static final Log log = LogFactory.getLog(SignalManager.class);
-
-  // Injected through the MC
-  protected ProcessEngine engine;
-  // The map of registered signal listeners
-  private Map<String, Set<SignalListener>> listeners = new HashMap<String, Set<SignalListener>>();
-
-  // Hide public constructor
-  protected SignalManager()
-  {
-  }
-
-  /**
-   * Get the associated process engine
-   */
-  public ProcessEngine getProcessEngine()
-  {
-    if (engine == null)
-      throw new IllegalStateException("ProcessEngine not available through kernel configuration");
-
-    return engine;
-  }
-
-  /**
-   * Locate the signal manager
-   */
-  public static SignalManager locateSignalManager()
-  {
-    ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
-    return engine.getSignalManager();
-  }
-
-  /** Add a signal listener for a given process */
-  public void addListener(String procName, SignalListener listener)
-  {
-    log.debug("addListener: " + listener);
-    Set<SignalListener> set = listeners.get(procName);
-    if (set == null)
-    {
-      set = new HashSet<SignalListener>();
-      listeners.put(procName, set);
-    }
-    set.add(listener);
-  }
-
-  /** Remove an signal listener for a given process */
-  public void removeListener(String procName, SignalListener listener)
-  {
-    log.debug("removeListener: " + listener);
-    Set<SignalListener> set = listeners.get(procName);
-    if (set != null)
-    {
-      set.remove(listener);
-    }
-  }
-
-  /** Remove all signal listeners for a given process */
-  public void removeListeners(String procName)
-  {
-    log.debug("removeListeners: " + procName);
-    listeners.remove(procName);
-  }
-
-  /** Throw a signal to all registered listeners */
-  public void throwSignal(Signal signal)
-  {
-    log.debug("throwSignal: " + signal);
-    String procName = signal.getProcessName();
-    Set<SignalListener> set = listeners.get(procName);
-    if (set != null)
-    {
-      for (SignalListener listener : set)
-      {
-        listener.catchSignal(signal);
-      }
-    }
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/client/internal/EmbeddedBeansDeployer.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -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.client.internal;
-
-// $Id$
-
-import java.net.URL;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.JBPMException;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
-import org.jboss.kernel.plugins.util.KernelLocator;
-
-/**
- * Boostrap the Microcontainer
- * 
- * @author thomas.diesler at jboss.com
- * @since 27-Jun-2008
- */
-public class EmbeddedBeansDeployer extends BasicBootstrap
-{
-  // provide logging
-  private static final Log log = LogFactory.getLog(EmbeddedBeansDeployer.class);
-
-  private Kernel kernel;
-  private BasicXMLDeployer deployer;
-
-  public EmbeddedBeansDeployer()
-  {
-    // Get or bootstrap the kernel
-    kernel = KernelLocator.getKernel();
-    if (kernel == null)
-    {
-      try
-      {
-        super.bootstrap();
-        kernel = super.getKernel();
-        log.debug("bootstrap kernel: " + kernel);
-      }
-      catch (Throwable e)
-      {
-        throw new JBPMException("Cannot bootstrap kernel", e);
-      }
-    }
-    deployer = new BasicXMLDeployer(kernel);
-  }
-
-  /**
-   * Deploy MC beans from URL
-   */
-  public void deploy(URL url)
-  {
-    log.debug("deploy: " + url);
-    
-    // Deploy the beans
-    try
-    {
-      deployer.deploy(url);
-      deployer.validate();
-
-      // The KernelLocator is expected to get deployed as a bean
-      if (KernelLocator.getKernel() == null)
-        throw new JBPMException("KernelLocator not deployed as MC bean");
-
-    }
-    catch (Throwable e)
-    {
-      throw new JBPMException("Cannot deploy beans from: " + url, e);
-    }
-  }
-
-  /**
-   * Undeploy MC beans from URL
-   */
-  public void undeploy(URL url)
-  {
-    log.debug("undeploy: " + url);
-    try
-    {
-      deployer.undeploy(url);
-    }
-    catch (Throwable e)
-    {
-      throw new JBPMException("Cannot undeploy beans from: " + url, e);
-    }
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Activity.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Activity.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * An activity is a generic term for work that a company or organization performs via business processes. 
- * An activity can be atomic or non-atomic (compound). 
- * The types of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Activity extends FlowObject, NamedFlowObject
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/BPMNElement.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/BPMNElement.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/BPMNElement.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * The 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface BPMNElement 
-{
-  /**
-   * Get the ID of this element
-   */
-  //String getID();
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ComplexGateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ComplexGateway.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ComplexGateway.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-// $Id$
-
-/**
- * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. Complex Gateways can also be used to combine a set of linked
- * simple Gateways into a single, more compact situation. Modelers can provide complex expressions that determine the merging and/or splitting behavior of the Gateway.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface ComplexGateway extends Gateway
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/EndEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/EndEvent.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * As the name implies, the End Event indicates where a Process will end. 
- * 
- * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. 
- * An End Event can have a specific Result that will appear as a marker within the center of the End Event shape. 
- * End Event Results are Message, Error, Compensation, Link, and Multiple.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface EndEvent extends Event, NamedFlowObject, SingleInFlowSupport
-{
-  /** 
-   * Get the {@link Result} 
-   */
-  Result getResult();
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Event.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Event.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Event.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * An Event is something that “happens” during the course of a business process. 
- * <p/>
- * These Events affect the flow of the Process and usually have a cause or an impact.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Event extends FlowObject
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ExclusiveGateway.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface ExclusiveGateway extends Gateway
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Flow.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Flow.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Flow.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A Flow is a graphical line connecting two objects in a BPD. 
- * <p/>
- * There are two types of Flow: {@link SequenceFlow} and {@link MessageFlow}, each with their own line style. 
- * Flow is also used in a generic sense (and lowercase) to describe how Tokens will traverse from the 
- * {@link StartEvent} to an {@link EndEvent}.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Flow
-{
-  /**
-   * Get the optional name
-   */
-  String getName();
-
-  /**
-   * Get the required target name
-   */
-  String getTargetName();
-  
-  /**
-   * Get the source flow object
-   */
-  FlowObject getSource();
-
-  /**
-   * Get the target flow object
-   */
-  FlowObject getTarget();
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/FlowObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/FlowObject.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A Flow Object is one of the set of following graphical objects: 
- * {@link Event}, {@link Activity}, and {@link Gateway}.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface FlowObject extends GraphicalElement
-{
-  /** 
-   * Get the associated Process 
-   */
-  Process getProcess();
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Gateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Gateway.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Gateway.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id: ExecutionHandlerImpl.java 1627 2008-07-14 15:16:28Z thomas.diesler at jboss.com $
-
-/**
- * Gateways are modelling elements that are used to control how Flows interact as they converge and diverge within a Process. 
- * </p>
- * If the flow does not need to be controlled, then a Gateway is not needed.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Gateway extends FlowObject, NamedFlowObject, MultipleOutFlowSupport, MultipleInFlowSupport
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/GraphicalElement.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/GraphicalElement.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/GraphicalElement.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A graphical BPMN element 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface GraphicalElement extends BPMNElement
-{
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/InclusiveGateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/InclusiveGateway.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/InclusiveGateway.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * This Decision represents a branching point where Alternatives are based on conditional expressions contained within outgoing Sequence Flow. 
- * However, in this case, the True evaluation of one condition expression does not exclude the evaluation of other condition expressions. 
- * All Sequence Flow with a True evaluation will be traversed by a Token. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface InclusiveGateway extends Gateway
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/IntermediateEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/IntermediateEvent.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/IntermediateEvent.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * An Intermediate Event is an {@link Event} that occurs after a {@link Process} has been started. 
- * <p/>
- * It will affect the {@link Flow} of the {@link Process}, but will not start or (directly) terminate
- * the {@link Process}. An Intermediate Event will show where messages or delays are expected within the {@link Process}, 
- * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface IntermediateEvent extends Event, NamedFlowObject, SingleInFlowSupport, SingleOutFlowSupport
-{
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MessageFlow.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MessageFlow.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MessageFlow.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A Message Flow is a dashed line that is used to show the flow of messages between two entities that are prepared to send and receive them. 
- * In BPMN, two separate Pools in the Diagram will represent the two entities. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface MessageFlow extends Flow
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MultipleInFlowSupport.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import java.util.List;
-
-//$Id$
-
-/**
- * Implementing {@link FlowObject}s support multiple incomming {@link Flow}s.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface MultipleInFlowSupport
-{
-  /**
-   * Get the list of in flows
-   */
-  List<Flow> getInFlows();
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/MultipleOutFlowSupport.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import java.util.List;
-
-//$Id$
-
-/**
- * Implementing {@link FlowObject} support multiple outgoing {@link Flow}.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface MultipleOutFlowSupport
-{
-  /**
-   * Get the list of out flows
-   */
-  List<Flow> getOutFlows();
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/NamedFlowObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/NamedFlowObject.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/NamedFlowObject.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * Implementing {@link BPMNElement} have can be uniquely identified 
- * in the {@link Process} by name.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface NamedFlowObject
-{
-  /**
-   * Get the unique name.
-   */
-  String getName();
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ParallelGateway.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ParallelGateway.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ParallelGateway.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * Parallel Gateway is required when two or more Activities need to be executed in parallel.  
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface ParallelGateway extends Gateway
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Process.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id: MultipleInFlowSupport.java 1627 2008-07-14 15:16:28Z thomas.diesler at jboss.com $
-
-import java.util.List;
-import java.util.concurrent.Future;
-
-import org.jboss.bpm.runtime.Attachments;
-
-/**
- * A Process is any {@link Activity} performed within a company or organization.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Process extends Activity, NamedFlowObject
-{
-  /**
-   * Defines the state a {@link Process} can be in
-   */
-  enum ProcessState
-  {
-    /** The Process is created but not yet initialized */
-    CREATED, 
-    /** The Process is initialized but not yet started */
-    INITIALIZED, 
-    /** The Process is started but has not yet ended */
-    STARTED, 
-    /** The Process has ended */
-    ENDED
-  };
-
-  /**
-   * Get the start event
-   */
-  StartEvent getStartEvent();
-
-  /**
-   * Get the set of end events
-   */
-  List<EndEvent> getEndEvents();
-
-  /**
-   * Get the list of flow objects
-   */
-  List<FlowObject> getFlowObjects();
-
-  /** Start the process */
-  Future<Result> startProcess();
-
-  /** Start the process, with a given execution context */
-  Future<Result> startProcess(Attachments att);
-
-  /**
-   * Find a flow object by name
-   * 
-   * @return null if not found
-   */
-  FlowObject findFlowObject(String name);
-
-  /**
-   * Get the process state
-   */
-  ProcessState getProcessState();
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ProcessBuilder.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilder.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ProcessBuilder.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,173 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import org.jboss.bpm.runtime.ExecutionHandler;
-import org.jboss.bpm.runtime.FlowHandler;
-import org.jboss.bpm.runtime.SignalHandler;
-
-//$Id$
-
-/**
- * The ProcessBuilder can be used to build a {@link Process} dynamically.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface ProcessBuilder
-{
-  /**
-   * Get the {@link Process}.
-   * <p/>
-   * This is the final call to the ProcessBuilder after all elements have been added.
-   */
-  Process getProcess();
-  
-  /**
-   * Add a {@link SubProcess} with a given name
-   */
-  ProcessBuilder addSubProcess(String name);
-
-  /**
-   * Add a {@link SequenceFlow} with a given name
-   */
-  ProcessBuilder addSequenceFlow(String name);
-
-  /**
-   * Add a {@link MessageFlow} with a given name
-   */
-  ProcessBuilder addMessageFlow(String name);
-
-  /**
-   * Add a {@link StartEvent}
-   */
-  ProcessBuilder addStartEvent();
-
-  /**
-   * Add an {@link IntermediateEvent} with a given name
-   */
-  ProcessBuilder addItermediateEvent(String name);
-
-  /**
-   * Add an {@link EndEvent} with a given name
-   */
-  ProcessBuilder addEndEvent(String name);
-
-  /**
-   * Add a {@link Task} with a given name
-   */
-  ProcessBuilder addTask(String name);
-
-  /**
-   * Add an {@link ExclusiveGateway} with a given name
-   */
-  ProcessBuilder addExclusiveGateway(String name);
-
-  /**
-   * Add an {@link InclusiveGateway} with a given name
-   */
-  ProcessBuilder addInclusiveGateway(String name);
-
-  /**
-   * Add a {@link ComplexGateway} with a given name
-   */
-  ProcessBuilder addComplexGateway(String name);
-
-  /**
-   * Add a {@link ParallelGateway} with a given name
-   */
-  ProcessBuilder addParallelGateway(String name);
-
-  /**
-   * Add an {@link ExecutionHandler} with a given Class
-   */
-  ProcessBuilder addExecutionHandler(Class<?> clazz);
-
-  /**
-   * Add an {@link FlowHandler} with a given Class
-   */
-  ProcessBuilder addFlowHandler(Class<?> clazz);
-
-  /**
-   * Add an {@link SignalHandler} with a given Class
-   */
-  ProcessBuilder addSignalHandler(Class<?> clazz);
-
-  // ==============
-
-  /**
-   * Create a {@link Process}.
-   */
-  Process createProcess(String name);
-
-  /**
-   * Create a {@link SubProcess} with a given name
-   */
-  SubProcess createSubProcess(String name);
-  
-  /**
-   * Create a {@link StartEvent}
-   */
-  StartEvent createStartEvent();
-
-  /**
-   * Create an {@link IntermediateEvent} with a given name
-   */
-  IntermediateEvent createIntermediateEvent(String name);
-
-  /**
-   * Create an {@link EndEvent} with a given name
-   */
-  EndEvent createEndEvent(String name);
-  
-  /**
-   * Create a {@link Task} with a given name
-   */
-  Task createTask(String name);
-
-  /**
-   * Create an {@link ExclusiveGateway} with a given name
-   */
-  ExclusiveGateway createExclusiveGateway(String name);
-
-  /**
-   * Create an {@link InclusiveGateway} with a given name
-   */
-  InclusiveGateway createInclusiveGateway(String name);
-
-  /**
-   * Create a {@link ComplexGateway} with a given name
-   */
-  ComplexGateway createComplexGateway(String name);
-
-  /**
-   * Create a {@link ParallelGateway} with a given name
-   */
-  ParallelGateway createParallelGateway(String name);
-
-  /**
-   * Add a {@link FlowObject} create by one of the create methods. 
-   * @param fo
-   * @return
-   */
-  FlowObject addFlowObject(FlowObject fo);
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/ProcessBuilderFactory.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-import org.jboss.bpm.model.internal.ProcessBuilderImpl;
-
-//$Id$
-
-/**
- * A Factory for the {@link ProcessBuilder}.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public abstract class ProcessBuilderFactory
-{
-  // Hide the constructor
-  private ProcessBuilderFactory()
-  {
-  }
-  
-  /**
-   * Get a {@link ProcessBuilder} for a given process name.
-   */
-  public static ProcessBuilder newInstance(String procName)
-  {
-    return new ProcessBuilderImpl(procName);
-  }
-  
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Result.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Result.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Result.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-import org.jboss.bpm.runtime.Attachments;
-
-/**
- * A Result is consequence of reaching an End Event.
- * <p/>
- * Results can be of different types, including: Message, Error, Compensation, Link, and Multiple.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Result
-{
-  /** Get the Attachments from the result */
-  Attachments getAttachments();
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SequenceFlow.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SequenceFlow.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SequenceFlow.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. 
- * Each Flow has only one source and only one target. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface SequenceFlow extends Flow
-{
-
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Signal.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Signal.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,114 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-
-/**
- * A Signal thrown by the ProcessEngine
- * 
- * @author Thomas.Diesler at jboss.com
- * @since 08-Jul-2008
- */
-public class Signal
-{
-  /**
-   * Defines the types of supported Signals
-   */
-  public enum Type
-  {
-    ENTER_START_EVENT, EXIT_START_EVENT, 
-    ENTER_EVENT, EXIT_EVENT, 
-    ENTER_END_EVENT, EXIT_END_EVENT, 
-    ENTER_GATEWAY, EXIT_GATEWAY, 
-    ENTER_PROCESS, EXIT_PROCESS, 
-    ENTER_SUB_PROCESS, EXIT_SUB_PROCESS, 
-    ENTER_TASK, EXIT_TASK,
-    USER_SIGNAL
-  }
-
-  private Type type;
-  private FlowObject flowObject;
-  private String message;
-
-  /** Create the signal for a given process */
-  public Signal(FlowObject flowObject, Type type)
-  {
-    this.flowObject = flowObject;
-    this.type = type;
-    validateSignal();
-  }
-
-  /** Create the signal for a given process */
-  public Signal(FlowObject flowObject, Type type, String message)
-  {
-    this.flowObject = flowObject;
-    this.type = type;
-    this.message = message;
-    validateSignal();
-  }
-
-  /** Get the proccess name */
-  public String getProcessName()
-  {
-    return flowObject.getProcess().getName();
-  }
-
-  public Type getType()
-  {
-    return type;
-  }
-
-  public String getFlowObject()
-  {
-    return flowObject.toString();
-  }
-
-  public String getMessage()
-  {
-    return message;
-  }
-
-  private void validateSignal()
-  {
-    if (flowObject == null)
-      throw new IllegalArgumentException("FlowObject cannot be null");
-    if (type == null)
-      throw new IllegalArgumentException("SignalType cannot be null");
-  }
-
-  public String toString()
-  {
-    StringBuilder string = new StringBuilder(type + "[" + getProcessName());
-    if (flowObject instanceof Process == false)
-    {
-      string.append(":" + flowObject);
-    }
-    if (message != null)
-    {
-      string.append(":" + message);
-    }
-    string.append("]");
-    return string.toString();
-  }
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SingleInFlowSupport.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * Implementing {@link FlowObject} support a single incomming {@link Flow}.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface SingleInFlowSupport
-{
-  /**
-   * Get the out flow
-   */
-  Flow getInFlow();
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SingleOutFlowSupport.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * Implementing {@link FlowObject}s support a single outgoing {@link Flow}s.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface SingleOutFlowSupport
-{
-  /**
-   * Get the out flow
-   */
-  Flow getOutFlow();
-}

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/StartEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/StartEvent.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/StartEvent.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A Start Event indicates where a particular Process will start. 
- * <p/>
- * In terms of Sequence Flow, the Start Event starts the Flow of the Process, and thus, will not have any
- * incoming Sequence Flow. A Start Event can have a Trigger that indicates how the Process starts: Message, Timer, Rule, Link, or Multiple.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface StartEvent extends Event, SingleOutFlowSupport
-{
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SubProcess.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SubProcess.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SubProcess.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A Sub-Process is Process that is included within another Process.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface SubProcess extends Process, SingleInFlowSupport, SingleOutFlowSupport
-{
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SuportingElement.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SuportingElement.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/SuportingElement.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-//$Id$
-
-/**
- * A graphical BPMN element 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface SuportingElement extends BPMNElement
-{
-}
\ No newline at end of file

Deleted: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Task.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/Task.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.model;
-
-
-//$Id$
-
-/**
- * A Task is an Atomic Activity that is included within a Process.
- * 
- * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to
- * perform the Task when it is executed.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Task extends Activity, SingleInFlowSupport, SingleOutFlowSupport
-{
-}
\ No newline at end of file

Modified: api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/impl/src/main/java/org/jboss/bpm/model/internal/ProcessBuilderImpl.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -40,7 +40,7 @@
 import org.jboss.bpm.runtime.SignalHandler;
 
 /**
- * The ProcessBuilder can be used to dynamically build {@link Process}es.
+ * The ProcessBuilder can be used to dynamically build a {@link Process}.
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008

Modified: api/trunk/modules/testsuite/pom.xml
===================================================================
--- api/trunk/modules/testsuite/pom.xml	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/pom.xml	2008-07-17 06:18:46 UTC (rev 1656)
@@ -37,6 +37,12 @@
 
     <!-- Test Dependencies -->
     <dependency>
+      <groupId>org.jboss.jbpm</groupId>
+      <artifactId>jbpm-api-impl</artifactId>
+      <version>${version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Deleted: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/MockEngineTestCase.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/MockEngineTestCase.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/MockEngineTestCase.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm;
-
-//$Id$
-
-import org.jboss.bpm.test.AbstractAPITestCase;
-
-public abstract class MockEngineTestCase extends AbstractAPITestCase
-{
-
-  @Override
-  protected String getBeansConfig()
-  {
-    return "jbpm-mock-beans.xml";
-  }
-
-}

Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/client/ProcessEngineLocatorTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/client/ProcessEngineLocatorTest.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/client/ProcessEngineLocatorTest.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -23,9 +23,9 @@
 
 // $Id$
 
-import org.jboss.bpm.MockEngineTestCase;
+import org.jboss.bpm.test.DefaultEngineTestCase;
 
-public class ProcessEngineLocatorTest extends MockEngineTestCase
+public class ProcessEngineLocatorTest extends DefaultEngineTestCase
 {
 
   public void testLocateProcessEngine() throws Exception

Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -26,7 +26,7 @@
 import java.util.List;
 
 import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.MockEngineTestCase;
+import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
  * Test the intergety of various process definitions
@@ -34,12 +34,12 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
-public class ProcessIntegrityTest extends MockEngineTestCase
+public class ProcessIntegrityTest extends DefaultEngineTestCase
 {
   public void testAnonymousProcess() throws Exception
   {
     // Create a Process through the ProcessBuilder
-    ProcessBuilder builder = ProcessBuilderFactory.newInstance(null);
+    ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(null);
     Process proc = builder.addStartEvent().addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
     assertEquals("AnonymousProcess#0", proc.getName());
     
@@ -59,7 +59,7 @@
     try
     {
       // Create a Process through the ProcessBuilder
-      ProcessBuilder builder = ProcessBuilderFactory.newInstance(null);
+      ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(null);
       builder.addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
       fail("InvalidProcessException expected");
     }
@@ -74,7 +74,7 @@
     try
     {
       // Create a Process through the ProcessBuilder
-      ProcessBuilder builder = ProcessBuilderFactory.newInstance(null);
+      ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(null);
       builder.addStartEvent().addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").addTask("end").getProcess();
       fail("InvalidProcessException expected");
     }
@@ -89,7 +89,7 @@
     try
     {
       // Create a Process through the ProcessBuilder
-      ProcessBuilder builder = ProcessBuilderFactory.newInstance(null);
+      ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(null);
       builder.addStartEvent().addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
       fail("InvalidProcessException expected");
     }

Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -72,7 +72,7 @@
   public void testParallelSplitDynamic() throws Exception 
   {
     // Create a Process through the ProcessBuilder
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance(getName());
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(getName());
     Process proc = procBuilder.addStartEvent().addSequenceFlow("gateway").addParallelGateway("gateway").
     addSequenceFlow("endA").addSequenceFlow("endB").addEndEvent("endA").addEndEvent("endB").getProcess();
     

Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -73,7 +73,7 @@
   public void testBasicSequenceDynamic() throws Exception
   {
     // Create a Process through the ProcessBuilder
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance(getName());
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(getName());
     Process proc = procBuilder.addStartEvent().addSequenceFlow("stateA").addTask("stateA").
     addSequenceFlow("end").addEndEvent("end").getProcess();
 

Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java	2008-07-17 06:18:46 UTC (rev 1656)
@@ -74,7 +74,7 @@
   public void testBasicTaskDynamic() throws Exception
   {
     // Create a Process through the ProcessBuilder
-    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance(getName());
+    ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(getName());
     Process proc = procBuilder.addStartEvent().addSequenceFlow("stateA").addTask("stateA").addExecutionHandler(TaskA.class).
     addSequenceFlow("end").addEndEvent("end").getProcess();
 

Modified: api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml	2008-07-17 06:18:46 UTC (rev 1656)
@@ -25,4 +25,6 @@
     <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
   </bean>
   
+  <!-- The process builder -->
+  <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/>
 </deployment>
\ No newline at end of file

Deleted: api/trunk/modules/testsuite/src/test/resources/jbpm-mock-beans.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/jbpm-mock-beans.xml	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/modules/testsuite/src/test/resources/jbpm-mock-beans.xml	2008-07-17 06:18:46 UTC (rev 1656)
@@ -1,28 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- 
-  <!-- The Kernel Locator -->
-  <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
-  
-  <!-- The process engine -->
-  <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl">
-    <property name="processManager"><inject bean="jBPMProcessManager"/></property>
-    <property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
-    <property name="signalManager"><inject bean="jBPMSignalManager"/></property>
-  </bean>
-
-  <!-- The process manager -->
-  <bean name="jBPMProcessManager" class="org.jboss.bpm.dialect.jaxb.ProcessManagerImpl">
-    <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
-  </bean>
-
-  <!-- The execution manager -->
-  <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl">
-    <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
-  </bean>
-
-  <!-- The execution manager -->
-  <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl">
-    <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
-  </bean>
-  
-</deployment>
\ No newline at end of file

Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml	2008-07-16 16:30:26 UTC (rev 1655)
+++ api/trunk/pom.xml	2008-07-17 06:18:46 UTC (rev 1656)
@@ -32,6 +32,7 @@
   <!-- Modules -->
   <modules>
     <module>modules/api</module>
+    <module>modules/impl</module>
     <module>modules/dialects/jaxb</module>
     <module>modules/testsuite</module>
   </modules>




More information about the jbpm-commits mailing list