Changeset 1573 for branches/ExampleWorkflow

Timestamp:

05/31/07 15:10:00 (18 months ago)

Author:

jmoore

Message:

Example workflow improvements (esp. DTD related)

Location:

branches/ExampleWorkflow

Files:

• . (modified) (1 prop)
• src/java/ome/Workflow.java (modified) (2 diffs)
• src/java/ome/wf1/processdefinition.xml (modified) (1 diff)

branches/ExampleWorkflow/src/java/ome/Workflow.java

@@ -1 +1 @@
 package ome;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -7 +8 @@
 import org.jbpm.graph.exe.ProcessInstance;
 
-interface process {
-String xml = 
-"<process-definition "+
-"xmlns=''  name='wf1'>"+
-" <start-state name='start'>"+
-"    <transition name='starting' to='node1'>"+
-"      <action name='' class='ome.Log'></action>"+
-"    </transition>"+
-" </start-state>"+
-" <node name='node1'>"+
-"    <action name='' class='ome.AlgorithmHandler'>" +
-"        <wrapperClass>ome.AlgorithmWrapper</wrapperClass>"+
-"        <moduleName>Fourier Transform</moduleName>"+
-"        <category>Maths.</category>"+
-"        <moduleType>OME::Analysis::Handlers::MatlabHandler</moduleType>"+
-"        <programID>FourierTransform</programID>"+
-"        <featureIterator>ROI</featureIterator>"+
-"        <id>urn:lsid:openmicroscopy.org:Module:7503</id>"+
-"    </action>"+
-"    <transition name='ending' to='end1'>"+
-"        <action name='' class='ome.Log'></action>"+
-"    </transition>"+
-" </node>"+
-" <end-state name='end1'>"+
-" </end-state>"+
-"</process-definition>";
-}
-
 public interface Workflow {
-    long submit(String wf, Map inputs);
+    long submit(String wf, Map inputs) throws Exception;
 }
 
 class client {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         Workflow wf = new Wfimpl(); // Remote proxy
         Map inputs = new HashMap();
         inputs.put("A", "B");
-        wf.submit(process.xml, inputs);
+        wf.submit("/ome/wf1/processdefinition.xml", inputs);
     }
 }
 
 class Wfimpl implements Workflow {
-    public long submit(String wf, Map inputs) {
-        ProcessDefinition pd = ProcessDefinition.parseXmlString(wf);
+    public long submit(String wf, Map inputs) throws Exception {
+        InputStream is = Wfimpl.class.getResourceAsStream(wf);
+        ProcessDefinition pd = ProcessDefinition.parseXmlInputStream(is);
         ProcessInstance pi = new ProcessInstance(pd);
         pi.getContextInstance().addVariables(inputs);

branches/ExampleWorkflow/src/java/ome/wf1/processdefinition.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE process-definition SYSTEM "process-definition.dtd">
+<!DOCTYPE process-definition PUBLIC 
+  "-//jBpm/jBpm Mapping DTD 2.0 beta3//EN" 
+  "http://jbpm.org/dtd/processdefinition-2.0.dtd">
 
 <process-definition xmlns=''  name='wf1'>