[jboss-svn-commits] JBL Code SVN: r31778 - labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2010-02-22 13:34:40 -0500 (Mon, 22 Feb 2010)
New Revision: 31778

Modified:
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/EndEventHandler.java
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/IntermediateCatchEventHandler.java
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ItemDefinitionHandler.java
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ProcessHandler.java
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/TaskHandler.java
Log:
 - fixing BPMN2 issues

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/EndEventHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/EndEventHandler.java	2010-02-22 17:38:47 UTC (rev 31777)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/EndEventHandler.java	2010-02-22 18:34:40 UTC (rev 31778)
@@ -54,6 +54,7 @@
                 faultNode.setId(node.getId());
                 faultNode.setName(node.getName());
                 faultNode.setTerminateParent(true);
+                faultNode.setMetaData("UniqueId", node.getMetaData("UniqueId"));
                 node = faultNode;
                 super.handleNode(node, element, uri, localName, parser);
                 handleErrorNode(node, element, uri, localName, parser);
@@ -63,6 +64,7 @@
                 FaultNode faultNode = new FaultNode();
                 faultNode.setId(node.getId());
                 faultNode.setName(node.getName());
+                faultNode.setMetaData("UniqueId", node.getMetaData("UniqueId"));
                 node = faultNode;
                 super.handleNode(node, element, uri, localName, parser);
                 handleEscalationNode(node, element, uri, localName, parser);

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/IntermediateCatchEventHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/IntermediateCatchEventHandler.java	2010-02-22 17:38:47 UTC (rev 31777)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/IntermediateCatchEventHandler.java	2010-02-22 18:34:40 UTC (rev 31778)
@@ -52,6 +52,7 @@
                 TimerNode timerNode = new TimerNode();
                 timerNode.setId(node.getId());
                 timerNode.setName(node.getName());
+                timerNode.setMetaData("UniqueId", node.getMetaData("UniqueId"));
                 node = timerNode;
                 handleTimerNode(node, element, uri, localName, parser);
                 break;
@@ -60,6 +61,7 @@
                 StateNode stateNode = new StateNode();
                 stateNode.setId(node.getId());
                 stateNode.setName(node.getName());
+                stateNode.setMetaData("UniqueId", node.getMetaData("UniqueId"));
                 node = stateNode;
                 handleStateNode(node, element, uri, localName, parser);
                 break;

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ItemDefinitionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ItemDefinitionHandler.java	2010-02-22 17:38:47 UTC (rev 31777)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ItemDefinitionHandler.java	2010-02-22 18:34:40 UTC (rev 31778)
@@ -5,6 +5,7 @@
 import java.util.Map;
 
 import org.drools.bpmn2.core.ItemDefinition;
+import org.drools.bpmn2.core.Message;
 import org.drools.compiler.xml.ProcessBuildData;
 import org.drools.xml.BaseAbstractHandler;
 import org.drools.xml.ExtensibleXmlParser;
@@ -23,6 +24,7 @@
 			this.validPeers = new HashSet();
 			this.validPeers.add(null);
             this.validPeers.add(ItemDefinition.class);
+            this.validPeers.add(Message.class);
 
 			this.allowNesting = false;
 		}

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ProcessHandler.java	2010-02-22 17:38:47 UTC (rev 31777)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/ProcessHandler.java	2010-02-22 18:34:40 UTC (rev 31778)
@@ -136,10 +136,10 @@
                         }
                     }
                     if (source == null) {
-                        throw new IllegalArgumentException("Could not find source node for connection:" + sourceRef);
+                        throw new IllegalArgumentException("Could not find source node for connection:" + connection.getSourceRef());
                     }
                     if (target == null) {
-                        throw new IllegalArgumentException("Could not find target node for connection:" + targetRef);
+                        throw new IllegalArgumentException("Could not find target node for connection:" + connection.getTargetRef());
                     }
 				}
 				Connection result = new ConnectionImpl(

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/TaskHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/TaskHandler.java	2010-02-22 17:38:47 UTC (rev 31777)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/TaskHandler.java	2010-02-22 18:34:40 UTC (rev 31778)
@@ -76,8 +76,9 @@
 			org.w3c.dom.Node subSubNode = subNode.getFirstChild();
 			String from = subSubNode.getTextContent();
 			subNode = subNode.getNextSibling();
+			subNode = subNode.getNextSibling();
     		String to = subNode.getTextContent();
-    		workItemNode.getWork().setParameter(to.substring(XmlBPMNProcessDumper.getUniqueNodeId(workItemNode).length() + 2), from);
+    		workItemNode.getWork().setParameter(dataInputs.get(to), from);
 		} else {
     		String from = subNode.getTextContent();
     		// targetRef