[jbpm-commits] JBoss JBPM SVN: r1776 - in jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm: model/internal and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Jul 30 15:18:21 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-30 15:18:21 -0400 (Wed, 30 Jul 2008)
New Revision: 1776
Modified:
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
Log:
GWT App ok
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-07-30 13:48:44 UTC (rev 1775)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/client/internal/ProcessManagerImpl.java 2008-07-30 19:18:21 UTC (rev 1776)
@@ -26,6 +26,8 @@
import java.util.Map;
import java.util.Set;
+import javax.management.ObjectName;
+
import org.jboss.bpm.client.DialectHandler;
import org.jboss.bpm.client.DialectRegistry;
import org.jboss.bpm.client.ExecutionManager;
@@ -53,7 +55,7 @@
this.dialectRegistry = dialectRegistry;
}
- public void startProcess(String name, Attachments att)
+ public ObjectName startProcess(String name, Attachments att)
{
Set<Process> procSet = findProcessByName(name, Status.Ready);
if (procSet.size() == 0)
@@ -61,14 +63,14 @@
if (procSet.size() > 1)
throw new IllegalStateException("Multiple processes with name: " + name);
+ // Copy and register a copy of the process instance
ProcessImpl proc = (ProcessImpl)procSet.iterator().next();
+ registerProcess(proc.copyProcess());
- // Copy and register a copy of the process instance
- Process procCopy = (ProcessImpl)proc.copyProcess();
- registerProcess(procCopy);
-
// Start the process in a thread
ExecutionManager exm = getProcessEngine().getExecutionManager();
exm.startProcess(proc, att);
+
+ return proc.getID();
}
}
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-07-30 13:48:44 UTC (rev 1775)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ActivityImpl.java 2008-07-30 19:18:21 UTC (rev 1776)
@@ -25,9 +25,7 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
@@ -38,15 +36,12 @@
import org.jboss.bpm.model.OutputSet;
import org.jboss.bpm.model.Process;
import org.jboss.bpm.model.Property;
-import org.jboss.bpm.model.PropertyBuilder;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
import org.jboss.bpm.runtime.ExecutionContext;
import org.jboss.bpm.runtime.ExecutionHandler;
import org.jboss.bpm.runtime.FlowHandler;
import org.jboss.bpm.runtime.FlowScheduler;
import org.jboss.bpm.runtime.MutablePropertySupport;
import org.jboss.bpm.runtime.Token;
-import org.mvel.MVEL;
/**
* An activity is a generic term for work that a company or organization performs via business processes. An activity
@@ -245,38 +240,6 @@
{
handler.execute(token, inputSet, outputSet);
}
- // Assume the the single IORule actually mapps the data
- else if (outputSets.size() == 1 && ioRules.size() == 1)
- {
- PropertyBuilder propBuilder = new PropertyBuilderImpl();
- OutputSet outSet = outputSets.get(0);
- if (outSet.getProperties().size() == 1)
- {
- Expression expr = ioRules.get(0);
- if (expr.getExpressionLanguage() == ExpressionLanguage.MVEL)
- {
- String mvel = expr.getExpressionBody();
- Map<String, Object> vars = new HashMap<String, Object>();
- for (Property prop : inputSet.getProperties())
- {
- String name = prop.getName();
- Object value = prop.getValue().getExpressionBody();
- vars.put(name, value);
- }
- Object result = MVEL.eval(mvel, vars);
- if (result != null)
- {
- String name = outSet.getPropertyNames().get(0);
- Property prop = propBuilder.newProperty(name, result.toString());
- outputSet.addProperty(prop);
- }
- }
- else
- {
- throw new IllegalStateException("Unsupported expression language: " + expr.getExpressionLanguage());
- }
- }
- }
}
/**
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-30 13:48:44 UTC (rev 1775)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ProcessImpl.java 2008-07-30 19:18:21 UTC (rev 1776)
@@ -31,6 +31,8 @@
import java.util.Collections;
import java.util.List;
+import javax.management.ObjectName;
+
import org.jboss.bpm.InvalidProcessException;
import org.jboss.bpm.NotImplementedException;
import org.jboss.bpm.client.ProcessEngine;
@@ -178,16 +180,16 @@
}
}
- public void startProcess()
+ public ObjectName startProcess()
{
- startProcess(null);
+ return startProcess(null);
}
- public void startProcess(Attachments att)
+ public ObjectName startProcess(Attachments att)
{
ProcessEngine engine = ProcessEngineLocator.locateProcessEngine();
ProcessManager pm = engine.getProcessManager();
- pm.startProcess(getName(), att);
+ return pm.startProcess(getName(), att);
}
public void waitForEnd()
Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-07-30 13:48:44 UTC (rev 1775)
+++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/ReceiveTaskImpl.java 2008-07-30 19:18:21 UTC (rev 1776)
@@ -51,7 +51,7 @@
@SuppressWarnings("serial")
public class ReceiveTaskImpl extends TaskImpl implements ReceiveTask, MessageListener
{
- private static final int RECEIVE_TIMEOUT = 5000;
+ private static final int RECEIVE_TIMEOUT = 30000;
// provide logging
private static final Log log = LogFactory.getLog(ReceiveTaskImpl.class);
More information about the jbpm-commits
mailing list