[jbpm-commits] JBoss JBPM SVN: r3234 - in projects/spec/trunk/modules: api/src/main/java/org/jboss/bpm/api/config and 49 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 5 12:49:30 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-05 12:49:30 -0500 (Fri, 05 Dec 2008)
New Revision: 3234
Added:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java
projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider
Removed:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java
projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider
Modified:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java
projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java
projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
Log:
Cleanup API packages
Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,121 @@
+/*
+ * 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.api.config;
+
+//$Id$
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import org.jboss.bpm.api.service.ProcessEngine;
+
+/**
+ * The Configuration provides a ProcessEngine through a ConfigurationProvider
+ * </p>
+ * A ConfigurationProvider is discovered in two stages
+ * <p/>
+ *
+ * <ol>
+ * <li>Read the configuration provider class name from a system property
+ * <li>Read the configuration provider class name from a resource file
+ * </ol>
+ *
+ * In both cases the key is the fully qalified name of the {@link ConfigurationProvider} interface.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public abstract class Configuration
+{
+ private static ConfigurationProvider provider;
+
+ /**
+ * Create a new instance of ProcessEngine for this configuration
+ *
+ * @return The configured instance of a process engine
+ */
+ public static ProcessEngine getProcessEngine()
+ {
+ return getConfigurationProvider().getProcessEngine();
+ }
+
+ /**
+ * Get a ProcessEngine with a given name from this configuration
+ *
+ * @return The configured instance of a process engine
+ */
+ public static ProcessEngine getProcessEngine(URL cfgURL)
+ {
+ return getConfigurationProvider().getProcessEngine(cfgURL);
+ }
+
+ /**
+ * Get a ProcessEngine with a given name from this configuration
+ *
+ * @return The configured instance of a process engine
+ */
+ public static ProcessEngine getProcessEngine(String cfgXML)
+ {
+ return getConfigurationProvider().getProcessEngine(cfgXML);
+ }
+
+ private static ConfigurationProvider getConfigurationProvider()
+ {
+ if (provider == null)
+ {
+ // Get the provider name from the System property
+ String providerName = System.getProperty(ConfigurationProvider.class.getName());
+
+ // Get the provider name from the resource file
+ if (providerName == null)
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ URL providerURL = ctxLoader.getResource(ConfigurationProvider.class.getName());
+ if (providerURL == null)
+ throw new IllegalStateException("Cannot find resource: " + ConfigurationProvider.class.getName());
+
+ try
+ {
+ providerName = new BufferedReader(new InputStreamReader(providerURL.openStream())).readLine();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalStateException("Cannot read configuration provider name from: " + providerURL);
+ }
+ }
+
+ // Load the config provider
+ try
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ Class<?> providerClass = ctxLoader.loadClass(providerName);
+ provider = (ConfigurationProvider)providerClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalStateException("Cannot load configuration provider: " + providerName);
+ }
+ }
+ return provider;
+ }
+}
\ No newline at end of file
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.api.config;
+
+//$Id$
+
+import java.net.URL;
+
+import org.jboss.bpm.api.service.ProcessEngine;
+
+/**
+ * The ConfigurationProvider provides a ProcessEngine
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public interface ConfigurationProvider
+{
+ /**
+ * Get a ProcessEngine from this ConfigurationProvider
+ * @return The configured instance of a process engine
+ */
+ ProcessEngine getProcessEngine();
+
+ /**
+ * Get a ProcessEngine that is configured with a given config file
+ * @return The configured instance of a process engine
+ */
+ ProcessEngine getProcessEngine(URL cfgURL);
+
+ /**
+ * Get a ProcessEngine that is configured with a given config string
+ * @return The configured instance of a process engine
+ */
+ ProcessEngine getProcessEngine(String cfgXML);
+}
\ No newline at end of file
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/AbstractElement.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,13 +27,15 @@
import javax.management.ObjectName;
+import org.jboss.bpm.api.service.ProcessEngineSupport;
+
/**
* The parrent of all Elements
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
-public interface AbstractElement extends Serializable
+public interface AbstractElement extends ProcessEngineSupport, Serializable
{
/**
* Get the ID of this element
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Node.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -40,7 +40,7 @@
/**
* Get the associated process
*/
- Process getProcess();
+ ProcessInstance getProcess();
/**
* Get the unique name.
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -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.api.model;
-
-//$Id$
-
-import java.util.Date;
-import java.util.Set;
-
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.Token;
-
-/**
- * A Process is any Activity performed within a company or organization.
- *
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface Process extends ProcessStructure
-{
- /**
- * Defines the status a {@link Process} can be in
- */
- public enum ProcessStatus
- {
- None, Ready, Active, Suspended, Cancelled, Aborted, Completed
- }
-
- /**
- * Get the associated ProcessEngine
- */
- ProcessEngine getProcessEngine();
-
- /**
- * Get the associated ProcessDefinition
- */
- ProcessDefinition getProcessDefinition();
-
- /**
- * Get the process state
- */
- ProcessStatus getProcessStatus();
-
- /**
- * Get the root Token associated with this Process
- */
- Token getRootToken();
-
- /**
- * Get the set of Tokens associated with this Process
- */
- Set<Token> getTokens();
-
- /**
- * Start the process
- */
- Token startProcess();
-
- /**
- * Start the process, with a given context data
- */
- Token startProcess(Attachments att);
-
- /**
- * Get the start date of this process
- */
- Date getStartDate();
-
- /**
- * Get the end date of this process
- * @return null if not ended
- */
- Date getEndDate();
-
- /**
- * Suspend the process
- */
- void suspend();
-
- /**
- * Resume the process
- */
- void resume();
-
- /**
- * Cancel the process
- */
- void cancel();
-}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessDefinition.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
/**
* A ProcessDefinition defines the structure of an activity performed within a company or organization.
@@ -36,7 +36,7 @@
/**
* Create a new instance of this process definition
*/
- Process newInstance();
+ ProcessInstance newInstance();
/**
* Get the associated ProcessEngine
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java (from rev 3233, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/Process.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/ProcessInstance.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.api.model;
+
+//$Id$
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jboss.bpm.api.runtime.Attachments;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
+
+/**
+ * A Process is any Activity performed within a company or organization.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ProcessInstance extends ProcessStructure
+{
+ /**
+ * Defines the status a {@link ProcessInstance} can be in
+ */
+ public enum ProcessStatus
+ {
+ None, Ready, Active, Suspended, Cancelled, Aborted, Completed
+ }
+
+ /**
+ * Get the associated ProcessEngine
+ */
+ ProcessEngine getProcessEngine();
+
+ /**
+ * Get the associated ProcessDefinition
+ */
+ ProcessDefinition getProcessDefinition();
+
+ /**
+ * Get the process state
+ */
+ ProcessStatus getProcessStatus();
+
+ /**
+ * Get the root Token associated with this Process
+ */
+ Token getRootToken();
+
+ /**
+ * Get the set of Tokens associated with this Process
+ */
+ Set<Token> getTokens();
+
+ /**
+ * Start the process
+ */
+ Token startProcess();
+
+ /**
+ * Start the process, with a given context data
+ */
+ Token startProcess(Attachments att);
+
+ /**
+ * Get the start date of this process
+ */
+ Date getStartDate();
+
+ /**
+ * Get the end date of this process
+ * @return null if not ended
+ */
+ Date getEndDate();
+
+ /**
+ * Suspend the process
+ */
+ void suspend();
+
+ /**
+ * Resume the process
+ */
+ void resume();
+
+ /**
+ * Cancel the process
+ */
+ void cancel();
+}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/model/builder/ProcessBuilder.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,13 +23,13 @@
//$Id$
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.model.Task.TaskType;
/**
- * The ProcessBuilder can be used to build a {@link Process} dynamically.
+ * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
@@ -37,7 +37,7 @@
public interface ProcessBuilder
{
/**
- * Add a {@link Process} with a given name
+ * Add a {@link ProcessInstance} with a given name
*/
ProcessBuilder addProcess(String name);
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,10 +27,10 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.SequenceFlow;
+import org.jboss.bpm.api.service.ProcessEngine;
/**
* A Token is a descriptive construct used to describe how the flow of a Process will proceed at runtime.
@@ -57,9 +57,9 @@
ProcessEngine getProcessEngine();
/**
- * Get the associated {@link Process}
+ * Get the associated {@link ProcessInstance}
*/
- Process getProcess();
+ ProcessInstance getProcess();
/**
* Get the unique token identity
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/DialectHandler.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -28,7 +28,6 @@
import java.net.URI;
import java.net.URL;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
/**
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessBuilderService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,12 +23,12 @@
//$Id$
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.service.internal.AbstractService;
/**
- * The ProcessBuilder can be used to build a {@link Process} dynamically.
+ * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java (from rev 3233, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/client/ProcessEngine.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngine.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,105 @@
+/*
+ * 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.api.service;
+
+//$Id$
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.config.internal.MicrocontainerConfigurationProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The process engine is an agregator of various service objects used by the BPM engine.
+ * <p/>
+ * A ProcessEngine is always created via one of the available {@link Configuration} objects. Every implementation of the API has one default
+ * {@link Configuration} which is configured via a resource file with the fully qualified class name of {@link Configuration}.
+ * <p/>
+ * The API natively supports {@link MicrocontainerConfigurationProvider}. To create and register a ProcessEngine explicitly, you would do
+ *
+ * <pre>
+ * MicrocontainerConfiguration config = new MicrocontainerConfiguration();
+ * ProcessEngine engine = config.deployBeansConfig(cfgURL).getProcessEngine("EngineBeanName");
+ * ProcessEngineRegistry.registerProcessEngine(engine);
+ * </pre>
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public class ProcessEngine
+{
+ // Provide logging
+ final static Logger log = LoggerFactory.getLogger(ProcessEngine.class);
+
+ // The map of registered services
+ protected Set<Service> services = new HashSet<Service>();
+ // The name of this engine
+ private String name;
+
+ // Hide public constructor
+ protected ProcessEngine()
+ {
+ }
+
+ /**
+ * Get the instance of the registered service
+ *
+ * @return null if there is no service registered for the given class
+ */
+ @SuppressWarnings("unchecked")
+ public <T> T getService(Class<T> clazz)
+ {
+ Service service = null;
+ for (Service aux : services)
+ {
+ if (clazz.isAssignableFrom(aux.getClass()))
+ {
+ service = aux;
+ break;
+ }
+ }
+ return (T)service;
+ }
+
+ /**
+ * Get the name of this engine
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ // Set the name of this engine
+ protected void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ProcessEngine[name=" + name + ",class=" + getClass().getName() + "]";
+ }
+}
\ No newline at end of file
Added: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.api.service;
+
+//$Id$
+
+/**
+ * Gives access to the ProcessEngine
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 05-Dec-2008
+ */
+public interface ProcessEngineSupport
+{
+ /**
+ * Get the associated ProcessEngine
+ */
+ ProcessEngine getProcessEngine();
+}
\ No newline at end of file
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessEngineSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,8 +27,8 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.model.Process;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
/**
* The ProcessService is the entry point to create, find and otherwise manage processes.
@@ -43,7 +43,7 @@
* Register a Process.
* @return An implementation may return a proxied version of the given Process
*/
- Process registerProcess(Process proc);
+ ProcessInstance registerProcess(ProcessInstance proc);
/**
* Unregister a Process.
@@ -53,7 +53,7 @@
/**
* Get a Process for a given id
*/
- Process getProcess(ObjectName procID);
+ ProcessInstance getProcess(ObjectName procID);
/**
* Get the set of registered Processes
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/Service.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -21,9 +21,6 @@
*/
package org.jboss.bpm.api.service;
-import org.jboss.bpm.api.client.ProcessEngine;
-
-
//$Id$
/**
@@ -32,10 +29,6 @@
* @author thomas.diesler at jboss.com
* @since 25-Sep-2008
*/
-public interface Service
+public interface Service extends ProcessEngineSupport
{
- /**
- * Get the associated ProcessEngine
- */
- ProcessEngine getProcessEngine();
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractDialectHandler.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.service.DialectHandler;
+import org.jboss.bpm.api.service.ProcessEngine;
/**
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.Service;
/**
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,9 +30,9 @@
import junit.framework.TestCase;
import org.jboss.bpm.api.Constants;
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/CTSTestCase.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -35,11 +35,11 @@
import javax.management.ObjectName;
import org.jboss.bpm.api.BPMException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.DialectHandler;
import org.jboss.bpm.api.service.DialectHandlerService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.client.SignalListener;
import org.jboss.bpm.incubator.model.Message;
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.EndEvent;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow;
@@ -33,6 +32,7 @@
import org.jboss.bpm.api.model.Task;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
/**
* A catalog of CTS test processes
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,11 +25,11 @@
import junit.framework.TestCase;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Expression;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.EndEventExt;
import org.jboss.bpm.incubator.model.Message;
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -1,63 +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.incubator.client;
-
-//$Id$
-
-import javax.management.ObjectName;
-
-import org.jboss.bpm.api.model.Process;
-import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.incubator.model.ProcessStructureExt;
-
-/**
- * A Process is any Activity performed within a company or organization.
- *
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public interface ProcessExt extends Process, ProcessStructureExt
-{
- /**
- * Start the process asynchronously
- */
- ObjectName startProcessAsync();
-
- /**
- * Start the process asynchronously, with a given context data
- */
- ObjectName startProcessAsync(Attachments att);
-
- /**
- * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
- * Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends without
- * timeout.
- */
- ProcessStatus waitForEnd();
-
- /**
- * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
- * Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends with a
- * given timeout.
- */
- ProcessStatus waitForEnd(long timeout);
-}
\ No newline at end of file
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java (from rev 3233, projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessExt.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/ProcessInstanceExt.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.incubator.client;
+
+//$Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.runtime.Attachments;
+import org.jboss.bpm.incubator.model.ProcessStructureExt;
+
+/**
+ * A Process is any Activity performed within a company or organization.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public interface ProcessInstanceExt extends ProcessInstance, ProcessStructureExt
+{
+ /**
+ * Start the process asynchronously
+ */
+ ObjectName startProcessAsync();
+
+ /**
+ * Start the process asynchronously, with a given context data
+ */
+ ObjectName startProcessAsync(Attachments att);
+
+ /**
+ * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
+ * Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends without
+ * timeout.
+ */
+ ProcessStatus waitForEnd();
+
+ /**
+ * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
+ * Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends with a
+ * given timeout.
+ */
+ ProcessStatus waitForEnd(long timeout);
+}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/client/UserTaskCallback.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,10 +25,10 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.BasicAttachments;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.UserTask;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/model/builder/ProcessBuilderExt.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.Event.EventDetailType;
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.model.Gateway.GatewayType;
@@ -40,7 +40,7 @@
import org.jboss.bpm.incubator.runtime.SignalHandler;
/**
- * The ProcessBuilder can be used to build a {@link Process} dynamically.
+ * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/FlowHandler.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,9 +23,9 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
/**
* The {@link ProcessEngine} invokes the FlowHandler on a {@link Node}
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/runtime/SignalHandler.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,9 +23,9 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Signal;
/**
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageBuilderService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.internal.AbstractService;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -31,12 +31,12 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
import org.jboss.bpm.api.model.Event;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.Task;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.service.internal.AbstractService;
import org.jboss.bpm.incubator.client.MessageListener;
@@ -137,7 +137,7 @@
public void sendMessage(ObjectName procID, String targetName, Message msg)
{
ProcessService procService = getProcessEngine().getService(ProcessService.class);
- Process proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getProcess(procID);
if (proc == null)
throw new IllegalStateException("Cannot obtain registered process: " + procID);
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/PersistenceService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,7 +27,7 @@
import org.hibernate.Session;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.internal.AbstractService;
@@ -62,17 +62,17 @@
/**
* Save the Process to persistent storage
*/
- public abstract ObjectName saveProcess(Process proc);
+ public abstract ObjectName saveProcess(ProcessInstance proc);
/**
* Load the Process from persistent storage
*/
- public abstract Process loadProcess(ObjectName procID);
+ public abstract ProcessInstance loadProcess(ObjectName procID);
/**
* Delete the Process from persistent storage
*/
- public abstract void deleteProcess(Process proc);
+ public abstract void deleteProcess(ProcessInstance proc);
/**
* Save the Node to persistent storage
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalBuilderService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,8 +23,8 @@
//$Id$
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.internal.AbstractService;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.SignalBuilder;
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/SignalService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,8 +27,8 @@
import java.util.HashSet;
import java.util.Set;
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.internal.AbstractService;
import org.jboss.bpm.incubator.client.SignalListener;
import org.jboss.bpm.incubator.model.Signal;
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/ThreadingService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -26,9 +26,9 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.StartEvent;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.service.internal.AbstractService;
@@ -61,19 +61,19 @@
* @param start The StartEvent that triggers the process
* @param att The Attachments in the ExecutionContext
*/
- public abstract void startProcess(Process proc, StartEvent start, Attachments att);
+ public abstract void startProcess(ProcessInstance proc, StartEvent start, Attachments att);
/**
* All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
* Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends without
* timeout.
*/
- public abstract ProcessStatus waitForEnd(Process proc);
+ public abstract ProcessStatus waitForEnd(ProcessInstance proc);
/**
* All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The
* Process will be in a running state until all Tokens are consumed. <p/> This method until the process ends with a
* given timeout.
*/
- public abstract ProcessStatus waitForEnd(Process proc, long timeout);
+ public abstract ProcessStatus waitForEnd(ProcessInstance proc, long timeout);
}
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,11 +25,11 @@
import java.io.IOException;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.model.Gateway.GatewayType;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.model.builder.GatewayBuilder;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.runtime.BasicAttachments;
@@ -50,7 +50,7 @@
public void testGateA() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "5");
@@ -67,7 +67,7 @@
public void testGateB() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "15");
@@ -84,7 +84,7 @@
public void testInvalidGate() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "10");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/processengine/ProcessEngineTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,8 +23,8 @@
// $Id$
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.test.CTSTestCase;
/**
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,10 +27,10 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.api.test.ProcessCatalog;
@@ -66,7 +66,7 @@
ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
ProcessService procService = engine.getService(ProcessService.class);
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
assertNotNull("Process not null", proc);
assertNull("Process not automatically registered", procService.getProcess(proc.getKey()));
assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey()));
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,7 +25,7 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.runtime.Token;
@@ -48,7 +48,7 @@
ProcessService procService = getProcessEngine().getService(ProcessService.class);
ProcessDefinition procDef = getProcessDefinition();
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey()));
assertNull("Process not registered automatically", procService.getProcess(proc.getKey()));
@@ -74,7 +74,7 @@
ProcessService procService = getProcessEngine().getService(ProcessService.class);
ProcessDefinition procDef = getProcessDefinition();
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
assertNotNull("Token not null", token);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,9 +25,9 @@
import java.io.IOException;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.model.Task.TaskType;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.runtime.Token;
@@ -46,7 +46,7 @@
public void testBasicWaitState() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
// Start the Process
Token tok = proc.startProcess();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/endevent/EndEventMessageTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -46,7 +46,7 @@
public void testStart() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the process
BasicAttachments att = new BasicAttachments();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -47,7 +47,7 @@
public void testMerge() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the process
proc.startProcessAsync();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -46,7 +46,7 @@
public void testSimpleMerge() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the process
proc.startProcessAsync();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -49,7 +49,7 @@
public void testGateA() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "5");
@@ -63,7 +63,7 @@
public void testGateB() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "15");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewayMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
@@ -50,7 +50,7 @@
public void testParallelMerge() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the process
proc.startProcessAsync();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/gateway/parallel/ParallelGatewaySplitTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -32,7 +32,7 @@
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.Signal.SignalType;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -49,7 +49,7 @@
public void testParallelSplit() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd(5000);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeInputSetTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -51,7 +51,7 @@
public void testValidProps() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("frog", "kermit");
@@ -66,7 +66,7 @@
public void testInvalidProps() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("pig", "piggy");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodeOutputSetTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -29,7 +29,7 @@
import org.jboss.bpm.api.model.Event.EventDetailType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -51,7 +51,7 @@
public void testValidProps() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd(5000);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/node/NodePropertyTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
@@ -52,7 +52,7 @@
public void testActivityPropertyRead() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd(5000);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/process/ProcessPropertyTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
@@ -57,7 +57,7 @@
public void testProcessProperties() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd(5000);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -35,7 +35,7 @@
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Signal;
@@ -64,7 +64,7 @@
procDefService.registerProcessDefinition(procDef);
ObjectName procDefID = procDef.getKey();
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
try
{
proc.startProcessAsync();
@@ -82,7 +82,7 @@
// Get the just started process
ProcessService procService = getProcessEngine().getService(ProcessService.class);
Set<ObjectName> procIDs = procService.getProcesses(procDefID, null);
- proc = (ProcessExt) procService.getProcess(procIDs.iterator().next());
+ proc = (ProcessInstanceExt) procService.getProcess(procIDs.iterator().next());
// Wait for the process to end
if (proc != null)
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/java/JavaTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
import org.jboss.bpm.incubator.model.builder.TaskBuilder;
@@ -49,7 +49,7 @@
public void testExecutionHandler() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd(5000);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -26,7 +26,7 @@
import java.io.IOException;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Event.EventDetailType;
import org.jboss.bpm.api.model.Task.TaskType;
@@ -34,7 +34,7 @@
import org.jboss.bpm.api.service.ProcessDefinitionService;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Signal;
@@ -74,7 +74,7 @@
public void testUnregisteredProcess() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
MessageService msgService = MessageService.locateMessageService();
try
@@ -94,7 +94,7 @@
ProcessService procService = getProcessEngine().getService(ProcessService.class);
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
proc = procService.registerProcess(proc);
try
@@ -103,7 +103,7 @@
MessageService msgService = MessageService.locateMessageService();
msgService.sendMessage(proc.getKey(), "TaskA", getMessage());
- ProcessExt procExt = (ProcessExt)proc;
+ ProcessInstanceExt procExt = (ProcessInstanceExt)proc;
procExt.startProcessAsync();
procExt.waitForEnd(5000);
}
@@ -120,7 +120,7 @@
public void testSuspendedToken() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- final ProcessExt proc = (ProcessExt)procDef.newInstance();
+ final ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
SignalListener sigListener = new SignalListener()
{
private boolean sendMessage = true;
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/send/SendTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -32,7 +32,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -48,7 +48,7 @@
public void testSendTask() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "bar");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskCallbackTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.UserTaskCallback;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.UserTask;
@@ -50,7 +50,7 @@
public void testUserTask() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Attach the callback to the UserTask
UserTask userTask = proc.getNode(UserTask.class, "UserTask");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -38,7 +38,7 @@
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.MessageListener;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -58,7 +58,7 @@
public void testUserTask() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Register the process - this assigns the procID
ProcessService procService = getProcessEngine().getService(ProcessService.class);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/transaction/TxRequiredTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -35,7 +35,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Group;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.NodeExt;
@@ -66,7 +66,7 @@
assertSame("Group same", group, groupA);
assertSame("Group same", group, groupB);
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd();
@@ -78,7 +78,7 @@
public void testRollback() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment(Boolean.class, "rollback", Boolean.TRUE);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -49,7 +49,7 @@
public void testGateA() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "5");
@@ -64,7 +64,7 @@
public void testGateB() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "15");
@@ -79,7 +79,7 @@
public void testInvalidGate() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "10");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/multichoice/MultiChoiceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -49,7 +49,7 @@
public void testGateA() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "5");
@@ -63,7 +63,7 @@
public void testGateB() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
BasicAttachments att = new BasicAttachments();
att.addAttachment("foo", "15");
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/parallelsplit/ParallelSplitTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -32,7 +32,7 @@
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.Signal.SignalType;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -49,7 +49,7 @@
public void testParallelSplit() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/sequence/SequenceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -29,7 +29,7 @@
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.Signal.SignalType;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -46,7 +46,7 @@
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the Process
proc.startProcessAsync();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/simplemerge/SimpleMergeTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
@@ -46,7 +46,7 @@
public void testSimpleMerge() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the process
proc.startProcessAsync();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/control/synchronization/SynchronizationTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
@@ -50,7 +50,7 @@
public void testParallelMerge() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Start the process
proc.startProcessAsync();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/casedata/CaseDataTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
@@ -50,7 +50,7 @@
public void testCaseProperties() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/pattern/data/taskdata/TaskDataTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.test.CTSTestCase;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
@@ -51,7 +51,7 @@
public void testTaskDataRead() throws Exception
{
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
proc.startProcessAsync();
proc.waitForEnd();
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -31,7 +31,6 @@
import javax.xml.bind.Unmarshaller;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
@@ -39,6 +38,7 @@
import org.jboss.bpm.api.model.builder.GatewayBuilder;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.dialect.api10.model.JAXBCancelEventDetail;
import org.jboss.bpm.dialect.api10.model.JAXBCompensationEventDetail;
import org.jboss.bpm.dialect.api10.model.JAXBComplexGateway;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshallerExt.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -32,7 +32,6 @@
import javax.xml.bind.Unmarshaller;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
@@ -40,6 +39,7 @@
import org.jboss.bpm.api.model.builder.GatewayBuilder;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.dialect.api10.model.JAXBAssignment;
import org.jboss.bpm.dialect.api10.model.JAXBCancelEventDetail;
import org.jboss.bpm.dialect.api10.model.JAXBCompensationEventDetail;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -26,11 +26,11 @@
import java.util.List;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Task;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32Action;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32EndState;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32Event;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -36,11 +36,11 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Task;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.dialect.stp.model.Activity;
import org.jboss.bpm.dialect.stp.model.ActivityType;
import org.jboss.bpm.dialect.stp.model.BpmnDiagram;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -24,9 +24,9 @@
// $Id$
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.dialect.xpdl21.model.XPDLActivities;
import org.jboss.bpm.dialect.xpdl21.model.XPDLActivity;
import org.jboss.bpm.dialect.xpdl21.model.XPDLEvent;
Deleted: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -1,54 +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.ri.client;
-
-//$Id$
-
-import java.util.Set;
-
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.service.Service;
-import org.jboss.bpm.ri.service.MutableService;
-
-/**
- * A process engine with public access
- *
- * @author thomas.diesler at jboss.com
- * @since 18-Jun-2008
- */
-public class ProcessEngineImpl extends ProcessEngine
-{
- public void setServices(Set<Service> services)
- {
- this.services = services;
-
- // Set this engine on every mutable service
- for (Service service : services)
- {
- if (service instanceof MutableService)
- {
- MutableService mutService = (MutableService)service;
- mutService.setProcessEngine(this);
- }
- }
- }
-}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/AbstractElementImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -29,10 +29,11 @@
import javax.persistence.MappedSuperclass;
import org.hibernate.Session;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.model.AbstractElement;
-import org.jboss.bpm.api.model.Process;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.service.ProcessEngine;
/**
* The parrent of all Elements
@@ -47,7 +48,7 @@
@Id @GeneratedValue
protected Integer id;
-
+
// Persistence ctor
protected AbstractElementImpl()
{
@@ -61,6 +62,12 @@
@Override
public abstract ObjectName getKey();
+ @Override
+ public ProcessEngine getProcessEngine()
+ {
+ throw new NotImplementedException();
+ }
+
/** Initializes the persistent object */
public void initialize(ProcessEngine engine, Session session)
{
@@ -87,22 +94,22 @@
// nothing to do
}
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
// nothing to do
}
- protected void register(Process proc)
+ protected void register(ProcessInstance proc)
{
// nothing to do
}
- protected void unregister(Process proc)
+ protected void unregister(ProcessInstance proc)
{
// nothing to do
}
- protected void destroy(Process proc)
+ protected void destroy(ProcessInstance proc)
{
// nothing to do
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EndEventImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -28,13 +28,13 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.EndEventExt;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.runtime.FlowHandler;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/EventImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -32,13 +32,13 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.EventExt;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Signal;
@@ -213,7 +213,7 @@
}
@Override
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
super.create(proc);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/GatewayImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -34,7 +34,6 @@
import javax.persistence.Transient;
import org.jboss.bpm.api.Constants;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.model.ProcessStructure;
@@ -42,6 +41,7 @@
import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.runtime.ExecutionHandler;
import org.jboss.bpm.incubator.runtime.SignalHandler;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/NodeImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -43,16 +43,16 @@
import org.hibernate.annotations.IndexColumn;
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.NameNotUniqueException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.EndEvent;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.StartEvent;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Group;
import org.jboss.bpm.incubator.model.NodeExt;
@@ -131,8 +131,8 @@
@ManyToOne(targetEntity = ProcessDefinitionImpl.class)
private ProcessDefinition procDef;
- @ManyToOne(targetEntity = ProcessImpl.class)
- private Process proc;
+ @ManyToOne(targetEntity = ProcessInstanceImpl.class)
+ private ProcessInstance proc;
@ManyToOne(targetEntity = GroupImpl.class)
private Group groupRef;
@@ -155,7 +155,7 @@
}
@Override
- public Process getProcess()
+ public ProcessInstance getProcess()
{
return proc;
}
@@ -399,7 +399,7 @@
}
@Override
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
super.create(proc);
this.proc = proc;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessDefinitionImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -42,11 +42,11 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.jboss.bpm.api.Constants;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Group;
import org.jboss.bpm.incubator.model.Message;
@@ -116,7 +116,7 @@
}
@Override
- public Process newInstance()
+ public ProcessInstance newInstance()
{
// Create a copy of the process structure from raw data
ProcessStructureImpl procStructCopy;
@@ -131,7 +131,7 @@
throw new IllegalStateException("Cannot deserialize process", ex);
}
- ProcessImpl procImpl = new ProcessImpl(getProcessEngine(), this, procStructCopy);
+ ProcessInstanceImpl procImpl = new ProcessInstanceImpl(getProcessEngine(), this, procStructCopy);
return procImpl;
}
Deleted: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -1,498 +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.ri.model;
-
-//$Id$
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.ObjectName;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Transient;
-
-import org.hibernate.Hibernate;
-import org.hibernate.Session;
-import org.jboss.bpm.api.Constants;
-import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
-import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.StartEvent;
-import org.jboss.bpm.api.model.Event.EventDetailType;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
-import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.runtime.Token.TokenStatus;
-import org.jboss.bpm.api.service.ProcessService;
-import org.jboss.bpm.incubator.client.ProcessExt;
-import org.jboss.bpm.incubator.model.Assignment;
-import org.jboss.bpm.incubator.model.Group;
-import org.jboss.bpm.incubator.model.Message;
-import org.jboss.bpm.incubator.model.ProcessStructureExt;
-import org.jboss.bpm.incubator.model.Property;
-import org.jboss.bpm.incubator.model.StartEventExt;
-import org.jboss.bpm.incubator.service.ThreadingService;
-import org.jboss.bpm.ri.runtime.TokenImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A Process is any Activity performed within a company or organization.
- *
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at Entity(name = "BPMProcess")
-public class ProcessImpl extends AbstractElementImpl implements ProcessExt, ProcessStructureExt
-{
- private static final long serialVersionUID = 1L;
-
- // provide logging
- final static Logger log = LoggerFactory.getLogger(ProcessImpl.class);
-
- @Enumerated(EnumType.STRING)
- private ProcessStatus status = ProcessStatus.None;
-
- @ManyToOne(targetEntity = ProcessDefinitionImpl.class)
- private ProcessDefinitionImpl procDef;
-
- @OneToOne(cascade = { CascadeType.ALL }, targetEntity = ProcessStructureImpl.class)
- private ProcessStructureImpl procStruct;
-
- @Basic
- private Date startDate;
-
- @Basic
- private Date endDate;
-
- @Transient
- private Token rootToken;
-
- @Transient
- private transient RuntimeException runtimeException;
-
- public ProcessImpl(ProcessEngine engine, ProcessDefinitionImpl procDef, ProcessStructureImpl procStruct)
- {
- super();
- this.procStruct = procStruct;
- this.procDef = procDef;
- create(this);
- }
-
- // Persistence ctor
- protected ProcessImpl()
- {
- }
-
- @Override
- @Transient
- public ObjectName getKey()
- {
- StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
- str.append("type=Process,name=" + getName() + ",id=" + getId());
- ObjectName oname = ObjectNameFactory.create(str.toString());
- return oname;
- }
-
- @Override
- public ProcessEngine getProcessEngine()
- {
- return procDef.getProcessEngine();
- }
-
- @Override
- public ProcessDefinition getProcessDefinition()
- {
- return procDef;
- }
-
- public ProcessStatus getProcessStatus()
- {
- return status;
- }
-
- public void setProcessStatus(ProcessStatus status)
- {
- this.status = status;
- }
-
- @Override
- public void suspend()
- {
- if (status != ProcessStatus.Active)
- throw new IllegalStateException("Cannot suspend a process in state: " + status);
-
- status = ProcessStatus.Suspended;
- }
-
- @Override
- public void resume()
- {
- if (status != ProcessStatus.Suspended)
- throw new IllegalStateException("Cannot resume a process in state: " + status);
-
- status = ProcessStatus.Active;
- }
-
- @Override
- public void cancel()
- {
- if (status != ProcessStatus.Active && status != ProcessStatus.Suspended)
- throw new IllegalStateException("Cannot cancel a process in state: " + status);
-
- status = ProcessStatus.Cancelled;
- endDate = new Date();
- }
-
- public Date getStartDate()
- {
- return startDate;
- }
-
- public void setStartDate(Date startDate)
- {
- this.startDate = startDate;
- }
-
- public Date getEndDate()
- {
- return endDate;
- }
-
- public void setEndDate(Date endDate)
- {
- this.endDate = endDate;
- }
-
- @Override
- public Token getRootToken()
- {
- return rootToken;
- }
-
- @Override
- public Set<Token> getTokens()
- {
- return getAllTokens(rootToken);
- }
-
- private Set<Token> getAllTokens(Token token)
- {
- Set<Token> tokens = new HashSet<Token>();
- if (token != null)
- {
- tokens.add(token);
- for (Token childToken : token.getChildTokens())
- tokens.addAll(getAllTokens(childToken));
- }
- return tokens;
- }
-
- @Override
- public List<Assignment> getAssignments()
- {
- return procStruct.getAssignments();
- }
-
- @Override
- public Message getMessage(String msgName)
- {
- return procStruct.getMessage(msgName);
- }
-
- @Override
- public List<Message> getMessages()
- {
- return procStruct.getMessages();
- }
-
- @Override
- public String getName()
- {
- return procStruct.getName();
- }
-
- @Override
- public <T extends Node> T getNode(Class<T> clazz, String name)
- {
- return procStruct.getNode(clazz, name);
- }
-
- @Override
- public Node getNode(String name)
- {
- return procStruct.getNode(name);
- }
-
- @Override
- public List<Node> getNodes()
- {
- return procStruct.getNodes();
- }
-
- @Override
- public <T extends Node> List<T> getNodes(Class<T> clazz)
- {
- return procStruct.getNodes(clazz);
- }
-
- @Override
- public Group getGroup(String grpName)
- {
- return procStruct.getGroup(grpName);
- }
-
- @Override
- public List<Group> getGroups()
- {
- return procStruct.getGroups();
- }
-
- @Override
- public Property getProperty(String name)
- {
- return procStruct.getProperty(name);
- }
-
- @Override
- public Set<Property> getProperties()
- {
- return procStruct.getProperties();
- }
-
- @Override
- public Set<String> getPropertyNames()
- {
- return procStruct.getPropertyNames();
- }
-
- @Override
- public void addProperty(Property prop)
- {
- procStruct.addProperty(prop);
- }
-
- @Override
- public void addProperty(String name, Object value)
- {
- procStruct.addProperty(name, value);
- }
-
- @Override
- public Property removeProperty(String name)
- {
- return procStruct.removeProperty(name);
- }
-
- public RuntimeException getRuntimeException()
- {
- return runtimeException;
- }
-
- public void setRuntimeException(RuntimeException rte)
- {
- this.runtimeException = rte;
- setProcessStatus(ProcessStatus.Aborted);
- }
-
- @Override
- public Token startProcess()
- {
- rootToken = startProcessInternal(null);
- return rootToken;
- }
-
- @Override
- public Token startProcess(Attachments att)
- {
- rootToken = startProcessInternal(att);
- return rootToken;
- }
-
- private Token startProcessInternal(Attachments att)
- {
- @SuppressWarnings("serial")
- class InitialFlow extends SequenceFlowImpl
- {
- InitialFlow(StartEvent start)
- {
- super(start.getName());
- }
- }
-
- // Prepare the process to start
- StartEvent start = prepareProcessStart();
- setProcessStatus(ProcessStatus.Active);
-
- // Setup the initial token
- TokenImpl token = new TokenImpl(this, att);
- token.setLastFlow(new InitialFlow(start));
- token.setTokenStatus(TokenStatus.Started);
-
- // Signal the initial token
- token.signal();
-
- return token;
- }
-
- public ObjectName startProcessAsync()
- {
- return startProcessAsyncInternal(null);
- }
-
- public ObjectName startProcessAsync(Attachments att)
- {
- return startProcessAsyncInternal(att);
- }
-
- private ObjectName startProcessAsyncInternal(Attachments att)
- {
- // Prepare the process to start
- StartEvent start = prepareProcessStart();
-
- ProcessEngine engine = getProcessEngine();
- ThreadingService exService = engine.getService(ThreadingService.class);
- try
- {
- exService.startProcess(this, start, att);
- return getKey();
- }
- catch (RuntimeException rte)
- {
- // A process that cannot be started id unregistered automatically
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- procService.unregisterProcess(getKey());
- throw rte;
- }
- }
-
- private StartEvent prepareProcessStart()
- {
- // Veriy the process state
- ProcessStatus procStatus = getProcessStatus();
- if (procStatus != ProcessStatus.None && procStatus != ProcessStatus.Ready)
- throw new IllegalStateException("Cannot start process in state: " + procStatus);
-
- // Get the None Start Event if there is one and start the initial flow
- StartEvent start = null;
- for (StartEvent aux : getNodes(StartEvent.class))
- {
- StartEventExt startExt = (StartEventExt)aux;
- if (startExt.getTriggerType() == EventDetailType.None)
- {
- if (start != null)
- throw new InvalidProcessException("Process cannot have multiple start events with no trigger");
- start = aux;
- }
- }
- if (start == null)
- {
- List<StartEvent> startEvents = getNodes(StartEvent.class);
- throw new IllegalStateException("Cannot obtain StartEvent of type 'None' to start the process explicitly: " + startEvents);
- }
-
- // Register the process if needed
- ProcessEngine engine = getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
- if (procService.getProcess(getKey()) == null)
- procService.registerProcess(this);
-
- return start;
- }
-
-
- public ProcessStatus waitForEnd()
- {
- return waitForEndInternal(0);
- }
-
- public ProcessStatus waitForEnd(long timeout)
- {
- return waitForEndInternal(timeout);
- }
-
- /**
- * Wait for the Process to end. All Tokens that are generated at the Start Event for that Process must eventually
- * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was
- * aborted this method throws the causing RuntimeException if avaialable.
- */
- private ProcessStatus waitForEndInternal(long timeout)
- {
- ProcessEngine engine = getProcessEngine();
- ThreadingService exService = engine.getService(ThreadingService.class);
- return exService.waitForEnd(this, timeout);
- }
-
- @Override
- public void initialize(ProcessEngine engine, Session session)
- {
- super.initialize(engine, session);
-
- Hibernate.initialize(this);
- procDef.initialize(engine, session);
- procStruct.initialize(engine, session);
- }
-
- @Override
- protected void create(Process proc)
- {
- super.create(proc);
- procStruct.create(proc);
- startDate = new Date();
- }
-
- @Override
- public void register(Process proc)
- {
- super.register(proc);
- procStruct.register(proc);
- }
-
- @Override
- public void unregister(Process proc)
- {
- super.unregister(proc);
- procStruct.unregister(proc);
- }
-
- @Override
- protected void destroy(Process proc)
- {
- super.destroy(proc);
- procStruct.destroy(proc);
- }
-
- public String toString()
- {
- return "Process[" + getName() + ",status=" + getProcessStatus() + "]";
- }
-}
\ No newline at end of file
Copied: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java (from rev 3233, projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessImpl.java)
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java (rev 0)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,498 @@
+/*
+ * 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.ri.model;
+
+//$Id$
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.ObjectName;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+
+import org.hibernate.Hibernate;
+import org.hibernate.Session;
+import org.jboss.bpm.api.Constants;
+import org.jboss.bpm.api.InvalidProcessException;
+import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.model.StartEvent;
+import org.jboss.bpm.api.model.Event.EventDetailType;
+import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.runtime.Attachments;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.runtime.Token.TokenStatus;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
+import org.jboss.bpm.incubator.model.Assignment;
+import org.jboss.bpm.incubator.model.Group;
+import org.jboss.bpm.incubator.model.Message;
+import org.jboss.bpm.incubator.model.ProcessStructureExt;
+import org.jboss.bpm.incubator.model.Property;
+import org.jboss.bpm.incubator.model.StartEventExt;
+import org.jboss.bpm.incubator.service.ThreadingService;
+import org.jboss.bpm.ri.runtime.TokenImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A Process is any Activity performed within a company or organization.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at Entity(name = "BPMProcessInstance")
+public class ProcessInstanceImpl extends AbstractElementImpl implements ProcessInstanceExt, ProcessStructureExt
+{
+ private static final long serialVersionUID = 1L;
+
+ // provide logging
+ final static Logger log = LoggerFactory.getLogger(ProcessInstanceImpl.class);
+
+ @Enumerated(EnumType.STRING)
+ private ProcessStatus status = ProcessStatus.None;
+
+ @ManyToOne(targetEntity = ProcessDefinitionImpl.class)
+ private ProcessDefinitionImpl procDef;
+
+ @OneToOne(cascade = { CascadeType.ALL }, targetEntity = ProcessStructureImpl.class)
+ private ProcessStructureImpl procStruct;
+
+ @Basic
+ private Date startDate;
+
+ @Basic
+ private Date endDate;
+
+ @Transient
+ private Token rootToken;
+
+ @Transient
+ private transient RuntimeException runtimeException;
+
+ public ProcessInstanceImpl(ProcessEngine engine, ProcessDefinitionImpl procDef, ProcessStructureImpl procStruct)
+ {
+ super();
+ this.procStruct = procStruct;
+ this.procDef = procDef;
+ create(this);
+ }
+
+ // Persistence ctor
+ protected ProcessInstanceImpl()
+ {
+ }
+
+ @Override
+ @Transient
+ public ObjectName getKey()
+ {
+ StringBuilder str = new StringBuilder(Constants.ID_DOMAIN + ":");
+ str.append("type=Process,name=" + getName() + ",id=" + getId());
+ ObjectName oname = ObjectNameFactory.create(str.toString());
+ return oname;
+ }
+
+ @Override
+ public ProcessEngine getProcessEngine()
+ {
+ return procDef.getProcessEngine();
+ }
+
+ @Override
+ public ProcessDefinition getProcessDefinition()
+ {
+ return procDef;
+ }
+
+ public ProcessStatus getProcessStatus()
+ {
+ return status;
+ }
+
+ public void setProcessStatus(ProcessStatus status)
+ {
+ this.status = status;
+ }
+
+ @Override
+ public void suspend()
+ {
+ if (status != ProcessStatus.Active)
+ throw new IllegalStateException("Cannot suspend a process in state: " + status);
+
+ status = ProcessStatus.Suspended;
+ }
+
+ @Override
+ public void resume()
+ {
+ if (status != ProcessStatus.Suspended)
+ throw new IllegalStateException("Cannot resume a process in state: " + status);
+
+ status = ProcessStatus.Active;
+ }
+
+ @Override
+ public void cancel()
+ {
+ if (status != ProcessStatus.Active && status != ProcessStatus.Suspended)
+ throw new IllegalStateException("Cannot cancel a process in state: " + status);
+
+ status = ProcessStatus.Cancelled;
+ endDate = new Date();
+ }
+
+ public Date getStartDate()
+ {
+ return startDate;
+ }
+
+ public void setStartDate(Date startDate)
+ {
+ this.startDate = startDate;
+ }
+
+ public Date getEndDate()
+ {
+ return endDate;
+ }
+
+ public void setEndDate(Date endDate)
+ {
+ this.endDate = endDate;
+ }
+
+ @Override
+ public Token getRootToken()
+ {
+ return rootToken;
+ }
+
+ @Override
+ public Set<Token> getTokens()
+ {
+ return getAllTokens(rootToken);
+ }
+
+ private Set<Token> getAllTokens(Token token)
+ {
+ Set<Token> tokens = new HashSet<Token>();
+ if (token != null)
+ {
+ tokens.add(token);
+ for (Token childToken : token.getChildTokens())
+ tokens.addAll(getAllTokens(childToken));
+ }
+ return tokens;
+ }
+
+ @Override
+ public List<Assignment> getAssignments()
+ {
+ return procStruct.getAssignments();
+ }
+
+ @Override
+ public Message getMessage(String msgName)
+ {
+ return procStruct.getMessage(msgName);
+ }
+
+ @Override
+ public List<Message> getMessages()
+ {
+ return procStruct.getMessages();
+ }
+
+ @Override
+ public String getName()
+ {
+ return procStruct.getName();
+ }
+
+ @Override
+ public <T extends Node> T getNode(Class<T> clazz, String name)
+ {
+ return procStruct.getNode(clazz, name);
+ }
+
+ @Override
+ public Node getNode(String name)
+ {
+ return procStruct.getNode(name);
+ }
+
+ @Override
+ public List<Node> getNodes()
+ {
+ return procStruct.getNodes();
+ }
+
+ @Override
+ public <T extends Node> List<T> getNodes(Class<T> clazz)
+ {
+ return procStruct.getNodes(clazz);
+ }
+
+ @Override
+ public Group getGroup(String grpName)
+ {
+ return procStruct.getGroup(grpName);
+ }
+
+ @Override
+ public List<Group> getGroups()
+ {
+ return procStruct.getGroups();
+ }
+
+ @Override
+ public Property getProperty(String name)
+ {
+ return procStruct.getProperty(name);
+ }
+
+ @Override
+ public Set<Property> getProperties()
+ {
+ return procStruct.getProperties();
+ }
+
+ @Override
+ public Set<String> getPropertyNames()
+ {
+ return procStruct.getPropertyNames();
+ }
+
+ @Override
+ public void addProperty(Property prop)
+ {
+ procStruct.addProperty(prop);
+ }
+
+ @Override
+ public void addProperty(String name, Object value)
+ {
+ procStruct.addProperty(name, value);
+ }
+
+ @Override
+ public Property removeProperty(String name)
+ {
+ return procStruct.removeProperty(name);
+ }
+
+ public RuntimeException getRuntimeException()
+ {
+ return runtimeException;
+ }
+
+ public void setRuntimeException(RuntimeException rte)
+ {
+ this.runtimeException = rte;
+ setProcessStatus(ProcessStatus.Aborted);
+ }
+
+ @Override
+ public Token startProcess()
+ {
+ rootToken = startProcessInternal(null);
+ return rootToken;
+ }
+
+ @Override
+ public Token startProcess(Attachments att)
+ {
+ rootToken = startProcessInternal(att);
+ return rootToken;
+ }
+
+ private Token startProcessInternal(Attachments att)
+ {
+ @SuppressWarnings("serial")
+ class InitialFlow extends SequenceFlowImpl
+ {
+ InitialFlow(StartEvent start)
+ {
+ super(start.getName());
+ }
+ }
+
+ // Prepare the process to start
+ StartEvent start = prepareProcessStart();
+ setProcessStatus(ProcessStatus.Active);
+
+ // Setup the initial token
+ TokenImpl token = new TokenImpl(this, att);
+ token.setLastFlow(new InitialFlow(start));
+ token.setTokenStatus(TokenStatus.Started);
+
+ // Signal the initial token
+ token.signal();
+
+ return token;
+ }
+
+ public ObjectName startProcessAsync()
+ {
+ return startProcessAsyncInternal(null);
+ }
+
+ public ObjectName startProcessAsync(Attachments att)
+ {
+ return startProcessAsyncInternal(att);
+ }
+
+ private ObjectName startProcessAsyncInternal(Attachments att)
+ {
+ // Prepare the process to start
+ StartEvent start = prepareProcessStart();
+
+ ProcessEngine engine = getProcessEngine();
+ ThreadingService exService = engine.getService(ThreadingService.class);
+ try
+ {
+ exService.startProcess(this, start, att);
+ return getKey();
+ }
+ catch (RuntimeException rte)
+ {
+ // A process that cannot be started id unregistered automatically
+ ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ procService.unregisterProcess(getKey());
+ throw rte;
+ }
+ }
+
+ private StartEvent prepareProcessStart()
+ {
+ // Veriy the process state
+ ProcessStatus procStatus = getProcessStatus();
+ if (procStatus != ProcessStatus.None && procStatus != ProcessStatus.Ready)
+ throw new IllegalStateException("Cannot start process in state: " + procStatus);
+
+ // Get the None Start Event if there is one and start the initial flow
+ StartEvent start = null;
+ for (StartEvent aux : getNodes(StartEvent.class))
+ {
+ StartEventExt startExt = (StartEventExt)aux;
+ if (startExt.getTriggerType() == EventDetailType.None)
+ {
+ if (start != null)
+ throw new InvalidProcessException("Process cannot have multiple start events with no trigger");
+ start = aux;
+ }
+ }
+ if (start == null)
+ {
+ List<StartEvent> startEvents = getNodes(StartEvent.class);
+ throw new IllegalStateException("Cannot obtain StartEvent of type 'None' to start the process explicitly: " + startEvents);
+ }
+
+ // Register the process if needed
+ ProcessEngine engine = getProcessEngine();
+ ProcessService procService = engine.getService(ProcessService.class);
+ if (procService.getProcess(getKey()) == null)
+ procService.registerProcess(this);
+
+ return start;
+ }
+
+
+ public ProcessStatus waitForEnd()
+ {
+ return waitForEndInternal(0);
+ }
+
+ public ProcessStatus waitForEnd(long timeout)
+ {
+ return waitForEndInternal(timeout);
+ }
+
+ /**
+ * Wait for the Process to end. All Tokens that are generated at the Start Event for that Process must eventually
+ * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was
+ * aborted this method throws the causing RuntimeException if avaialable.
+ */
+ private ProcessStatus waitForEndInternal(long timeout)
+ {
+ ProcessEngine engine = getProcessEngine();
+ ThreadingService exService = engine.getService(ThreadingService.class);
+ return exService.waitForEnd(this, timeout);
+ }
+
+ @Override
+ public void initialize(ProcessEngine engine, Session session)
+ {
+ super.initialize(engine, session);
+
+ Hibernate.initialize(this);
+ procDef.initialize(engine, session);
+ procStruct.initialize(engine, session);
+ }
+
+ @Override
+ protected void create(ProcessInstance proc)
+ {
+ super.create(proc);
+ procStruct.create(proc);
+ startDate = new Date();
+ }
+
+ @Override
+ public void register(ProcessInstance proc)
+ {
+ super.register(proc);
+ procStruct.register(proc);
+ }
+
+ @Override
+ public void unregister(ProcessInstance proc)
+ {
+ super.unregister(proc);
+ procStruct.unregister(proc);
+ }
+
+ @Override
+ protected void destroy(ProcessInstance proc)
+ {
+ super.destroy(proc);
+ procStruct.destroy(proc);
+ }
+
+ public String toString()
+ {
+ return "Process[" + getName() + ",status=" + getProcessStatus() + "]";
+ }
+}
\ No newline at end of file
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessStructureImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -41,13 +41,13 @@
import org.hibernate.annotations.IndexColumn;
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.EndEvent;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.StartEvent;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Group;
import org.jboss.bpm.incubator.model.Message;
@@ -360,7 +360,7 @@
}
@Override
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
super.create(proc);
for (Node node : getNodes())
@@ -371,7 +371,7 @@
}
@Override
- protected void register(Process proc)
+ protected void register(ProcessInstance proc)
{
super.register(proc);
for (Node node : getNodes())
@@ -382,7 +382,7 @@
}
@Override
- protected void unregister(Process proc)
+ protected void unregister(ProcessInstance proc)
{
super.unregister(proc);
for (Node node : getNodes())
@@ -393,7 +393,7 @@
}
@Override
- protected void destroy(Process proc)
+ protected void destroy(ProcessInstance proc)
{
super.destroy(proc);
for (Node node : getNodes())
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ReceiveTaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.runtime.Attachments;
@@ -165,7 +165,7 @@
}
@Override
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
super.create(proc);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/SendTaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -28,7 +28,7 @@
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.runtime.Token;
@@ -119,7 +119,7 @@
}
@Override
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
super.create(proc);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/StartEventImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -29,15 +29,15 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.StartEvent;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.client.SignalListener;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.StartEventExt;
@@ -191,7 +191,7 @@
// There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event.
// That is, a Process Instance SHALL be generated when the Start Event is triggered.
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
StartEvent startEvent = proc.getNode(StartEvent.class, startEventName);
ThreadingService execService = engine.getService(ThreadingService.class);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/TaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -39,7 +39,6 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.InvalidProcessException;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Expression;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.model.ProcessStructure;
@@ -47,6 +46,7 @@
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.InputSet;
import org.jboss.bpm.incubator.model.OutputSet;
import org.jboss.bpm.incubator.model.Property;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/UserTaskImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -33,7 +33,7 @@
import javax.persistence.Transient;
import org.jboss.bpm.api.InvalidProcessException;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessStructure;
import org.jboss.bpm.api.runtime.Attachments;
@@ -202,7 +202,7 @@
}
@Override
- protected void create(Process proc)
+ protected void create(ProcessInstance proc)
{
super.create(proc);
@@ -212,7 +212,7 @@
}
@Override
- protected void register(Process proc)
+ protected void register(ProcessInstance proc)
{
super.register(proc);
@@ -227,7 +227,7 @@
}
@Override
- protected void unregister(Process proc)
+ protected void unregister(ProcessInstance proc)
{
super.unregister(proc);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/builder/ProcessBuilderImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -24,14 +24,14 @@
//$Id$
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Event.EventDetailType;
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.model.Gateway.GatewayType;
import org.jboss.bpm.api.model.Task.TaskType;
import org.jboss.bpm.api.model.builder.GatewayBuilder;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.Group.GroupType;
import org.jboss.bpm.incubator.model.builder.EventBuilder;
@@ -64,7 +64,7 @@
import org.jboss.bpm.ri.model.WaitStateImpl;
/**
- * The ProcessBuilder can be used to dynamically build a {@link Process}.
+ * The ProcessBuilder can be used to dynamically build a {@link ProcessInstance}.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingAttachments.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -29,14 +29,14 @@
import java.util.Map;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.incubator.model.NodeExt;
import org.jboss.bpm.incubator.model.ProcessDefinitionExt;
import org.jboss.bpm.incubator.model.Property;
/**
- * An ExecutionContext that delegates to the current {@link Node} or {@link Process} for property rerieval.
+ * An ExecutionContext that delegates to the current {@link Node} or {@link ProcessInstance} for property rerieval.
*
* @author Thomas.Diesler at jboss.com
* @since 15-Aug-2008
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -28,12 +28,12 @@
import javax.management.ObjectName;
import org.hibernate.Session;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.NodeExt;
/**
@@ -93,7 +93,7 @@
}
@Override
- public Process getProcess()
+ public ProcessInstance getProcess()
{
return delegateToken.getProcess();
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/InProcessTokenExecutor.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
@@ -43,9 +43,9 @@
final static Logger log = LoggerFactory.getLogger(InProcessTokenExecutor.class);
@SuppressWarnings("unused")
- private Process proc;
+ private ProcessInstance proc;
- public InProcessTokenExecutor(Process proc)
+ public InProcessTokenExecutor(ProcessInstance proc)
{
this.proc = proc;
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/MessageSender.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,10 +25,10 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Participant;
import org.jboss.bpm.incubator.model.Property;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/PersistenceSessionInterceptor.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -24,8 +24,8 @@
//$Id$
import org.hibernate.Session;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -22,12 +22,12 @@
package org.jboss.bpm.ri.runtime;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
import org.jboss.bpm.api.service.ProcessService;
-import org.jboss.bpm.ri.model.ProcessImpl;
+import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.service.ProcessServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@
public void run()
{
- Process proc = rtProc.getProcess();
+ ProcessInstance proc = rtProc.getProcess();
try
{
Node node = token.getCurrentNode();
@@ -101,7 +101,7 @@
catch (RuntimeException rte)
{
log.error("Process aborted: " + proc, rte);
- ((ProcessImpl)proc).setRuntimeException(rte);
+ ((ProcessInstanceImpl)proc).setRuntimeException(rte);
log.debug("Terminate all suspended tokens");
for (Token auxToken : tokenExecutor.getRunnableTokens())
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcess.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,13 +23,13 @@
//$Id$
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.incubator.runtime.TokenExecutor;
/**
- * A RuntimeProcess add runtime behaviour to the {@link Process}
+ * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance}
* <p/>
- * To protect the engine from maligious user code it does not extend {@link Process} directly.
+ * To protect the engine from maligious user code it does not extend {@link ProcessInstance} directly.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
@@ -37,12 +37,12 @@
public interface RuntimeProcess
{
/**
- * Get the associated {@link Process}
+ * Get the associated {@link ProcessInstance}
*/
- Process getProcess();
+ ProcessInstance getProcess();
/**
- * Get the {@link TokenExecutor} for this {@link Process}
+ * Get the {@link TokenExecutor} for this {@link ProcessInstance}
*/
ThreadingTokenExecutor getTokenExecutor();
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RuntimeProcessImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,26 +23,26 @@
//$Id$
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
/**
- * A RuntimeProcess add runtime behaviour to the {@link Process}
+ * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance}
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
public class RuntimeProcessImpl implements RuntimeProcess
{
- private Process proc;
+ private ProcessInstance proc;
private ThreadingTokenExecutor tokenExecutor;
- public RuntimeProcessImpl(Process proc)
+ public RuntimeProcessImpl(ProcessInstance proc)
{
this.proc = proc;
this.tokenExecutor = new ThreadingTokenExecutor(this);
}
- public Process getProcess()
+ public ProcessInstance getProcess()
{
return proc;
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ThreadingTokenExecutor.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -34,7 +34,7 @@
import javax.management.ObjectName;
import org.jboss.bpm.api.model.SequenceFlow;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Token.TokenStatus;
import org.jboss.bpm.incubator.runtime.FlowHandler;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -32,20 +32,20 @@
import org.hibernate.Session;
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.WaitState;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.runtime.Attachments.Key;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.incubator.runtime.TokenExecutor;
-import org.jboss.bpm.ri.model.ProcessImpl;
+import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.service.ProcessServiceImpl;
import org.jboss.util.id.UID;
@@ -67,7 +67,7 @@
private SequenceFlow flow;
private Attachments att;
private TokenStatus status;
- private Process proc;
+ private ProcessInstance proc;
private Session session;
private Token parentToken;
@@ -76,7 +76,7 @@
/**
* Construct a Token with given {@link Attachments}
*/
- public TokenImpl(Process proc, Attachments att)
+ public TokenImpl(ProcessInstance proc, Attachments att)
{
this.att = new BasicAttachments(att);
this.key = ObjectNameFactory.create(Constants.ID_DOMAIN + ":id=" + new UID());
@@ -109,7 +109,7 @@
}
@Override
- public Process getProcess()
+ public ProcessInstance getProcess()
{
return proc;
}
@@ -228,7 +228,7 @@
}
catch (RuntimeException rte)
{
- ProcessImpl procImpl = (ProcessImpl)getProcess();
+ ProcessInstanceImpl procImpl = (ProcessInstanceImpl)getProcess();
procImpl.setRuntimeException(rte);
procImpl.setProcessStatus(ProcessStatus.Aborted);
throw rte;
@@ -237,7 +237,7 @@
// Set Process to completed
if (getRootToken().getTokenStatus() == TokenStatus.Destroyed)
{
- ProcessImpl procImpl = (ProcessImpl)getProcess();
+ ProcessInstanceImpl procImpl = (ProcessInstanceImpl)getProcess();
procImpl.setProcessStatus(ProcessStatus.Completed);
}
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -28,8 +28,8 @@
import org.jboss.bpm.api.Constants;
import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.Constants.TxType;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Group;
import org.jboss.bpm.incubator.model.NodeExt;
import org.jboss.bpm.incubator.model.Property;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/DialectHandlerServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -26,8 +26,8 @@
import java.net.URI;
import java.util.Map;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.service.DialectHandler;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.internal.AbstractDialectHandlerService;
/**
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/HibernatePersistenceServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -36,15 +36,15 @@
import org.hibernate.cfg.AnnotationConfiguration;
import org.jboss.bpm.api.NodeNotFoundException;
import org.jboss.bpm.api.ProcessNotFoundException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.Service;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.jboss.bpm.ri.model.AbstractElementImpl;
import org.jboss.bpm.ri.model.ProcessDefinitionImpl;
-import org.jboss.bpm.ri.model.ProcessImpl;
+import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -151,7 +151,7 @@
}
@Override
- public ObjectName saveProcess(Process proc)
+ public ObjectName saveProcess(ProcessInstance proc)
{
log.debug("START saveProcess: " + proc.getKey());
Session session = getSessionFactory().openSession();
@@ -170,15 +170,15 @@
}
@Override
- public Process loadProcess(ObjectName procID)
+ public ProcessInstance loadProcess(ObjectName procID)
{
log.debug("START loadProcess: " + procID);
- Process proc = null;
+ ProcessInstance proc = null;
Session session = getSessionFactory().openSession();
try
{
Integer id = Integer.valueOf(procID.getKeyProperty("id"));
- proc = (Process)session.load(ProcessImpl.class, id);
+ proc = (ProcessInstance)session.load(ProcessInstanceImpl.class, id);
AbstractElementImpl elImpl = (AbstractElementImpl)proc;
elImpl.initialize(getProcessEngine(), session);
}
@@ -195,7 +195,7 @@
}
@Override
- public void deleteProcess(Process proc)
+ public void deleteProcess(ProcessInstance proc)
{
log.debug("START deleteProcess: " + proc);
Session session = getSessionFactory().openSession();
@@ -204,7 +204,7 @@
{
ObjectName procID = proc.getKey();
Integer id = Integer.valueOf(procID.getKeyProperty("id"));
- proc = (Process)session.load(ProcessImpl.class, id);
+ proc = (ProcessInstance)session.load(ProcessInstanceImpl.class, id);
session.delete(proc);
tx.commit();
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,10 +30,10 @@
import org.hibernate.Session;
import org.jboss.bpm.api.ProcessNotFoundException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +50,7 @@
final Logger log = LoggerFactory.getLogger(InMemoryPersistenceServiceImpl.class);
private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>();
- private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>();
+ private Map<ObjectName, ProcessInstance> procs = new HashMap<ObjectName, ProcessInstance>();
private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>();
@Override
@@ -89,7 +89,7 @@
}
@Override
- public ObjectName saveProcess(Process proc)
+ public ObjectName saveProcess(ProcessInstance proc)
{
procs.put(proc.getKey(), proc);
@@ -100,9 +100,9 @@
}
@Override
- public Process loadProcess(ObjectName procID)
+ public ProcessInstance loadProcess(ObjectName procID)
{
- Process proc = procs.get(procID);
+ ProcessInstance proc = procs.get(procID);
if (proc == null)
throw new ProcessNotFoundException("Cannot find process: " + procID);
@@ -110,7 +110,7 @@
}
@Override
- public void deleteProcess(Process proc)
+ public void deleteProcess(ProcessInstance proc)
{
procs.remove(proc.getKey());
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageBuilderServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.builder.MessageBuilder;
import org.jboss.bpm.incubator.service.MessageBuilderService;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MessageServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -27,7 +27,7 @@
import javax.transaction.Synchronization;
import org.hibernate.Transaction;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.service.MessageService;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/MutableService.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.Service;
/**
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessBuilderServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,14 +23,14 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
import org.jboss.bpm.ri.model.builder.ProcessBuilderImpl;
/**
- * The ProcessBuilder can be used to build a {@link Process} dynamically.
+ * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically.
*
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,9 +30,9 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService;
import org.jboss.bpm.incubator.service.PersistenceService;
Copied: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java (from rev 3233, projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/ProcessEngineImpl.java)
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java (rev 0)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessEngineImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.ri.service;
+
+//$Id$
+
+import java.util.Set;
+
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.Service;
+
+/**
+ * A process engine with public access
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public class ProcessEngineImpl extends ProcessEngine
+{
+ public void setServices(Set<Service> services)
+ {
+ this.services = services;
+
+ // Set this engine on every mutable service
+ for (Service service : services)
+ {
+ if (service instanceof MutableService)
+ {
+ MutableService mutService = (MutableService)service;
+ mutService.setProcessEngine(this);
+ }
+ }
+ }
+}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -33,15 +33,15 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.service.internal.AbstractProcessService;
import org.jboss.bpm.incubator.service.PersistenceService;
-import org.jboss.bpm.ri.model.ProcessImpl;
+import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.runtime.NodeInterceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +57,7 @@
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class);
- private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>();
+ private Map<ObjectName, ProcessInstance> registeredProcs = new HashMap<ObjectName, ProcessInstance>();
private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>();
@Override
@@ -84,9 +84,9 @@
* Get a Process for a given id
*/
@Override
- public Process getProcess(ObjectName procID)
+ public ProcessInstance getProcess(ObjectName procID)
{
- Process proc = registeredProcs.get(procID);
+ ProcessInstance proc = registeredProcs.get(procID);
return proc;
}
@@ -110,7 +110,7 @@
public Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status)
{
Set<ObjectName> procSet = new HashSet<ObjectName>();
- for (Process auxProc : registeredProcs.values())
+ for (ProcessInstance auxProc : registeredProcs.values())
{
ObjectName auxProcDefID = auxProc.getProcessDefinition().getKey();
if (auxProcDefID.equals(procDefID))
@@ -125,7 +125,7 @@
/**
* Register a Process.
*/
- public Process registerProcess(Process proc)
+ public ProcessInstance registerProcess(ProcessInstance proc)
{
log.debug("registerProcess: " + proc);
@@ -149,7 +149,7 @@
ObjectName procID = persService.saveProcess(proc);
registeredProcs.put(procID, proc);
- ProcessImpl procImpl = (ProcessImpl)proc;
+ ProcessInstanceImpl procImpl = (ProcessInstanceImpl)proc;
procImpl.register(proc);
procImpl.setProcessStatus(ProcessStatus.Ready);
@@ -162,12 +162,12 @@
public boolean unregisterProcess(ObjectName procID)
{
boolean removed = false;
- Process proc = registeredProcs.get(procID);
+ ProcessInstance proc = registeredProcs.get(procID);
if (proc != null)
{
log.debug("unregisterProcess: " + proc);
- ProcessImpl procImpl = (ProcessImpl)proc;
+ ProcessInstanceImpl procImpl = (ProcessInstanceImpl)proc;
procImpl.unregister(procImpl);
// Delete the process through the PersistenceService
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalBuilderServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Signal;
import org.jboss.bpm.incubator.model.builder.SignalBuilder;
import org.jboss.bpm.incubator.service.SignalBuilderService;
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/SignalServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.service.SignalService;
/**
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,22 +30,22 @@
import org.jboss.bpm.api.BPMException;
import org.jboss.bpm.api.ProcessTimeoutException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Expression;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.StartEvent;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.Signal.SignalType;
import org.jboss.bpm.incubator.runtime.TokenExecutor;
import org.jboss.bpm.incubator.service.SignalService;
import org.jboss.bpm.incubator.service.ThreadingService;
-import org.jboss.bpm.ri.model.ProcessImpl;
+import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.model.SequenceFlowImpl;
import org.jboss.bpm.ri.model.SignalImpl;
import org.jboss.bpm.ri.runtime.DelegatingToken;
@@ -77,12 +77,12 @@
}
@Override
- public void startProcess(Process proc, StartEvent start, Attachments att)
+ public void startProcess(ProcessInstance proc, StartEvent start, Attachments att)
{
startProcessInternal(proc, start, att);
}
- private synchronized void startProcessInternal(Process proc, StartEvent start, Attachments att)
+ private synchronized void startProcessInternal(ProcessInstance proc, StartEvent start, Attachments att)
{
@SuppressWarnings("serial")
class InitialFlow extends SequenceFlowImpl
@@ -128,14 +128,14 @@
}
// Do the start time assignments
- startTimeAssignments((ProcessExt)proc, initialToken);
+ startTimeAssignments((ProcessInstanceExt)proc, initialToken);
// Start the initial token
tokenExecutor.start(initialToken);
}
// Evaluate the Start time assignments
- private void startTimeAssignments(ProcessExt proc, Token token)
+ private void startTimeAssignments(ProcessInstanceExt proc, Token token)
{
DelegatingToken delegatingToken = new DelegatingToken((MutableToken)token);
Attachments atts = token.getAttachments();
@@ -152,12 +152,12 @@
}
}
- public ProcessStatus waitForEnd(Process proc)
+ public ProcessStatus waitForEnd(ProcessInstance proc)
{
return waitForEndInternal(proc, 0);
}
- public ProcessStatus waitForEnd(Process proc, long timeout)
+ public ProcessStatus waitForEnd(ProcessInstance proc, long timeout)
{
return waitForEndInternal(proc, timeout);
}
@@ -167,9 +167,9 @@
* arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was
* aborted this method throws the causing RuntimeException if avaialable.
*/
- private ProcessStatus waitForEndInternal(Process proc, long timeout)
+ private ProcessStatus waitForEndInternal(ProcessInstance proc, long timeout)
{
- ProcessImpl procImpl = (ProcessImpl)proc;
+ ProcessInstanceImpl procImpl = (ProcessInstanceImpl)proc;
ProcessStatus status = proc.getProcessStatus();
if (status == ProcessStatus.None)
@@ -232,13 +232,13 @@
return status;
}
- private boolean isProcessTerminated(Process proc)
+ private boolean isProcessTerminated(ProcessInstance proc)
{
ProcessStatus status = proc.getProcessStatus();
return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted;
}
- private RuntimeProcess getRuntimeProcess(Process proc, boolean createNew)
+ private RuntimeProcess getRuntimeProcess(ProcessInstance proc, boolean createNew)
{
RuntimeProcess rtProcess;
synchronized (runtimeProcesses)
@@ -268,8 +268,8 @@
public void run()
{
ThreadingTokenExecutor tokenExecutor = rtProc.getTokenExecutor();
- ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess();
- Process proc = rtProc.getProcess();
+ ProcessInstanceImpl procImpl = (ProcessInstanceImpl)rtProc.getProcess();
+ ProcessInstance proc = rtProc.getProcess();
ProcessEngine engine = getProcessEngine();
SignalService sigService = engine.getService(SignalService.class);
Modified: projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-12-05 17:49:30 UTC (rev 3234)
@@ -2,12 +2,12 @@
xmlns="urn:jboss:bean-deployer:2.0">
<!-- Locate the single instance of the kernel -->
- <bean name="BPMKernelLocator" class="org.jboss.bpm.api.client.internal.KernelLocator">
+ <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
</bean>
<!-- The ProcessEngine -->
- <bean name="BPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
+ <bean name="BPMProcessEngine" class="org.jboss.bpm.ri.service.ProcessEngineImpl">
<property name="services">
<set elementClass="org.jboss.bpm.api.service.Service">
<inject bean="BPMDialectHandlerService" />
@@ -44,8 +44,8 @@
<value>org.jboss.bpm.ri.model.ParallelGatewayImpl</value>
<value>org.jboss.bpm.ri.model.ParticipantImpl</value>
<value>org.jboss.bpm.ri.model.ProcessDefinitionImpl</value>
+ <value>org.jboss.bpm.ri.model.ProcessInstanceImpl</value>
<value>org.jboss.bpm.ri.model.ProcessStructureImpl</value>
- <value>org.jboss.bpm.ri.model.ProcessImpl</value>
<value>org.jboss.bpm.ri.model.PropertyImpl</value>
<value>org.jboss.bpm.ri.model.PropertySupportImpl</value>
<value>org.jboss.bpm.ri.model.ReceiveTaskImpl</value>
Deleted: projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider
===================================================================
--- projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-12-05 17:49:30 UTC (rev 3234)
@@ -1 +0,0 @@
-org.jboss.bpm.api.client.internal.MicrocontainerConfigurationProvider
\ No newline at end of file
Copied: projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider (from rev 3233, projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider)
===================================================================
--- projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider (rev 0)
+++ projects/spec/trunk/modules/ri/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider 2008-12-05 17:49:30 UTC (rev 3234)
@@ -0,0 +1 @@
+org.jboss.bpm.api.config.internal.MicrocontainerConfigurationProvider
\ No newline at end of file
Modified: projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -26,11 +26,11 @@
import javax.management.ObjectName;
import org.jboss.bpm.api.ProcessNotFoundException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.EndEvent;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.StartEvent;
import org.jboss.bpm.api.model.Task;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.api.test.ProcessCatalog;
import org.jboss.bpm.incubator.service.PersistenceService;
Modified: projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/ri/src/test/java/org/jboss/bpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -26,12 +26,12 @@
import javax.management.ObjectName;
import org.jboss.bpm.api.ProcessNotFoundException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.EndEvent;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.StartEvent;
import org.jboss.bpm.api.model.Task;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.api.test.ProcessCatalog;
import org.jboss.bpm.incubator.service.PersistenceService;
@@ -56,12 +56,12 @@
ProcessDefinition procDef = unregisterOnTearDown(ProcessCatalog.getDefaultProcess(engine));
// Create and save the Process
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
service.saveProcess(proc);
// Load the process
ObjectName procID = proc.getKey();
- Process loadProc = service.loadProcess(procID);
+ ProcessInstance loadProc = service.loadProcess(procID);
ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition());
StartEvent start = loadProc.getNode(StartEvent.class, "Start");
Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -25,8 +25,7 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
import org.jboss.bpm.api.model.Expression;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
@@ -34,6 +33,7 @@
import org.jboss.bpm.api.model.Task.TaskType;
import org.jboss.bpm.api.model.builder.GatewayBuilder;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt;
import org.jboss.bpm.incubator.model.builder.TaskBuilder;
Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -6,13 +6,13 @@
import javax.management.ObjectName;
import javax.servlet.http.HttpSession;
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.incubator.client.MessageListener;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.Signal;
@@ -68,7 +68,7 @@
System.out.println("Create new Process");
AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID);
ProcessDefinition procDef = procBuilder.buildProcessDefinition();
- ProcessExt proc = (ProcessExt)procDef.newInstance();
+ ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
procService.registerProcess(proc);
procID = proc.startProcessAsync();
httpSession.setAttribute("procID", procID);
Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-12-05 17:49:30 UTC (rev 3234)
@@ -8,7 +8,7 @@
<bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.ri.model.impl.MessageBuilderFactoryImpl"/>
<!-- The ProcessEngine -->
- <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.client.ProcessEngineImpl">
+ <bean name="jBPMProcessEngine" class="org.jboss.bpm.ri.service.ProcessEngineImpl">
<property name="processManager"><inject bean="jBPMProcessManager"/></property>
<property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
<property name="signalManager"><inject bean="jBPMSignalManager"/></property>
Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-12-05 17:05:07 UTC (rev 3233)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-12-05 17:49:30 UTC (rev 3234)
@@ -30,7 +30,7 @@
import org.jboss.bpm.api.runtime.Attachments;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.MessageListener;
-import org.jboss.bpm.incubator.client.ProcessExt;
+import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.UserTaskCallback;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.UserTask;
@@ -53,7 +53,7 @@
private MessageService messageManager = MessageService.locateMessageService();
private AirticketMessageListener msgListener;
- private ProcessExt proc;
+ private ProcessInstanceExt proc;
public void testValidData() throws Exception
{
@@ -61,7 +61,7 @@
ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition());
// Create the process instance
- proc = (ProcessExt)procDef.newInstance();
+ proc = (ProcessInstanceExt)procDef.newInstance();
// Attach the callback to the UserTask
UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);
@@ -87,7 +87,7 @@
ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition());
// Create the process instance
- proc = (ProcessExt)procDef.newInstance();
+ proc = (ProcessInstanceExt)procDef.newInstance();
// Attach the callback to the UserTask
UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);
More information about the jbpm-commits
mailing list