[jbpm-commits] JBoss JBPM SVN: r2946 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/preview/client and 9 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Nov 17 03:31:59 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-11-17 03:31:59 -0500 (Mon, 17 Nov 2008)
New Revision: 2946
Added:
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java
Removed:
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java
Modified:
projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
Log:
REvert to ProcessService
Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -1,156 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.api.service;
-
-//$Id$
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jbpm.api.client.Configuration;
-import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.Process;
-import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.Process.ProcessStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The ProcessService is the entry point to create, find and otherwise manage processes.
- *
- * @author thomas.diesler at jboss.com
- * @since 25-Sep-2008
- */
-public abstract class ProcessInstanceService extends AbstractService
-{
- // Provide logging
- final static Logger log = LoggerFactory.getLogger(ProcessInstanceService.class);
-
- // The set of registered processes
- private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>();
-
- // Hide public constructor
- protected ProcessInstanceService()
- {
- }
-
- /**
- * Locate the default ProcessService
- */
- public static ProcessInstanceService locateProcessService()
- {
- ProcessEngine engine = Configuration.getProcessEngine();
- return engine.getService(ProcessInstanceService.class);
- }
-
- /**
- * Register a Process.
- */
- public ObjectName registerProcess(Process proc)
- {
- log.debug("registerProcess: " + proc);
-
- if (getProcess(proc.getKey()) != null)
- throw new IllegalStateException("Process already registered: " + proc);
-
- ProcessStatus procStatus = proc.getProcessStatus();
- ProcessDefinition procDef = proc.getProcessDefinition();
- ProcessEngine engine = getProcessEngine();
-
- if (procStatus != ProcessStatus.None)
- throw new IllegalStateException("Cannot register process in state: " + procStatus);
-
- // Register the process definition if needed
- ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
- if (procDefService.getProcessDefinition(procDef.getKey()) == null)
- procDefService.registerProcessDefinition(procDef);
-
- // Save the process through the PersistenceService
- PersistenceService persService = getProcessEngine().getService(PersistenceService.class);
- ObjectName procID = persService.saveProcess(proc);
- registeredProcs.put(procID, proc);
- return procID;
- }
-
- /**
- * Unregister a Process.
- */
- public boolean unregisterProcess(ObjectName procID)
- {
- boolean removed = false;
- Process proc = registeredProcs.get(procID);
- if (proc != null)
- {
- log.debug("unregisterProcess: " + proc);
-
- // Delete the process through the PersistenceService
- PersistenceService persService = getProcessEngine().getService(PersistenceService.class);
- persService.deleteProcess(proc);
- registeredProcs.remove(procID);
- removed = true;
- }
- return removed;
- }
-
- /**
- * Get a Process for a given id
- */
- public Process getProcess(ObjectName procID)
- {
- Process proc = registeredProcs.get(procID);
- return proc;
- }
-
- /**
- * Get the set of registered Processes
- */
- public Set<ObjectName> getProcesses()
- {
- return Collections.unmodifiableSet(registeredProcs.keySet());
- }
-
- /**
- * Find the set of Processes for a given name
- *
- * @param name The process name
- * @param status The optional process status
- * @return An empty set if the process cannot be found
- */
- public Set<ObjectName> getProcesses(String name, ProcessStatus status)
- {
- Set<ObjectName> procSet = new HashSet<ObjectName>();
- for (Process auxProc : registeredProcs.values())
- {
- if (auxProc.getName().equals(name))
- {
- if (status == null || auxProc.getProcessStatus() == status)
- procSet.add(auxProc.getKey());
- }
- }
- return procSet;
- }
-}
\ No newline at end of file
Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java (from rev 2944, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessInstanceService.java)
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.api.service;
+
+//$Id$
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jbpm.api.client.Configuration;
+import org.jbpm.api.client.ProcessEngine;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.Process.ProcessStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The ProcessService is the entry point to create, find and otherwise manage processes.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 25-Sep-2008
+ */
+public abstract class ProcessService extends AbstractService
+{
+ // Provide logging
+ final static Logger log = LoggerFactory.getLogger(ProcessService.class);
+
+ // The set of registered processes
+ private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>();
+
+ // Hide public constructor
+ protected ProcessService()
+ {
+ }
+
+ /**
+ * Locate the default ProcessService
+ */
+ public static ProcessService locateProcessService()
+ {
+ ProcessEngine engine = Configuration.getProcessEngine();
+ return engine.getService(ProcessService.class);
+ }
+
+ /**
+ * Register a Process.
+ */
+ public ObjectName registerProcess(Process proc)
+ {
+ log.debug("registerProcess: " + proc);
+
+ if (getProcess(proc.getKey()) != null)
+ throw new IllegalStateException("Process already registered: " + proc);
+
+ ProcessStatus procStatus = proc.getProcessStatus();
+ ProcessDefinition procDef = proc.getProcessDefinition();
+ ProcessEngine engine = getProcessEngine();
+
+ if (procStatus != ProcessStatus.None)
+ throw new IllegalStateException("Cannot register process in state: " + procStatus);
+
+ // Register the process definition if needed
+ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
+ if (procDefService.getProcessDefinition(procDef.getKey()) == null)
+ procDefService.registerProcessDefinition(procDef);
+
+ // Save the process through the PersistenceService
+ PersistenceService persService = getProcessEngine().getService(PersistenceService.class);
+ ObjectName procID = persService.saveProcess(proc);
+ registeredProcs.put(procID, proc);
+ return procID;
+ }
+
+ /**
+ * Unregister a Process.
+ */
+ public boolean unregisterProcess(ObjectName procID)
+ {
+ boolean removed = false;
+ Process proc = registeredProcs.get(procID);
+ if (proc != null)
+ {
+ log.debug("unregisterProcess: " + proc);
+
+ // Delete the process through the PersistenceService
+ PersistenceService persService = getProcessEngine().getService(PersistenceService.class);
+ persService.deleteProcess(proc);
+ registeredProcs.remove(procID);
+ removed = true;
+ }
+ return removed;
+ }
+
+ /**
+ * Get a Process for a given id
+ */
+ public Process getProcess(ObjectName procID)
+ {
+ Process proc = registeredProcs.get(procID);
+ return proc;
+ }
+
+ /**
+ * Get the set of registered Processes
+ */
+ public Set<ObjectName> getProcesses()
+ {
+ return Collections.unmodifiableSet(registeredProcs.keySet());
+ }
+
+ /**
+ * Find the set of Processes for a given name
+ *
+ * @param name The process name
+ * @param status The optional process status
+ * @return An empty set if the process cannot be found
+ */
+ public Set<ObjectName> getProcesses(String name, ProcessStatus status)
+ {
+ Set<ObjectName> procSet = new HashSet<ObjectName>();
+ for (Process auxProc : registeredProcs.values())
+ {
+ if (auxProc.getName().equals(name))
+ {
+ if (status == null || auxProc.getProcessStatus() == status)
+ procSet.add(auxProc.getKey());
+ }
+ }
+ return procSet;
+ }
+}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/client/Deployment.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -36,12 +36,12 @@
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.service.DialectHandler;
import org.jbpm.api.service.DialectHandlerService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
- * A deployment, containing all information to create a process that will be deployed to the {@link ProcessInstanceService}
+ * A deployment, containing all information to create a process that will be deployed to the {@link ProcessService}
*
* @author Tom Baeyens
* @author thomas.diesler at jboss.com
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/preview/service/MessageService.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -38,7 +38,7 @@
import org.jbpm.api.model.Process;
import org.jbpm.api.model.Task;
import org.jbpm.api.service.AbstractService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.preview.client.MessageListener;
import org.jbpm.preview.model.Message;
import org.jbpm.preview.model.Participant;
@@ -136,7 +136,7 @@
*/
public void sendMessage(ObjectName procID, String targetName, Message msg)
{
- ProcessInstanceService procService = ProcessInstanceService.locateProcessService();
+ ProcessService procService = ProcessService.locateProcessService();
Process proc = procService.getProcess(procID);
if (proc == null)
throw new IllegalStateException("Cannot obtain registered process: " + procID);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -31,7 +31,7 @@
import org.jbpm.api.model.Process;
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.service.ProcessDefinitionService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.api.test.CTSTestCase;
import org.jbpm.api.test.ProcessCatalog;
@@ -64,7 +64,7 @@
ProcessEngine engine = procDef.getProcessEngine();
ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
- ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ ProcessService procService = engine.getService(ProcessService.class);
Process proc = procDef.newInstance();
assertNotNull("Process not null", proc);
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -30,7 +30,7 @@
import org.jbpm.api.model.builder.ProcessBuilder;
import org.jbpm.api.service.ProcessBuilderService;
import org.jbpm.api.service.ProcessDefinitionService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.api.test.CTSTestCase;
/**
@@ -44,7 +44,7 @@
public void testRegisterProcess() throws Exception
{
ProcessDefinitionService procDefService = ProcessDefinitionService.locateProcessDefinitionService();
- ProcessInstanceService procService = ProcessInstanceService.locateProcessService();
+ ProcessService procService = ProcessService.locateProcessService();
ProcessDefinition procDef = getProcessDefinition();
Process proc = procDef.newInstance();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/startevent/StartEventSignalTest.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -33,7 +33,7 @@
import org.jbpm.api.model.Expression.ExpressionLanguage;
import org.jbpm.api.service.ProcessBuilderService;
import org.jbpm.api.service.ProcessDefinitionService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.api.test.CTSTestCase;
import org.jbpm.preview.client.ProcessExt;
import org.jbpm.preview.client.SignalListener;
@@ -79,7 +79,7 @@
sigService.throwSignal(newSignal(getTestID(), SignalType.SYSTEM_START_TRIGGER, "A"));
// Get the just started process
- ProcessInstanceService procService = ProcessInstanceService.locateProcessService();
+ ProcessService procService = ProcessService.locateProcessService();
Set<ObjectName> procIDs = procService.getProcesses("StartEventSignal", null);
proc = (ProcessExt) procService.getProcess(procIDs.iterator().next());
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/receive/ReceiveTaskTest.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -33,7 +33,7 @@
import org.jbpm.api.model.Task.TaskType;
import org.jbpm.api.service.ProcessBuilderService;
import org.jbpm.api.service.ProcessDefinitionService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.api.test.CTSTestCase;
import org.jbpm.preview.client.ProcessExt;
import org.jbpm.preview.client.SignalListener;
@@ -91,7 +91,7 @@
public void testSuspendedMessage() throws Exception
{
ProcessDefinitionService procDefService = ProcessDefinitionService.locateProcessDefinitionService();
- ProcessInstanceService procService = ProcessInstanceService.locateProcessService();
+ ProcessService procService = ProcessService.locateProcessService();
ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
ProcessExt proc = (ProcessExt)procDef.newInstance();
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/task/user/UserTaskTest.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -35,7 +35,7 @@
import org.jbpm.api.model.builder.ObjectNameFactory;
import org.jbpm.api.runtime.BasicAttachments;
import org.jbpm.api.service.ProcessBuilderService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.api.test.CTSTestCase;
import org.jbpm.preview.client.MessageListener;
import org.jbpm.preview.client.ProcessExt;
@@ -61,7 +61,7 @@
ProcessExt proc = (ProcessExt)procDef.newInstance();
// Register the process - this assigns the procID
- ProcessInstanceService procService = ProcessInstanceService.locateProcessService();
+ ProcessService procService = ProcessService.locateProcessService();
procService.registerProcess(proc);
// Add the user message listener
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -49,7 +49,7 @@
import org.jbpm.api.model.Event.EventDetailType;
import org.jbpm.api.model.builder.ObjectNameFactory;
import org.jbpm.api.runtime.Attachments;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.preview.client.ProcessExt;
import org.jbpm.preview.model.Assignment;
import org.jbpm.preview.model.Group;
@@ -303,7 +303,7 @@
catch (RuntimeException rte)
{
// A process that cannot be started id unregistered automatically
- ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessService procService = getProcessEngine().getService(ProcessService.class);
procService.unregisterProcess(getKey());
throw rte;
}
@@ -336,7 +336,7 @@
// Register the process if needed
ProcessEngine engine = getProcessEngine();
- ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ ProcessService procService = engine.getService(ProcessService.class);
if (procService.getProcess(getKey()) == null)
procService.registerProcess(this);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -26,7 +26,7 @@
import org.jbpm.api.model.Node;
import org.jbpm.api.model.Process;
import org.jbpm.api.model.Process.ProcessStatus;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.ri.model.ProcessImpl;
import org.jbpm.ri.service.ProcessServiceImpl;
import org.slf4j.Logger;
@@ -77,7 +77,7 @@
RuntimeContext rtContext = new RuntimeContext(tokenExecutor);
// Add the interceptors that are defined on the ProcessService
- ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessService.class);
for (NodeInterceptor itor : procService.getNodeInterceptors())
rtContext.addInterceptor(itor);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -39,7 +39,7 @@
import org.jbpm.api.runtime.Attachments;
import org.jbpm.api.runtime.BasicAttachments;
import org.jbpm.api.runtime.Attachments.Key;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.preview.runtime.TokenExecutor;
import org.jbpm.ri.service.ProcessServiceImpl;
import org.jbpm.ri.model.ProcessImpl;
@@ -186,7 +186,7 @@
RuntimeContext rtContext = new RuntimeContext(tokenExecutor);
// Add the interceptors that are defined on the ProcessService
- ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessInstanceService.class);
+ ProcessServiceImpl procService = (ProcessServiceImpl)proc.getProcessEngine().getService(ProcessService.class);
for (NodeInterceptor itor : procService.getNodeInterceptors())
rtContext.addInterceptor(itor);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -37,7 +37,7 @@
import org.jbpm.api.model.StartEvent;
import org.jbpm.api.model.Process.ProcessStatus;
import org.jbpm.api.runtime.Attachments;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.preview.client.ProcessExt;
import org.jbpm.preview.model.Assignment;
import org.jbpm.preview.model.Assignment.AssignTime;
@@ -225,7 +225,7 @@
// this could happen when the Process never received a start signal
// and then we get here because of a ProcessTimeoutException
ProcessEngine engine = getProcessEngine();
- ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ ProcessService procService = engine.getService(ProcessService.class);
if (procService.getProcess(proc.getKey()) != null)
procService.unregisterProcess(proc.getKey());
}
@@ -316,7 +316,7 @@
synchronized (proc)
{
- ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ ProcessService procService = engine.getService(ProcessService.class);
procService.unregisterProcess(procID);
runtimeProcesses.remove(procID);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -34,7 +34,7 @@
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.service.PersistenceService;
import org.jbpm.api.service.ProcessDefinitionService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.ri.model.ProcessDefinitionImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -106,7 +106,7 @@
ProcessEngine engine = getProcessEngine();
// Unregister the associated process instances
- ProcessInstanceService procService = engine.getService(ProcessInstanceService.class);
+ ProcessService procService = engine.getService(ProcessService.class);
for (ObjectName procID : procService.getProcesses(procDef.getName(), null))
procService.unregisterProcess(procID);
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -33,7 +33,7 @@
import org.jbpm.api.model.Process;
import org.jbpm.api.model.Process.ProcessStatus;
import org.jbpm.api.service.PersistenceService;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.ri.model.ProcessImpl;
import org.jbpm.ri.runtime.NodeInterceptor;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class ProcessServiceImpl extends ProcessInstanceService implements MutableService
+public class ProcessServiceImpl extends ProcessService implements MutableService
{
// Provide logging
final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class);
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-11-17 07:57:09 UTC (rev 2945)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-11-17 08:31:59 UTC (rev 2946)
@@ -17,7 +17,7 @@
import org.jboss.bpm.samples.airticket.client.RequestMessage;
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.model.builder.ObjectNameFactory;
-import org.jbpm.api.service.ProcessInstanceService;
+import org.jbpm.api.service.ProcessService;
import org.jbpm.preview.client.MessageListener;
import org.jbpm.preview.client.ProcessExt;
import org.jbpm.preview.client.SignalListener;
@@ -37,7 +37,7 @@
public void sendMessage(GwtMessage gwtMsg)
{
- ProcessInstanceService procService = ProcessInstanceService.locateProcessService();
+ ProcessService procService = ProcessService.locateProcessService();
MessageService mm = MessageService.locateMessageService();
SignalService sm = SignalService.locateSignalService();
More information about the jbpm-commits
mailing list