[jbpm-commits] JBoss JBPM SVN: r5161 - in jbpm4/branches/jimma/modules/migration/src: main/java/org/jbpm/jpdl/internal/convert/action and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Jun 29 23:34:44 EDT 2009


Author: jim.ma
Date: 2009-06-29 23:34:44 -0400 (Mon, 29 Jun 2009)
New Revision: 5161

Added:
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java
Modified:
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java
   jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java
   jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml
   jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
   jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java
Log:
Added comments to some class and mail node converter.there is no schema definition for mail node, so still throw unsupport mail node warning for it

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -23,6 +23,10 @@
 
 import java.io.Serializable;
 
+/**
+ * This originates from jbpm3 code base
+ *
+ */
 public class Access implements Serializable {
 
   private static final long serialVersionUID = 1L;

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -34,6 +34,12 @@
 import org.dom4j.io.SAXReader;
 import org.jbpm.jpdl.internal.convert.action.Action;
 
+/**
+ * This originates from jbpm3 code base
+ * It reads the "META-INF/action.converter.types.xml" configuration to load the class to convert 
+ * Action elements
+ */
+
 public class ActionConverterTypes {
 
 	public static Set<Class<? extends Action>> getActionTypes() {

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -23,7 +23,11 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
+/**
+ * Wraps the validated command line arguments
+ * @author<a href="mailto:ema at redhat.com>Jim Ma</a> 
+ *
+ */
 public class ConverterContext {
 	public static final String PROCESS_FILE = "processFile"; 
 	public static final String PROCESS_FILE_URL = "processFileURL";
@@ -45,11 +49,7 @@
 		return paramMap.get(key);
 		
 	}
-	
-	public String getUasage() {
-		return "java org.jbpm.jpdl.internal.convert.JpdlConverterTool jdpl-process.xml";
-	}
-	
+		
 	public void refresh() {
 		paramMap = null;
 	}

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -44,7 +44,11 @@
 import org.jbpm.jpdl.internal.convert.node.StartState;
 import org.jbpm.jpdl.internal.convert.node.TaskNode;
 import org.xml.sax.InputSource;
-
+/**
+ * This is the trimmed down version JpdlXmlReader.
+ * It parses the jpdl3 process file and convert it to jpdl4 model
+ *
+ */
 public class Jpdl3ConverterReader implements ProblemListener {
   private static final Log logger = LogFactory.getLog(Jpdl3ConverterReader.class);
   private static String JPDL4NS = "http://jbpm.org/4.0/jpdl";
@@ -262,7 +266,7 @@
       Element nodeElement = (Element)nodeElementIter.next();
       String nodeName = nodeElement.getName();
       // get the node type
-      
+      //This will affect the transition, so add error and throw exception
       if ("super-state".equalsIgnoreCase(nodeName) || "mail-node".equalsIgnoreCase(nodeName)) {
     	  this.addError("Unsupported " + nodeName + " conversion : <" + nodeName + " name=\"" + element.attributeValue("name") + "\"");
       }
@@ -496,8 +500,8 @@
 	    }
 	    else if ((actorId != null) || (pooledActors != null))
 	    {
-	      //TODO:Ask question
-	      task4.addComment("Please Update the AssignmentHandler and implement org.jbpm.api.task.AssignmentHandler to create your own AssignmentHandler");
+	      //TODO:Ask question and revisit it 
+	      task4.addComment("Please Update the AssignmentHandler and implement org.jbpm.api.task.AssignmentHandler to create your own AssignmentHandler.");
 	      Element assignmentHandler = task4.addElement("assignment-handler");
 	      assignmentHandler.addAttribute("class", "org.jbpm.taskmgmt.assignment.ActorAssignmentHandler");
 	      
@@ -884,6 +888,6 @@
   private Element findNode(String name) {
 	  return nodeCollection.get(name);
   }
-
+  
   private static final Log log = LogFactory.getLog(Jpdl3ConverterReader.class);
 }

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -31,6 +31,12 @@
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 
+/**
+ * Conversion command line tool
+ * <p>It parses validates the command line arguments
+ * @author<a href="mailto:ema at redhat.com>Jim Ma</a> 
+ *
+ */
 public class JpdlConverterTool {   
 	public static void main(String[] args) {
 		JpdlConverterTool converter = new JpdlConverterTool();

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -35,6 +35,11 @@
 import org.jbpm.jpdl.internal.convert.node.Node;
 
 
+/**
+ * This originates from jbpm3 code base
+ * It reads the "META-INF/node.converter.types.xml" configuration to load the class to convert 
+ * Node elements
+ */
 public class NodeConverterTypes {
 
 	  public static Set<String> getNodeTypes() {

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -25,6 +25,10 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+/**
+ * This class orginates from jpbm3 codebase
+ *
+ */
 public class Problem implements Serializable {
   
   private static final long serialVersionUID = 1L;

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -23,6 +23,10 @@
 
 import java.io.Serializable;
 
+/**
+ * This class orginates from jpbm3 codebase
+ *
+ */
 public interface ProblemListener extends Serializable {
 
   void addProblem(Problem problem);

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -24,7 +24,7 @@
 import java.io.Serializable;
 
 /**
- * This is orignally from jbpm3 codebase.
+ * This originates from jbpm3 codebase.
  * specifies access to a variable.
  * Variable access is used in 3 situations:
  * 1) process-state 

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -24,6 +24,11 @@
 import org.dom4j.Element;
 import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader;
 
+/**
+ * The Action class to create the converted action or script elements and map the specific attributes
+ * @author<a href="mailto:ema at redhat.com>Jim Ma</a> 
+ *
+ */
 public class Action {
 
 	protected Element convertedElement = null;

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -25,6 +25,12 @@
 import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader;
 import org.jbpm.jpdl.internal.convert.Problem;
 
+/**
+ * Create the converted timer element and map the specific attributes
+ * @author<a href="mailto:ema at redhat.com>Jim Ma</a> 
+ *
+ */
+
 public class CreateTimerAction extends Action {
 	@Override
 	public Element createConvertedElement(Element actionElement,

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -23,7 +23,11 @@
 
 import org.dom4j.Element;
 import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader;
-
+/**
+ * Create the converted script element and map the specific attributes
+ * @author<a href="mailto:ema at redhat.com>Jim Ma</a> 
+ *
+ */
 public class Script extends Action {
 	
 	public Element createConvertedElement(Element actionElement, Element jpdl4Doc) {

Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java	                        (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -0,0 +1,94 @@
+/*
+ * 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.jpdl.internal.convert.node;
+
+import org.dom4j.Element;
+import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader;
+
+public class MailNode extends Node {
+	public Element createConvertedElement(Element jpdl4Doc) {
+		convertedElement = jpdl4Doc.addElement("mail");
+		return convertedElement;
+	}
+
+	public void read(Jpdl3ConverterReader reader) {
+		String template = nodeElement.attributeValue("template");
+		String actors = nodeElement.attributeValue("actors");
+		String to = nodeElement.attributeValue("to");
+		String subject = reader.getProperty("subject", nodeElement);
+		String text = reader.getProperty("text", nodeElement);
+        if (template != null) {
+        	convertedElement.addAttribute("template", template);
+        }
+        //TODO: handler actors and look at if there is the equivalent AddressResolver in jbpm4
+        if (actors != null) {
+        	
+        }
+        if (to != null) {
+        	Element toElement = convertedElement.addElement("to");
+        	//TODO: handler expression
+        	toElement.addAttribute("to", to);
+        }
+        if (subject != null) {
+        	Element subjectElement = convertedElement.addElement("subject");
+        	subjectElement.addText(subject);
+        }
+        if (text != null) {
+        	Element textElement = convertedElement.addElement("text");
+        	textElement.addText(text);
+        }        
+	}
+}
+
+
+/*<mail name="send rectify note" language="juel" g="99,25,115,45">
+<to addresses="winston at minitrue" />
+<cc users="bb" groups="innerparty" />
+<bcc groups="thinkpol" />
+<subject>rectify ${newspaper}</subject>
+<text>${newspaper} ${date} reporting bb dayorder doubleplusungood
+  refs unpersons rewrite fullwise upsub antefiling</text>
+<!--
+<html><table><tr><td>${newspaper}</td><td>${date}</td>
+  <td>reporting bb dayorder doubleplusungood 
+  refs unpersons rewrite fullwise upsub antefiling</td>
+  </tr></table></html>
+<attachments>
+  <attachment url='http://www.george-orwell.org/1984/3.html' />
+  <attachment resource='org/example/pic.jpg' />
+  <attachment file='${user.home}/.face' />
+</attachments>
+-->
+<transition to="end" />
+</mail>*/
+
+/*
+<mail name="send rectify note" 
+    template="rectify-template" 
+    g="99,25,115,45">
+<transition to="end"/>
+</mail>*/
+
+
+
+
+

Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -24,7 +24,11 @@
 import org.dom4j.Element;
 import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader;
 import org.jbpm.jpdl.internal.convert.action.Action;
-
+/**
+ * create the converted action element and map the specific attributes
+ * @author<a href="mailto:ema at redhat.com>Jim Ma</a> 
+ *
+ */
 public class Node {
 	protected Element convertedElement = null;
 	protected Element nodeElement = null;

Modified: jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml	2009-06-30 03:34:44 UTC (rev 5161)
@@ -8,8 +8,9 @@
   <node-type element="join" class="org.jbpm.jpdl.internal.convert.node.Join" />
   <node-type element="decision" class="org.jbpm.jpdl.internal.convert.node.Decision" />
   <node-type element="process-state" class="org.jbpm.jpdl.internal.convert.node.ProcessState" />
+  <node-type element="mail-node" class="org.jbpm.jpdl.internal.convert.node.MailNode" />
   <!--node-type element="super-state" class="org.jbpm.jpdl.internal.convert.node.SuperState" />
-  <node-type element="mail-node" class="org.jbpm.jpdl.internal.convert.node.MailNode" />
+  
   <node-type element="merge" class="org.jbpm.jpdl.internal.convert.node.Merge" />
   <node-type element="milestone-node" class="oorg.jbpm.jpdl.internal.convert.node.MilestoneNode" />
   <node-type element="interleave-start" class="org.jbpm.jpdl.internal.convert.node.InterleaveStart" />

Modified: jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -34,6 +34,10 @@
 import org.junit.Test;
 import org.xml.sax.InputSource;
 
+/**
+ * Test the jpdl3Converter
+ *
+ */
 public class Jpdl3ConverterReaderTest {
 	@Test
 	public void testSimpleProcesss() throws Exception {
@@ -131,7 +135,7 @@
 		Assert.assertTrue(problems.get(1).getMsg().startsWith(
 				"unrecognized event listener"));
 	}
-
+	
 	private void testConvert(String resourcefile) throws Exception {
 		String xml = convert(resourcefile);
 		List<Problem> problems = new JpdlParser().createParse().setString(xml)
@@ -146,7 +150,7 @@
 		InputSource ins = new InputSource(inputStream);
 		Jpdl3ConverterReader converter = new Jpdl3ConverterReader(ins);
 		Document doc = converter.readAndConvert();
-		// System.out.println(doc.asXML());
+		//System.out.println(doc.asXML());
 		return doc.asXML();
 	}
 

Modified: jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java	2009-06-29 16:52:04 UTC (rev 5160)
+++ jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java	2009-06-30 03:34:44 UTC (rev 5161)
@@ -32,6 +32,10 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+/**
+ * Test the command line parser and validation
+ *
+ */
 public class JpdlConverterToolTest {
 	
 	JpdlConverterTool tool = new JpdlConverterTool();




More information about the jbpm-commits mailing list