[jbpm-commits] JBoss JBPM SVN: r3244 - in jbpm3/branches/tdiesler/modules/integration: spec and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 16:14:05 -0500 (Fri, 05 Dec 2008) New Revision: 3244 Modified: jbpm3/branches/tdiesler/modules/integration/jboss42/src/main/etc/par-deployer.xml jbpm3/branches/tdiesler/modules/integration/spec/deploy.sh jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java Log: WIPO Modified: jbpm3/branches/tdiesler/modules/integration/jboss42/src/main/etc/par-deployer.xml =================================================================== --- jbpm3/branches/tdiesler/modules/integration/jboss42/src/main/etc/par-deployer.xml 2008-12-05 21:13:30 UTC (rev 3243) +++ jbpm3/branches/tdiesler/modules/integration/jboss42/src/main/etc/par-deployer.xml 2008-12-05 21:14:05 UTC (rev 3244) @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- The JBoss service configuration file for the PAR deployer service. - $Id$ +<!-- + The JBoss service configuration file for the PAR deployer service. + + $Id$ --> <server> - <mbean code="org.jbpm.integration.jboss42.PARSubDeployer" - name="jboss.deployer:service=PARDeployer"> + <mbean code="org.jbpm.integration.jboss42.PARSubDeployer" name="jboss.deployer:service=PARDeployer"> </mbean> </server> \ No newline at end of file Modified: jbpm3/branches/tdiesler/modules/integration/spec/deploy.sh =================================================================== --- jbpm3/branches/tdiesler/modules/integration/spec/deploy.sh 2008-12-05 21:13:30 UTC (rev 3243) +++ jbpm3/branches/tdiesler/modules/integration/spec/deploy.sh 2008-12-05 21:14:05 UTC (rev 3244) @@ -1,4 +1,6 @@ #! /bin/bash +mvn -o install + rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/bpm-spec-integration-jbpm3*.jar cp target/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans Modified: jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-05 21:13:30 UTC (rev 3243) +++ jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-05 21:14:05 UTC (rev 3244) @@ -30,8 +30,8 @@ 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.ProcessInstance; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.runtime.Attachments; import org.jboss.bpm.api.runtime.ExecutionContext; @@ -58,9 +58,6 @@ 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); @@ -96,7 +93,7 @@ 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()); + return ObjectNameFactory.create(Constants.ID_DOMAIN + ":procInst=" + oldProcDef.getName() + ",id=" + procInst.getId()); } // @Override @@ -112,21 +109,21 @@ Token rootToken = getRootToken(); TokenStatus tokenStatus = rootToken != null ? rootToken.getTokenStatus() : null; + ProcessStatus status = ProcessStatus.Active; + 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; - } + if (delegate.hasEnded() || tokenStatus == TokenStatus.Destroyed) + status = ProcessStatus.Completed; + return status; } public void setProcessStatus(ProcessStatus status) { - this.status = status; + //this.status = status; } public Token getRootToken() @@ -251,32 +248,31 @@ public void suspend() { + ProcessStatus status = getProcessStatus(); if (status != ProcessStatus.Active) throw new IllegalStateException("Cannot suspend a process in state: " + status); getDelegate().suspend(); - status = ProcessStatus.Suspended; } public void resume() { + ProcessStatus status = getProcessStatus(); if (status != ProcessStatus.Suspended) throw new IllegalStateException("Cannot resume a process in state: " + status); getDelegate().resume(); - status = ProcessStatus.Active; } public void cancel() { + ProcessStatus status = getProcessStatus(); 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) @@ -293,6 +289,6 @@ public String toString() { - return "Process[" + getKey() + "]"; + return "ProcessInstance[" + getKey() + ",status=" + getProcessStatus() + "]"; } } Modified: jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 21:13:30 UTC (rev 3243) +++ jbpm3/branches/tdiesler/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 21:14:05 UTC (rev 3244) @@ -63,14 +63,14 @@ { return InvocationProxy.newInstance(new TokenImpl(engine, tmpToken), Token.class); } - + private TokenImpl(ProcessEngine engine, org.jbpm.graph.exe.Token tmpToken) { super(engine, tmpToken, org.jbpm.graph.exe.Token.class); ContextInstance context = tmpToken.getProcessInstance().getContextInstance(); this.att = new TokenAttachmentDelegate(this, context); - + if (tmpToken.getId() > 0) keyCache = getKey(tmpToken); } @@ -217,7 +217,7 @@ lastFlow = currNode.getOutFlowByTransition(trans); getDelegate().signal(); } - + // Save the token JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class); jbpmContext.save(getDelegate()); @@ -236,23 +236,10 @@ public String toString() { - ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class); - ExecutionContext bpmContext = ctxService.getExecutionContext(true); - try - { - Node currNode = getCurrentNode(); - int children = getChildTokens().size(); - boolean root = getParentToken() == null; - TokenStatus status = getTokenStatus(); - return "[key=" + getKey() + ",root=" + root + ",status=" + status + ",node=" + currNode + ",flow=" + lastFlow + ",child=" + children + "]"; - } - catch (RuntimeException rte) - { - throw rte; - } - finally - { - bpmContext.close(); - } + Node currNode = getCurrentNode(); + int children = getChildTokens().size(); + boolean root = getParentToken() == null; + TokenStatus status = getTokenStatus(); + return "[key=" + getKey() + ",root=" + root + ",status=" + status + ",node=" + currNode + ",flow=" + lastFlow + ",child=" + children + "]"; } }