[jbpm-commits] JBoss JBPM SVN: r3247 - in projects/spec/trunk/modules: api/src/main/java/org/jboss/bpm/api/config/internal and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Dec 6 11:33:05 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-06 11:33:05 -0500 (Sat, 06 Dec 2008)
New Revision: 3247
Added:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java
Removed:
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java
Modified:
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/config/internal/MicrocontainerConfigurationProvider.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/internal/AbstractProcessService.java
projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.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/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/startevent/StartEventSignalTest.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/user/UserTaskTest.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/runtime/AssignmentInterceptor.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/ExitSignalInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java
projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.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/SignalHandlerInterceptor.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/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/ThreadingServiceImpl.java
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
Log:
Refactor ConfigurationProvider
Modified: 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 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/Configuration.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -45,13 +45,17 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public abstract class Configuration
+public final class Configuration
{
private static ConfigurationProvider provider;
+ // Hide the ctor
+ private Configuration()
+ {
+ }
+
/**
* Create a new instance of ProcessEngine for this configuration
- *
* @return The configured instance of a process engine
*/
public static ProcessEngine getProcessEngine()
@@ -64,23 +68,16 @@
*
* @return The configured instance of a process engine
*/
- public static ProcessEngine getProcessEngine(URL cfgURL)
+ public static ProcessEngine getProcessEngine(String engineName)
{
- return getConfigurationProvider().getProcessEngine(cfgURL);
+ return getConfigurationProvider().getProcessEngine(engineName);
}
/**
- * Get a ProcessEngine with a given name from this configuration
- *
- * @return The configured instance of a process engine
+ * Get the ConfigurationProvider
*/
- public static ProcessEngine getProcessEngine(String cfgXML)
+ public static ConfigurationProvider getConfigurationProvider()
{
- return getConfigurationProvider().getProcessEngine(cfgXML);
- }
-
- private static ConfigurationProvider getConfigurationProvider()
- {
if (provider == null)
{
// Get the provider name from the System property
@@ -104,6 +101,10 @@
}
}
+ // Verify that we have a provider name
+ if (providerName == null)
+ throw new IllegalStateException("Cannot obtain configuration provider");
+
// Load the config provider
try
{
Modified: 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 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/ConfigurationProvider.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -23,6 +23,7 @@
//$Id$
+import java.io.InputStream;
import java.net.URL;
import org.jboss.bpm.api.service.ProcessEngine;
@@ -42,14 +43,23 @@
ProcessEngine getProcessEngine();
/**
- * Get a ProcessEngine that is configured with a given config file
+ * Get a ProcessEngine with a given name from this ConfigurationProvider
* @return The configured instance of a process engine
*/
- ProcessEngine getProcessEngine(URL cfgURL);
+ ProcessEngine getProcessEngine(String name);
/**
- * Get a ProcessEngine that is configured with a given config string
- * @return The configured instance of a process engine
+ * Configure this provider from the given URL
*/
- ProcessEngine getProcessEngine(String cfgXML);
+ void configure(URL urlConfig);
+
+ /**
+ * Configure this provider from the resource
+ */
+ void configure(String resourceConfig);
+
+ /**
+ * Configure this provider from the resource
+ */
+ void configure(InputStream streamConfig);
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/config/internal/MicrocontainerConfigurationProvider.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -23,6 +23,7 @@
//$Id$
+import java.io.InputStream;
import java.net.URL;
import org.jboss.bpm.api.NotImplementedException;
@@ -39,55 +40,70 @@
*/
public class MicrocontainerConfigurationProvider implements ConfigurationProvider
{
- /** The process engine bean name - jBPMEngine */
- public static final String BEAN_NAME = "BPMProcessEngine";
+ /** The process engine bean name - BPMProcessEngine */
+ public static final String DEFAULT_BEAN_NAME = "BPMProcessEngine";
/** The default bean config: jbpm-cfg-beans.xml */
- public static final String JBPM_ENGINE_CONFIG = "jbpm-cfg-beans.xml";
+ public static final String DEFAULT_BEANS_CONFIG = "jbpm-cfg-beans.xml";
+ private Kernel kernel;
private ProcessEngine engine;
@Override
public ProcessEngine getProcessEngine()
{
+ return getProcessEngine(DEFAULT_BEAN_NAME);
+ }
+
+ @Override
+ @SuppressWarnings("deprecation")
+ public ProcessEngine getProcessEngine(String engineName)
+ {
if (engine == null)
{
- Kernel kernel = KernelLocator.getKernel();
+ kernel = KernelLocator.getKernel();
if (kernel == null)
{
- EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
- deployer.deploy(getDefaultConfigURL());
+ configureWithDefault();
}
- engine = getProcessEngineBean();
+ KernelRegistryEntry entry = kernel.getRegistry().getEntry(engineName);
+ engine = (ProcessEngine)entry.getTarget();
}
return engine;
}
- @Override
- public ProcessEngine getProcessEngine(URL cfgURL)
+ private void configureWithDefault()
{
- throw new NotImplementedException();
+ URL urlConfig = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_BEANS_CONFIG);
+ if (urlConfig == null)
+ throw new IllegalStateException("Cannot find resource: " + DEFAULT_BEANS_CONFIG);
+
+ configure(urlConfig);
}
-
+
@Override
- public ProcessEngine getProcessEngine(String cfgXML)
+ public void configure(InputStream streamConfig)
{
- throw new NotImplementedException();
+ throw new NotImplementedException("Cannot bootstrap JBossMC from InputStream");
}
- @SuppressWarnings("deprecation")
- private ProcessEngine getProcessEngineBean()
+ @Override
+ public void configure(String resourceConfig)
{
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistryEntry entry = kernel.getRegistry().getEntry(BEAN_NAME);
- ProcessEngine engine = (ProcessEngine)entry.getTarget();
- return engine;
+ URL urlConfig = Thread.currentThread().getContextClassLoader().getResource(resourceConfig);
+ if (urlConfig == null)
+ throw new IllegalStateException("Cannot find resource: " + resourceConfig);
+
+ configure(urlConfig);
}
- private URL getDefaultConfigURL()
+ @Override
+ public void configure(URL urlConfig)
{
- URL cfgURL = Thread.currentThread().getContextClassLoader().getResource(JBPM_ENGINE_CONFIG);
- if (cfgURL == null)
- throw new IllegalStateException("Cannot find resource: " + JBPM_ENGINE_CONFIG);
- return cfgURL;
+ EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer();
+ deployer.deploy(urlConfig);
+
+ kernel = KernelLocator.getKernel();
+ if (kernel == null)
+ throw new IllegalStateException("Cannot obtain kernel from KernelLocator.");
}
}
\ No newline at end of file
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/runtime/Token.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -84,7 +84,7 @@
/**
* Get the current {@link Node}
*/
- Node getCurrentNode();
+ Node getNode();
/**
* Get the root token that his Token is associated with
Copied: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java (from rev 3246, 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/ProcessInstanceService.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessInstanceService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -0,0 +1,72 @@
+/*
+ * 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.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.model.ProcessInstance;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
+
+/**
+ * The ProcessInstanceService is the entry point to create, find and otherwise manage processe instances.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 25-Sep-2008
+ */
+public interface ProcessInstanceService
+{
+
+ /**
+ * Register a ProcessInstance.
+ * @return An implementation may return a proxied version of the given Process
+ */
+ ProcessInstance registerInstance(ProcessInstance proc);
+
+ /**
+ * Unregister a ProcessInstance.
+ */
+ boolean unregisterInstance(ObjectName procID);
+
+ /**
+ * Get a ProcessInstance for a given id
+ */
+ ProcessInstance getInstance(ObjectName procID);
+
+ /**
+ * Get the set of registered ProcessInstances
+ */
+ Set<ObjectName> getInstance();
+
+ /**
+ * Get the set of ProcessInstance for a given ProcessDefinition
+ *
+ * @param procDefID The process definition id
+ * @param status The optional process status
+ * @return An empty set if the process cannot be found
+ */
+ Set<ObjectName> getInstance(ObjectName procDefID, ProcessStatus status);
+
+}
\ No newline at end of file
Deleted: 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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/ProcessService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -1,72 +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.service;
-
-//$Id$
-
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-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.
- *
- * @author thomas.diesler at jboss.com
- * @since 25-Sep-2008
- */
-public interface ProcessService
-{
-
- /**
- * Register a Process.
- * @return An implementation may return a proxied version of the given Process
- */
- ProcessInstance registerProcess(ProcessInstance proc);
-
- /**
- * Unregister a Process.
- */
- boolean unregisterProcess(ObjectName procID);
-
- /**
- * Get a Process for a given id
- */
- ProcessInstance getProcess(ObjectName procID);
-
- /**
- * Get the set of registered Processes
- */
- Set<ObjectName> getProcesses();
-
- /**
- * Get the set of Processes for a given ProcessDefinition
- *
- * @param procDefID The process definition id
- * @param status The optional process status
- * @return An empty set if the process cannot be found
- */
- Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status);
-
-}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/service/internal/AbstractProcessService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
/**
* The ProcessService is the entry point to create, find and otherwise manage processes.
@@ -31,7 +31,7 @@
* @author thomas.diesler at jboss.com
* @since 25-Sep-2008
*/
-public abstract class AbstractProcessService extends AbstractService implements ProcessService
+public abstract class AbstractProcessService extends AbstractService implements ProcessInstanceService
{
// Hide public constructor
protected AbstractProcessService()
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/incubator/service/MessageService.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -37,7 +37,7 @@
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.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractService;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.model.Message;
@@ -136,8 +136,8 @@
*/
public void sendMessage(ObjectName procID, String targetName, Message msg)
{
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- ProcessInstance proc = procService.getProcess(procID);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessInstance proc = procService.getInstance(procID);
if (proc == null)
throw new IllegalStateException("Cannot obtain registered process: " + procID);
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -57,7 +57,7 @@
Token tok = proc.startProcess(att);
- String nodeName = tok.getCurrentNode().getName();
+ String nodeName = tok.getNode().getName();
assertEquals("EndA", nodeName);
assertEquals(TokenStatus.Destroyed, tok.getTokenStatus());
@@ -74,7 +74,7 @@
Token tok = proc.startProcess(att);
- String nodeName = tok.getCurrentNode().getName();
+ String nodeName = tok.getNode().getName();
assertEquals("EndB", nodeName);
assertEquals(TokenStatus.Destroyed, tok.getTokenStatus());
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -31,7 +31,7 @@
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.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.api.test.ProcessCatalog;
@@ -64,11 +64,11 @@
ProcessEngine engine = procDef.getProcessEngine();
ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
- ProcessService procService = engine.getService(ProcessService.class);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
ProcessInstance proc = procDef.newInstance();
assertNotNull("Process not null", proc);
- assertNull("Process not automatically registered", procService.getProcess(proc.getKey()));
+ assertNull("Process not automatically registered", procService.getInstance(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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -31,7 +31,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
/**
@@ -45,23 +45,23 @@
public void testRegisterProcess() throws Exception
{
ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
ProcessDefinition procDef = getProcessDefinition();
ProcessInstance proc = procDef.newInstance();
assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey()));
- assertNull("Process not registered automatically", procService.getProcess(proc.getKey()));
+ assertNull("Process not registered automatically", procService.getInstance(proc.getKey()));
// Register the process
- proc = procService.registerProcess(proc);
+ proc = procService.registerInstance(proc);
assertNotNull("Proc not null", proc);
assertNotNull("ProcessDefinition registered", procDefService.getProcessDefinition(procDef.getKey()));
- assertNotNull("Process registered", procService.getProcess(proc.getKey()));
+ assertNotNull("Process registered", procService.getInstance(proc.getKey()));
// Unregister the process
- procService.unregisterProcess(proc.getKey());
- assertNull("Process unregistered", procService.getProcess(proc.getKey()));
+ procService.unregisterInstance(proc.getKey());
+ assertNull("Process unregistered", procService.getInstance(proc.getKey()));
assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey()));
procDefService.unregisterProcessDefinition(procDef.getKey());
@@ -71,7 +71,7 @@
public void testStartProcess() throws Exception
{
ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
ProcessDefinition procDef = getProcessDefinition();
ProcessInstance proc = procDef.newInstance();
@@ -80,11 +80,11 @@
assertNotNull("Token not null", token);
ObjectName procID = proc.getKey();
- assertNotNull("Process registered", procService.getProcess(procID));
+ assertNotNull("Process registered", procService.getInstance(procID));
// Unregister the process
- procService.unregisterProcess(procID);
- assertNull("Process unregistered", procService.getProcess(procID));
+ procService.unregisterInstance(procID);
+ assertNull("Process unregistered", procService.getInstance(procID));
assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey()));
procDefService.unregisterProcessDefinition(procDef.getKey());
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/waitstate/WaitStateTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -50,25 +50,25 @@
// Start the Process
Token tok = proc.startProcess();
- String nodeName = tok.getCurrentNode().getName();
+ String nodeName = tok.getNode().getName();
assertEquals(TokenStatus.Suspended, tok.getTokenStatus());
assertEquals("TaskA", nodeName);
tok.signal();
- nodeName = tok.getCurrentNode().getName();
+ nodeName = tok.getNode().getName();
assertEquals(TokenStatus.Suspended, tok.getTokenStatus());
assertEquals("TaskB", nodeName);
tok.signal();
- nodeName = tok.getCurrentNode().getName();
+ nodeName = tok.getNode().getName();
assertEquals(TokenStatus.Suspended, tok.getTokenStatus());
assertEquals("TaskC", nodeName);
tok.signal();
- nodeName = tok.getCurrentNode().getName();
+ nodeName = tok.getNode().getName();
assertEquals("End", nodeName);
assertEquals(TokenStatus.Destroyed, tok.getTokenStatus());
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/startevent/StartEventSignalTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -33,7 +33,7 @@
import org.jboss.bpm.api.model.Expression.ExpressionLanguage;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
@@ -80,9 +80,9 @@
sigService.throwSignal(newSignal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Get the just started process
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- Set<ObjectName> procIDs = procService.getProcesses(procDefID, null);
- proc = (ProcessInstanceExt) procService.getProcess(procIDs.iterator().next());
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ Set<ObjectName> procIDs = procService.getInstance(procDefID, null);
+ proc = (ProcessInstanceExt) procService.getInstance(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/receive/ReceiveTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/receive/ReceiveTaskTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -32,7 +32,7 @@
import org.jboss.bpm.api.model.Task.TaskType;
import org.jboss.bpm.api.service.ProcessBuilderService;
import org.jboss.bpm.api.service.ProcessDefinitionService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
@@ -91,12 +91,12 @@
public void testSuspendedMessage() throws Exception
{
ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class);
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
ProcessInstance proc = procDef.newInstance();
- proc = procService.registerProcess(proc);
+ proc = procService.registerInstance(proc);
try
{
// Send the message before the process is started
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/incubator/task/user/UserTaskTest.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -35,7 +35,7 @@
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.service.ProcessBuilderService;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
import org.jboss.bpm.api.test.CTSTestCase;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
@@ -61,8 +61,8 @@
ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
// Register the process - this assigns the procID
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- procService.registerProcess(proc);
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ procService.registerInstance(proc);
// Add the user message listener
MessageService msgService = MessageService.locateMessageService();
Modified: 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/model/ProcessInstanceImpl.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/ProcessInstanceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -52,7 +52,7 @@
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.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Group;
@@ -389,8 +389,8 @@
catch (RuntimeException rte)
{
// A process that cannot be started id unregistered automatically
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- procService.unregisterProcess(getKey());
+ ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ procService.unregisterInstance(getKey());
throw rte;
}
}
@@ -422,9 +422,9 @@
// Register the process if needed
ProcessEngine engine = getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
- if (procService.getProcess(getKey()) == null)
- procService.registerProcess(this);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ if (procService.getInstance(getKey()) == null)
+ procService.registerInstance(this);
return start;
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/AssignmentInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -42,7 +42,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
// Do start time assignments
for (Assignment ass : node.getAssignments())
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/DelegatingToken.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -51,7 +51,7 @@
{
this.delegateToken = token;
- NodeExt targetNode = (NodeExt)token.getCurrentNode();
+ NodeExt targetNode = (NodeExt)token.getNode();
Attachments exContext = token.getAttachments();
this.delegateContext = new DelegatingAttachments(targetNode, exContext);
}
@@ -99,9 +99,9 @@
}
@Override
- public Node getCurrentNode()
+ public Node getNode()
{
- return delegateToken.getCurrentNode();
+ return delegateToken.getNode();
}
@Override
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/ExitSignalInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -39,7 +39,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
SignalHandler sigHandler = node.getSignalHandler();
sigHandler.throwExitSignal(token);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/FlowHandlerInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -41,7 +41,7 @@
{
TokenExecutor tokenExecutor = rtContext.getTokenExecutor();
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
// Call the next Interceptor
rtContext.next();
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/NodeExecuteInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -38,7 +38,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeImpl nodeImpl = (NodeImpl)token.getCurrentNode();
+ NodeImpl nodeImpl = (NodeImpl)token.getNode();
nodeImpl.execute(rtContext);
}
}
\ No newline at end of file
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/RunnableToken.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -26,7 +26,7 @@
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.api.service.ProcessInstanceService;
import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.service.ProcessServiceImpl;
import org.slf4j.Logger;
@@ -70,21 +70,21 @@
ProcessInstance proc = rtProc.getProcess();
try
{
- Node node = token.getCurrentNode();
+ Node node = token.getNode();
if (node == null)
throw new IllegalStateException("Cannot obtain initial node");
RuntimeContext rtContext = new RuntimeContext(tokenExecutor);
// Add the interceptors that are defined on the ProcessService
- ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessService.class);
+ ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessInstanceService.class);
for (NodeInterceptor itor : procService.getNodeInterceptors())
rtContext.addInterceptor(itor);
while (continueTokenExecution())
{
// Get the target node
- node = token.getCurrentNode();
+ node = token.getNode();
// Synchronize on the target Node
synchronized (node)
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java 2008-12-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/SignalHandlerInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -39,7 +39,7 @@
public void execute(RuntimeContext rtContext)
{
Token token = rtContext.getToken();
- NodeExt node = (NodeExt)token.getCurrentNode();
+ NodeExt node = (NodeExt)token.getNode();
try
{
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TokenImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -43,7 +43,7 @@
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.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.runtime.TokenExecutor;
import org.jboss.bpm.ri.model.ProcessInstanceImpl;
import org.jboss.bpm.ri.service.ProcessServiceImpl;
@@ -162,7 +162,7 @@
}
@Override
- public Node getCurrentNode()
+ public Node getNode()
{
String targetRef = flow.getTargetRef();
return getProcess().getNode(targetRef);
@@ -189,7 +189,7 @@
@Override
public void signal()
{
- Node node = getCurrentNode();
+ Node node = getNode();
if (node == null)
throw new IllegalStateException("Cannot obtain current node");
@@ -197,7 +197,7 @@
RuntimeContext rtContext = new RuntimeContext(tokenExecutor);
// Add the interceptors that are defined on the ProcessService
- ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessService.class);
+ ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessInstanceService.class);
for (NodeInterceptor itor : procService.getNodeInterceptors())
rtContext.addInterceptor(itor);
@@ -216,7 +216,7 @@
while (continueTokenExecution())
{
// Get the target node
- node = getCurrentNode();
+ node = getNode();
// Create a Token that includes node properties
DelegatingToken tokCopy = new DelegatingToken(this);
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/runtime/TransactionInterceptor.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -52,7 +52,7 @@
public void execute(RuntimeContext rtContext)
{
MutableToken token = (MutableToken)rtContext.getToken();
- Node node = token.getCurrentNode();
+ Node node = token.getNode();
// Get persistence session
Session session = token.getSession();
@@ -94,7 +94,7 @@
service.saveNode(session, node);
// Get TxType of the next node
- Node nextNode = token.getCurrentNode();
+ Node nextNode = token.getNode();
if (nextNode != null)
{
txTypeNext = getTxType((NodeExt)nextNode);
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -33,7 +33,7 @@
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.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractProcessDefinitionService;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.jboss.bpm.ri.model.ProcessDefinitionImpl;
@@ -107,9 +107,9 @@
ProcessEngine engine = getProcessEngine();
// Unregister the associated process instances
- ProcessService procService = engine.getService(ProcessService.class);
- for (ObjectName procID : procService.getProcesses(procDefID, null))
- procService.unregisterProcess(procID);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ for (ObjectName procID : procService.getInstance(procDefID, null))
+ procService.unregisterInstance(procID);
// Delete the ProcessDefinition through the PersistenceService
PersistenceService persService = engine.getService(PersistenceService.class);
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -38,7 +38,7 @@
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.ProcessInstanceService;
import org.jboss.bpm.api.service.internal.AbstractProcessService;
import org.jboss.bpm.incubator.service.PersistenceService;
import org.jboss.bpm.ri.model.ProcessInstanceImpl;
@@ -52,7 +52,7 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class ProcessServiceImpl extends AbstractProcessService implements ProcessService, MutableService
+public class ProcessServiceImpl extends AbstractProcessService implements ProcessInstanceService, MutableService
{
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class);
@@ -84,7 +84,7 @@
* Get a Process for a given id
*/
@Override
- public ProcessInstance getProcess(ObjectName procID)
+ public ProcessInstance getInstance(ObjectName procID)
{
ProcessInstance proc = registeredProcs.get(procID);
return proc;
@@ -94,7 +94,7 @@
* Get the set of registered Processes
*/
@Override
- public Set<ObjectName> getProcesses()
+ public Set<ObjectName> getInstance()
{
return Collections.unmodifiableSet(registeredProcs.keySet());
}
@@ -107,7 +107,7 @@
* @return An empty set if the process cannot be found
*/
@Override
- public Set<ObjectName> getProcesses(ObjectName procDefID, ProcessStatus status)
+ public Set<ObjectName> getInstance(ObjectName procDefID, ProcessStatus status)
{
Set<ObjectName> procSet = new HashSet<ObjectName>();
for (ProcessInstance auxProc : registeredProcs.values())
@@ -125,11 +125,11 @@
/**
* Register a Process.
*/
- public ProcessInstance registerProcess(ProcessInstance proc)
+ public ProcessInstance registerInstance(ProcessInstance proc)
{
log.debug("registerProcess: " + proc);
- if (getProcess(proc.getKey()) != null)
+ if (getInstance(proc.getKey()) != null)
throw new IllegalStateException("Process already registered: " + proc);
ProcessStatus procStatus = proc.getProcessStatus();
@@ -159,7 +159,7 @@
/**
* Unregister a Process.
*/
- public boolean unregisterProcess(ObjectName procID)
+ public boolean unregisterInstance(ObjectName procID)
{
boolean removed = false;
ProcessInstance proc = registeredProcs.get(procID);
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ThreadingServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -37,7 +37,7 @@
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.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.model.Assignment;
import org.jboss.bpm.incubator.model.Assignment.AssignTime;
@@ -223,9 +223,9 @@
// this could happen when the Process never received a start signal
// and then we get here because of a ProcessTimeoutException
ProcessEngine engine = getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
- if (procService.getProcess(proc.getKey()) != null)
- procService.unregisterProcess(proc.getKey());
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ if (procService.getInstance(proc.getKey()) != null)
+ procService.unregisterInstance(proc.getKey());
}
status = proc.getProcessStatus();
@@ -314,8 +314,8 @@
synchronized (proc)
{
- ProcessService procService = engine.getService(ProcessService.class);
- procService.unregisterProcess(procID);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ procService.unregisterInstance(procID);
runtimeProcesses.remove(procID);
// Notify that the process has now ended
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-06 15:05:11 UTC (rev 3246)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-12-06 16:33:05 UTC (rev 3247)
@@ -10,7 +10,7 @@
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.api.service.ProcessInstanceService;
import org.jboss.bpm.incubator.client.MessageListener;
import org.jboss.bpm.incubator.client.ProcessInstanceExt;
import org.jboss.bpm.incubator.client.SignalListener;
@@ -40,7 +40,7 @@
public void sendMessage(GwtMessage gwtMsg)
{
ProcessEngine engine = Configuration.getProcessEngine();
- ProcessService procService = engine.getService(ProcessService.class);
+ ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
MessageService mm = MessageService.locateMessageService();
SignalService sm = SignalService.locateSignalService();
@@ -63,13 +63,13 @@
// Create/Start a new process
ObjectName procID = (ObjectName)httpSession.getAttribute("procID");
- if (procID == null || procService.getProcess(procID) == null)
+ if (procID == null || procService.getInstance(procID) == null)
{
System.out.println("Create new Process");
AirticketProcessBuilder procBuilder = new AirticketProcessBuilder(sampleID);
ProcessDefinition procDef = procBuilder.buildProcessDefinition();
ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance();
- procService.registerProcess(proc);
+ procService.registerInstance(proc);
procID = proc.startProcessAsync();
httpSession.setAttribute("procID", procID);
}
More information about the jbpm-commits
mailing list