[jbpm-commits] JBoss JBPM SVN: r3236 - in jbpm3/trunk/modules/integration/spec/src: main/java/org/jbpm/integration/spec/model and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 5 12:51:56 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-05 12:51:55 -0500 (Fri, 05 Dec 2008)
New Revision: 3236
Added:
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider
Removed:
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java
jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider
Modified:
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/client/ProcessEngineImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EventImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayForkImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayJoinImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/MutableService.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java
jbpm3/trunk/modules/integration/spec/src/main/resources/jbpm-cfg-beans.xml
jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java
jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
Log:
Cleanup Spec API packages
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/client/ProcessEngineImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/client/ProcessEngineImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/client/ProcessEngineImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -25,7 +25,7 @@
import java.util.Set;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.Service;
import org.jbpm.JbpmConfiguration;
import org.jbpm.integration.spec.service.MutableService;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/AbstractElementImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -21,10 +21,10 @@
*/
package org.jbpm.integration.spec.model;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.AbstractElement;
import org.jboss.bpm.api.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.Identifiable;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EndEventImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -24,10 +24,10 @@
import java.util.List;
import org.jboss.bpm.api.NotImplementedException;
-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;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.EndState;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EventImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/EventImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -21,9 +21,9 @@
*/
package org.jbpm.integration.spec.model;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.Event;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ExclusiveGatewayImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -23,13 +23,13 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ExclusiveGateway;
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.model.SequenceFlow.ConditionType;
import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.node.Decision;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/GatewayImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -24,10 +24,10 @@
import java.util.List;
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;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -30,13 +30,13 @@
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.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.SequenceFlow;
import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Transition;
import org.jbpm.integration.spec.runtime.InvocationProxy;
@@ -77,7 +77,7 @@
return procDef;
}
- public Process getProcess()
+ public ProcessInstance getProcess()
{
throw new NotImplementedException();
}
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NoneTaskImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -21,9 +21,9 @@
*/
package org.jbpm.integration.spec.model;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.Task;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayForkImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayForkImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayForkImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -23,8 +23,8 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.ParallelGateway;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.Fork;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayJoinImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayJoinImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ParallelGatewayJoinImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -23,8 +23,8 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.model.ParallelGateway;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.Join;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessDefinitionImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -30,16 +30,15 @@
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.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow.ConditionType;
import org.jboss.bpm.api.model.builder.ObjectNameFactory;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.def.Node.NodeType;
-import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.integration.spec.runtime.InvocationProxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,12 +116,12 @@
return version > 0 ? String.valueOf(version) : null;
}
- public Process newInstance()
+ public ProcessInstance newInstance()
{
- ProcessInstance oldProc = new ProcessInstance();
- oldProc.setProcessDefinition(getDelegate());
- oldProc.addInitialModuleDefinitions(getDelegate());
- return ProcessImpl.newInstance(getProcessEngine(), oldProc, true);
+ org.jbpm.graph.exe.ProcessInstance oldProcInst = new org.jbpm.graph.exe.ProcessInstance();
+ oldProcInst.setProcessDefinition(getDelegate());
+ oldProcInst.addInitialModuleDefinitions(getDelegate());
+ return ProcessInstanceImpl.newInstance(getProcessEngine(), oldProcInst, true);
}
public void addNode(NodeImpl<?> nodeImpl)
Deleted: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -1,299 +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.integration.spec.model;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-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.ProcessDefinition;
-import org.jboss.bpm.api.model.builder.ObjectNameFactory;
-import org.jboss.bpm.api.runtime.Attachments;
-import org.jboss.bpm.api.runtime.ExecutionContext;
-import org.jboss.bpm.api.runtime.Token;
-import org.jboss.bpm.api.runtime.Attachments.Key;
-import org.jboss.bpm.api.runtime.Token.TokenStatus;
-import org.jboss.bpm.api.service.ExecutionContextService;
-import org.jboss.bpm.api.service.ProcessService;
-import org.jbpm.JbpmContext;
-import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.integration.spec.runtime.InvocationProxy;
-import org.jbpm.integration.spec.runtime.TokenImpl;
-import org.jbpm.util.Clock;
-
-/**
- * An integration wrapper
- *
- * @author thomas.diesler at jboss.com
- * @since 15-Nov-2008
- */
-public class ProcessImpl extends AbstractElementImpl<ProcessInstance> implements Process
-{
- private static final long serialVersionUID = 1L;
-
- private ObjectName keyCache;
-
- // [TODO] delegate this property
- private ProcessStatus status = ProcessStatus.None;
-
- public static Process newInstance(ProcessEngine engine, ProcessInstance tmpProc, boolean proxy)
- {
- Process proc = new ProcessImpl(engine, tmpProc);
- if (proxy == true)
- {
- proc = InvocationProxy.newInstance((ProcessImpl)proc, Process.class);
- }
- return proc;
- }
-
- private ProcessImpl(ProcessEngine engine, ProcessInstance tmpProc)
- {
- super(engine, tmpProc, ProcessInstance.class);
-
- if (tmpProc.getId() > 0)
- keyCache = getKey(tmpProc);
- }
-
- // @Override
- public ObjectName getKey()
- {
- ObjectName objKey = keyCache;
- if (objKey == null)
- {
- ProcessInstance delegate = getDelegate();
- objKey = getKey(delegate);
- if (delegate.getId() > 0)
- keyCache = objKey;
- }
- return objKey;
- }
-
- public static ObjectName getKey(ProcessInstance procInst)
- {
- org.jbpm.graph.def.ProcessDefinition oldProcDef = procInst.getProcessDefinition();
- return ObjectNameFactory.create(Constants.ID_DOMAIN + ":proc=" + oldProcDef.getName() + ",id=" + procInst.getId());
- }
-
- // @Override
- public ProcessDefinition getProcessDefinition()
- {
- org.jbpm.graph.def.ProcessDefinition oldProcDef = getDelegate().getProcessDefinition();
- return ProcessDefinitionImpl.newInstance(getProcessEngine(), oldProcDef, true);
- }
-
- // @Override
- public ProcessStatus getProcessStatus()
- {
- Token rootToken = getRootToken();
- TokenStatus tokenStatus = rootToken != null ? rootToken.getTokenStatus() : null;
-
- ProcessInstance delegate = getDelegate();
- if (delegate.isSuspended())
- status = ProcessStatus.Suspended;
-
- if (status == ProcessStatus.Active)
- {
- if (delegate.hasEnded() || tokenStatus == TokenStatus.Destroyed)
- status = ProcessStatus.Completed;
- }
- return status;
- }
-
- public void setProcessStatus(ProcessStatus status)
- {
- this.status = status;
- }
-
- public Token getRootToken()
- {
- Token token = null;
- if (getDelegate().getRootToken() != null)
- {
- token = TokenImpl.newInstance(getProcessEngine(), getDelegate().getRootToken());
- }
- return token;
- }
-
- // @Override
- public String getName()
- {
- return getProcessDefinition().getName();
- }
-
- public Date getEndDate()
- {
- return getDelegate().getEnd();
- }
-
- public Date getStartDate()
- {
- return getDelegate().getStart();
- }
-
- // @Override
- public <T extends Node> T getNode(Class<T> clazz, String name)
- {
- return getProcessDefinition().getNode(clazz, name);
- }
-
- // @Override
- public Node getNode(String name)
- {
- return getProcessDefinition().getNode(name);
- }
-
- // @Override
- public List<Node> getNodes()
- {
- return getProcessDefinition().getNodes();
- }
-
- // @Override
- public <T extends Node> List<T> getNodes(Class<T> clazz)
- {
- return getProcessDefinition().getNodes(clazz);
- }
-
- // @Override
- public Token startProcess()
- {
- return startProcess(null);
- }
-
- // @Override
- public Token startProcess(Attachments contextData)
- {
- ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
- ExecutionContext bpmContext = ctxService.getExecutionContext(true);
- try
- {
- // Register the Process
- ProcessService procService = getProcessEngine().getService(ProcessService.class);
- if (procService.getProcess(getKey()) == null)
- procService.registerProcess(this);
-
- ProcessInstance procInst = getDelegate();
-
- // Initialize the members
- org.jbpm.graph.exe.Token rootToken = new org.jbpm.graph.exe.Token(procInst);
- procInst.setStart(Clock.getCurrentTime());
- procInst.setRootToken(rootToken);
-
- // Create the root token
- Token token = TokenImpl.newInstance(getProcessEngine(), rootToken);
-
- // Save the root token
- JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
- jbpmContext.getSession().save(rootToken);
-
- // Initialize the context data
- if (contextData != null)
- {
- Attachments tokenAtt = token.getAttachments();
- for (Key key : contextData.getAttachmentKeys())
- {
- Object val = contextData.getAttachment(key.getClassPart(), key.getNamePart());
- tokenAtt.addAttachment(key.getClassPart(), key.getNamePart(), val);
- }
- }
-
- // Set process to active
- setProcessStatus(ProcessStatus.Active);
-
- // Fire the start event
- procInst.fireStartEvent(rootToken.getNode());
-
- // Signal the root token
- token.signal();
-
- return token;
- }
- catch (RuntimeException rte)
- {
- setProcessStatus(ProcessStatus.Aborted);
- throw rte;
- }
- finally
- {
- bpmContext.close();
- }
- }
-
- public Set<Token> getTokens()
- {
- return getAllTokens(getRootToken());
- }
-
- public void suspend()
- {
- if (status != ProcessStatus.Active)
- throw new IllegalStateException("Cannot suspend a process in state: " + status);
-
- getDelegate().suspend();
- status = ProcessStatus.Suspended;
- }
-
- public void resume()
- {
- if (status != ProcessStatus.Suspended)
- throw new IllegalStateException("Cannot resume a process in state: " + status);
-
- getDelegate().resume();
- status = ProcessStatus.Active;
- }
-
- public void cancel()
- {
- if (status != ProcessStatus.Active && status != ProcessStatus.Suspended)
- throw new IllegalStateException("Cannot cancel a process in state: " + status);
-
- ProcessInstance delegate = getDelegate();
- delegate.setEnd(new Date());
- delegate.end();
-
- status = ProcessStatus.Cancelled;
- }
-
- 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;
- }
-
- public String toString()
- {
- return "Process[" + getKey() + "]";
- }
-}
Copied: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java (from rev 3233, jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java)
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java (rev 0)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -0,0 +1,298 @@
+/*
+ * 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.integration.spec.model;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.api.Constants;
+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.builder.ObjectNameFactory;
+import org.jboss.bpm.api.runtime.Attachments;
+import org.jboss.bpm.api.runtime.ExecutionContext;
+import org.jboss.bpm.api.runtime.Token;
+import org.jboss.bpm.api.runtime.Attachments.Key;
+import org.jboss.bpm.api.runtime.Token.TokenStatus;
+import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessService;
+import org.jbpm.JbpmContext;
+import org.jbpm.integration.spec.runtime.InvocationProxy;
+import org.jbpm.integration.spec.runtime.TokenImpl;
+import org.jbpm.util.Clock;
+
+/**
+ * An integration wrapper
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 15-Nov-2008
+ */
+public class ProcessInstanceImpl extends AbstractElementImpl<org.jbpm.graph.exe.ProcessInstance> implements ProcessInstance
+{
+ private static final long serialVersionUID = 1L;
+
+ private ObjectName keyCache;
+
+ // [TODO] delegate this property
+ private ProcessStatus status = ProcessStatus.None;
+
+ public static ProcessInstance newInstance(ProcessEngine engine, org.jbpm.graph.exe.ProcessInstance tmpProc, boolean proxy)
+ {
+ ProcessInstance proc = new ProcessInstanceImpl(engine, tmpProc);
+ if (proxy == true)
+ {
+ proc = InvocationProxy.newInstance((ProcessInstanceImpl)proc, ProcessInstance.class);
+ }
+ return proc;
+ }
+
+ private ProcessInstanceImpl(ProcessEngine engine, org.jbpm.graph.exe.ProcessInstance tmpProc)
+ {
+ super(engine, tmpProc, org.jbpm.graph.exe.ProcessInstance.class);
+
+ if (tmpProc.getId() > 0)
+ keyCache = getKey(tmpProc);
+ }
+
+ // @Override
+ public ObjectName getKey()
+ {
+ ObjectName objKey = keyCache;
+ if (objKey == null)
+ {
+ org.jbpm.graph.exe.ProcessInstance delegate = getDelegate();
+ objKey = getKey(delegate);
+ if (delegate.getId() > 0)
+ keyCache = objKey;
+ }
+ return objKey;
+ }
+
+ public static ObjectName getKey(org.jbpm.graph.exe.ProcessInstance procInst)
+ {
+ org.jbpm.graph.def.ProcessDefinition oldProcDef = procInst.getProcessDefinition();
+ return ObjectNameFactory.create(Constants.ID_DOMAIN + ":proc=" + oldProcDef.getName() + ",id=" + procInst.getId());
+ }
+
+ // @Override
+ public ProcessDefinition getProcessDefinition()
+ {
+ org.jbpm.graph.def.ProcessDefinition oldProcDef = getDelegate().getProcessDefinition();
+ return ProcessDefinitionImpl.newInstance(getProcessEngine(), oldProcDef, true);
+ }
+
+ // @Override
+ public ProcessStatus getProcessStatus()
+ {
+ Token rootToken = getRootToken();
+ TokenStatus tokenStatus = rootToken != null ? rootToken.getTokenStatus() : null;
+
+ org.jbpm.graph.exe.ProcessInstance delegate = getDelegate();
+ if (delegate.isSuspended())
+ status = ProcessStatus.Suspended;
+
+ if (status == ProcessStatus.Active)
+ {
+ if (delegate.hasEnded() || tokenStatus == TokenStatus.Destroyed)
+ status = ProcessStatus.Completed;
+ }
+ return status;
+ }
+
+ public void setProcessStatus(ProcessStatus status)
+ {
+ this.status = status;
+ }
+
+ public Token getRootToken()
+ {
+ Token token = null;
+ if (getDelegate().getRootToken() != null)
+ {
+ token = TokenImpl.newInstance(getProcessEngine(), getDelegate().getRootToken());
+ }
+ return token;
+ }
+
+ // @Override
+ public String getName()
+ {
+ return getProcessDefinition().getName();
+ }
+
+ public Date getEndDate()
+ {
+ return getDelegate().getEnd();
+ }
+
+ public Date getStartDate()
+ {
+ return getDelegate().getStart();
+ }
+
+ // @Override
+ public <T extends Node> T getNode(Class<T> clazz, String name)
+ {
+ return getProcessDefinition().getNode(clazz, name);
+ }
+
+ // @Override
+ public Node getNode(String name)
+ {
+ return getProcessDefinition().getNode(name);
+ }
+
+ // @Override
+ public List<Node> getNodes()
+ {
+ return getProcessDefinition().getNodes();
+ }
+
+ // @Override
+ public <T extends Node> List<T> getNodes(Class<T> clazz)
+ {
+ return getProcessDefinition().getNodes(clazz);
+ }
+
+ // @Override
+ public Token startProcess()
+ {
+ return startProcess(null);
+ }
+
+ // @Override
+ public Token startProcess(Attachments contextData)
+ {
+ ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
+ ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ try
+ {
+ // Register the Process
+ ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ if (procService.getProcess(getKey()) == null)
+ procService.registerProcess(this);
+
+ org.jbpm.graph.exe.ProcessInstance procInst = getDelegate();
+
+ // Initialize the members
+ org.jbpm.graph.exe.Token rootToken = new org.jbpm.graph.exe.Token(procInst);
+ procInst.setStart(Clock.getCurrentTime());
+ procInst.setRootToken(rootToken);
+
+ // Create the root token
+ Token token = TokenImpl.newInstance(getProcessEngine(), rootToken);
+
+ // Save the root token
+ JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
+ jbpmContext.getSession().save(rootToken);
+
+ // Initialize the context data
+ if (contextData != null)
+ {
+ Attachments tokenAtt = token.getAttachments();
+ for (Key key : contextData.getAttachmentKeys())
+ {
+ Object val = contextData.getAttachment(key.getClassPart(), key.getNamePart());
+ tokenAtt.addAttachment(key.getClassPart(), key.getNamePart(), val);
+ }
+ }
+
+ // Set process to active
+ setProcessStatus(ProcessStatus.Active);
+
+ // Fire the start event
+ procInst.fireStartEvent(rootToken.getNode());
+
+ // Signal the root token
+ token.signal();
+
+ return token;
+ }
+ catch (RuntimeException rte)
+ {
+ setProcessStatus(ProcessStatus.Aborted);
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
+ }
+
+ public Set<Token> getTokens()
+ {
+ return getAllTokens(getRootToken());
+ }
+
+ public void suspend()
+ {
+ if (status != ProcessStatus.Active)
+ throw new IllegalStateException("Cannot suspend a process in state: " + status);
+
+ getDelegate().suspend();
+ status = ProcessStatus.Suspended;
+ }
+
+ public void resume()
+ {
+ if (status != ProcessStatus.Suspended)
+ throw new IllegalStateException("Cannot resume a process in state: " + status);
+
+ getDelegate().resume();
+ status = ProcessStatus.Active;
+ }
+
+ public void cancel()
+ {
+ if (status != ProcessStatus.Active && status != ProcessStatus.Suspended)
+ throw new IllegalStateException("Cannot cancel a process in state: " + status);
+
+ org.jbpm.graph.exe.ProcessInstance delegate = getDelegate();
+ delegate.setEnd(new Date());
+ delegate.end();
+
+ status = ProcessStatus.Cancelled;
+ }
+
+ 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;
+ }
+
+ public String toString()
+ {
+ return "Process[" + getKey() + "]";
+ }
+}
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/StartEventImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -24,10 +24,10 @@
import java.util.List;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.StartEvent;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.StartState;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/TaskImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -24,10 +24,10 @@
import java.util.List;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.Task;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
/**
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/UserTaskImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -22,8 +22,8 @@
package org.jbpm.integration.spec.model;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.incubator.client.UserTaskCallback;
import org.jboss.bpm.incubator.model.Message;
import org.jboss.bpm.incubator.model.UserTask;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/WaitStateImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -21,9 +21,9 @@
*/
package org.jbpm.integration.spec.model;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.WaitState;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.node.State;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/builder/ProcessBuilderImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -29,10 +29,9 @@
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.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.Expression.ExpressionLanguage;
@@ -40,6 +39,7 @@
import org.jboss.bpm.api.model.Task.TaskType;
import org.jboss.bpm.api.model.builder.GatewayBuilder;
import org.jboss.bpm.api.model.builder.ProcessBuilder;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.def.Node.NodeType;
import org.jbpm.graph.node.Decision;
@@ -56,7 +56,7 @@
import org.jbpm.integration.spec.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 15-Nov-2008
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/InvocationProxy.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -28,10 +28,10 @@
import java.util.Arrays;
import java.util.List;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.AbstractElement;
import org.jboss.bpm.api.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.integration.spec.model.AbstractElementImpl;
/**
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -28,22 +28,22 @@
import javax.management.ObjectName;
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.SequenceFlow;
-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.ExecutionContext;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.JbpmContext;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.Transition;
import org.jbpm.integration.spec.model.AbstractElementImpl;
import org.jbpm.integration.spec.model.NodeImpl;
-import org.jbpm.integration.spec.model.ProcessImpl;
+import org.jbpm.integration.spec.model.ProcessInstanceImpl;
/**
* An integration wrapper
@@ -93,9 +93,9 @@
return ObjectNameFactory.create(Constants.ID_DOMAIN + ":id=" + oldToken.getId());
}
- public Process getProcess()
+ public ProcessInstance getProcess()
{
- return ProcessImpl.newInstance(getProcessEngine(), getDelegate().getProcessInstance(), true);
+ return ProcessInstanceImpl.newInstance(getProcessEngine(), getDelegate().getProcessInstance(), true);
}
// @Override
@@ -224,7 +224,7 @@
}
catch (RuntimeException rte)
{
- ProcessImpl procImpl = InvocationProxy.getUnderlying(getProcess(), ProcessImpl.class);
+ ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(getProcess(), ProcessInstanceImpl.class);
procImpl.setProcessStatus(ProcessStatus.Aborted);
throw rte;
}
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DeploymentServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -28,10 +28,10 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.deployment.Deployment;
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.internal.AbstractDeploymentService;
import org.jbpm.integration.spec.deployment.PARDeployment;
import org.jbpm.integration.spec.deployment.XMLDeployment;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/DialectHandlerServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -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: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionContextServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -23,9 +23,9 @@
// $Id$
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.runtime.BasicAttachments;
import org.jboss.bpm.api.runtime.ExecutionContext;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.internal.AbstractExecutionContextService;
import org.jbpm.JbpmContext;
import org.jbpm.integration.spec.client.ProcessEngineImpl;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ExecutionServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -28,10 +28,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.runtime.Token;
import org.jboss.bpm.api.service.ExecutionService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
ProcessService procService = getProcessEngine().getService(ProcessService.class);
for (ObjectName procID : procService.getProcesses())
{
- Process proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getProcess(procID);
for (Token aux : proc.getTokens())
{
tokens.add(aux);
@@ -78,7 +78,7 @@
ProcessService procService = getProcessEngine().getService(ProcessService.class);
for (ObjectName procID : procService.getProcesses())
{
- Process proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getProcess(procID);
for (Token aux : proc.getTokens())
{
if (aux.getKey().equals(tokenID))
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/IdentityServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -28,7 +28,7 @@
import java.util.Set;
import org.jboss.bpm.api.NotImplementedException;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.internal.AbstractIdentityService;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/MutableService.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/MutableService.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/MutableService.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -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: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/NoopPersistenceServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -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(NoopPersistenceServiceImpl.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: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessBuilderServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -23,13 +23,13 @@
// $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.model.builder.ProcessBuilder;
import org.jboss.bpm.api.service.ProcessBuilderService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jbpm.integration.spec.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: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessDefinitionServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -29,11 +29,11 @@
import javax.management.ObjectName;
-import org.jboss.bpm.api.client.ProcessEngine;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
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.jbpm.JbpmContext;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/ProcessServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -31,20 +31,19 @@
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.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
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.jbpm.JbpmContext;
import org.jbpm.db.GraphSession;
-import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.integration.spec.model.ProcessDefinitionImpl;
-import org.jbpm.integration.spec.model.ProcessImpl;
+import org.jbpm.integration.spec.model.ProcessInstanceImpl;
import org.jbpm.integration.spec.runtime.InvocationProxy;
import org.jbpm.integration.spec.runtime.NodeInterceptor;
import org.slf4j.Logger;
@@ -87,19 +86,19 @@
* Get a Process for a given id
*/
// @Override
- public Process getProcess(ObjectName procID)
+ public ProcessInstance getProcess(ObjectName procID)
{
ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- Process proc = null;
+ ProcessInstance proc = null;
GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession();
- ProcessInstance oldProc = graphSession.getProcessInstance(adaptKey(procID));
+ org.jbpm.graph.exe.ProcessInstance oldProc = graphSession.getProcessInstance(adaptKey(procID));
if (oldProc != null)
{
- proc = ProcessImpl.newInstance(getProcessEngine(), oldProc, true);
+ proc = ProcessInstanceImpl.newInstance(getProcessEngine(), oldProc, true);
}
return proc;
@@ -129,8 +128,8 @@
GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession();
for (Object item : graphSession.findProcessInstances(id))
{
- ProcessInstance oldProc = (ProcessInstance)item;
- procs.add(ProcessImpl.getKey(oldProc));
+ org.jbpm.graph.exe.ProcessInstance oldProc = (org.jbpm.graph.exe.ProcessInstance)item;
+ procs.add(ProcessInstanceImpl.getKey(oldProc));
}
}
}
@@ -161,8 +160,8 @@
GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession();
for (Object item : graphSession.findProcessInstances(id))
{
- ProcessInstance oldProc = (ProcessInstance)item;
- Process auxProc = ProcessImpl.newInstance(getProcessEngine(), oldProc, true);
+ org.jbpm.graph.exe.ProcessInstance oldProc = (org.jbpm.graph.exe.ProcessInstance)item;
+ ProcessInstance auxProc = ProcessInstanceImpl.newInstance(getProcessEngine(), oldProc, true);
if (status == null || auxProc.getProcessStatus() == status)
procs.add(auxProc.getKey());
}
@@ -177,7 +176,7 @@
/**
* Register a Process.
*/
- public Process registerProcess(Process proc)
+ public ProcessInstance registerProcess(ProcessInstance proc)
{
log.debug("registerProcess: " + proc);
@@ -199,20 +198,20 @@
if (procDefService.getProcessDefinition(procDef.getKey()) == null)
procDefService.registerProcessDefinition(procDef);
- ProcessImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessImpl.class);
- ProcessInstance procInst = procImpl.getDelegate();
+ ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
+ org.jbpm.graph.exe.ProcessInstance oldProcInst = procImpl.getDelegate();
// Make sure the process definition from this session is associated with the process instance
procDef = procDefService.getProcessDefinition(procDef.getKey());
ProcessDefinitionImpl procDefImpl = InvocationProxy.getUnderlying(procDef, ProcessDefinitionImpl.class);
- procInst.setProcessDefinition(procDefImpl.getDelegate());
+ oldProcInst.setProcessDefinition(procDefImpl.getDelegate());
// Save the ProcessInstance
JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
- jbpmContext.save(procInst);
+ jbpmContext.save(oldProcInst);
procImpl.setProcessStatus(ProcessStatus.Ready);
- proc = InvocationProxy.newInstance(procImpl, Process.class);
+ proc = InvocationProxy.newInstance(procImpl, ProcessInstance.class);
return proc;
}
finally
@@ -232,12 +231,12 @@
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- Process proc = getProcess(procID);
+ ProcessInstance proc = getProcess(procID);
if (proc != null)
{
log.debug("unregisterProcess: " + proc);
- ProcessImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessImpl.class);
+ ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
GraphSession graphSession = bpmContext.getAttachment(JbpmContext.class).getGraphSession();
graphSession.deleteProcessInstance(procImpl.getDelegate());
removed = true;
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -29,15 +29,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.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.service.internal.AbstractTaskService;
import org.jboss.bpm.api.task.Task;
import org.jbpm.JbpmContext;
-import org.jbpm.integration.spec.model.ProcessImpl;
+import org.jbpm.integration.spec.model.ProcessInstanceImpl;
import org.jbpm.integration.spec.runtime.InvocationProxy;
import org.jbpm.integration.spec.task.TaskImpl;
import org.jbpm.taskmgmt.exe.TaskInstance;
@@ -68,12 +68,12 @@
try
{
ProcessService procService = getProcessEngine().getService(ProcessService.class);
- Process proc = procService.getProcess(procID);
+ ProcessInstance proc = procService.getProcess(procID);
if (proc == null)
throw new IllegalStateException("Cannot obtain process: " + procID);
List<Task> tasks = new ArrayList<Task>();
- ProcessImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessImpl.class);
+ ProcessInstanceImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessInstanceImpl.class);
Collection<TaskInstance> taskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
for (TaskInstance taskInst : taskInstances)
{
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -28,10 +28,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.Token;
import org.jboss.bpm.api.service.ExecutionService;
+import org.jboss.bpm.api.service.ProcessEngine;
import org.jboss.bpm.api.task.Task;
import org.jbpm.integration.spec.model.AbstractElementImpl;
import org.jbpm.integration.spec.runtime.InvocationProxy;
Modified: jbpm3/trunk/modules/integration/spec/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/resources/jbpm-cfg-beans.xml 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/resources/jbpm-cfg-beans.xml 2008-12-05 17:51:55 UTC (rev 3236)
@@ -5,7 +5,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" 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>
Deleted: jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider 2008-12-05 17:51:55 UTC (rev 3236)
@@ -1 +0,0 @@
-org.jboss.bpm.api.client.internal.MicrocontainerConfigurationProvider
\ No newline at end of file
Copied: jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider (from rev 3233, jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.client.ConfigurationProvider)
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider (rev 0)
+++ jbpm3/trunk/modules/integration/spec/src/main/resources/org.jboss.bpm.api.config.ConfigurationProvider 2008-12-05 17:51:55 UTC (rev 3236)
@@ -0,0 +1 @@
+org.jboss.bpm.api.config.internal.MicrocontainerConfigurationProvider
\ No newline at end of file
Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentPARTest.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -29,7 +29,7 @@
import java.util.Map;
import org.jboss.bpm.api.deployment.Deployment;
-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.runtime.Token;
import org.jboss.bpm.api.service.DeploymentService;
@@ -54,7 +54,7 @@
ProcessDefinition procDef = depService.deploy(dep);
assertNotNull("ProcDef not null", procDef);
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/deployment/DeploymentXMLTest.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -26,9 +26,9 @@
import java.net.URL;
import org.jboss.bpm.api.deployment.Deployment;
-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.runtime.Token;
import org.jboss.bpm.api.service.DeploymentService;
import org.jboss.bpm.api.service.internal.AbstractDeploymentService;
@@ -52,7 +52,7 @@
ProcessDefinition procDef = depService.deploy(dep);
assertNotNull("ProcDef not null", procDef);
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
assertEquals("Node name", "a", token.getCurrentNode().getName());
Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-05 17:50:06 UTC (rev 3235)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-05 17:51:55 UTC (rev 3236)
@@ -25,7 +25,7 @@
import org.jboss.bpm.api.deployment.Deployment;
import org.jboss.bpm.api.deployment.SimpleDeployment;
-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.runtime.Token;
import org.jboss.bpm.api.service.DeploymentService;
@@ -64,7 +64,7 @@
ProcessDefinition procDef = depService.deploy(dep);
try
{
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
@@ -104,7 +104,7 @@
ProcessDefinition procDef = depService.deploy(dep);
try
{
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
@@ -148,7 +148,7 @@
ProcessDefinition procDef = depService.deploy(dep);
try
{
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
@@ -190,7 +190,7 @@
ProcessDefinition procDef = depService.deploy(dep);
try
{
- Process proc = procDef.newInstance();
+ ProcessInstance proc = procDef.newInstance();
Token token = proc.startProcess();
token.signal("cancel");
More information about the jbpm-commits
mailing list