[jbpm-commits] JBoss JBPM SVN: r4482 - in jbpm4/branches/tbaeyens/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/xml and 2 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-04-07 12:09:57 -0400 (Tue, 07 Apr 2009)
New Revision: 4482

Modified:
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
   jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
   jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
Log:
event listener parsing

Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java	2009-04-07 15:42:35 UTC (rev 4481)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EventListenerBinding.java	2009-04-07 16:09:57 UTC (rev 4482)
@@ -22,7 +22,9 @@
 package org.jbpm.jpdl.internal.activity;
 
 import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.listener.EventListener;
 import org.jbpm.pvm.internal.wire.Descriptor;
+import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;
 import org.w3c.dom.Element;
@@ -39,7 +41,8 @@
 
   public Object parse(Element element, Parse parse, Parser parser) {
     Descriptor descriptor = JpdlParser.parseObjectDescriptor(element, parse);
-    return null;
+    EventListener eventListener = (EventListener) WireContext.create(descriptor);
+    return eventListener;
   }
 
 }

Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2009-04-07 15:42:35 UTC (rev 4481)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2009-04-07 16:09:57 UTC (rev 4482)
@@ -182,25 +182,27 @@
       // activities
       List<Element> elements = XmlUtil.elements(documentElement);
       for (Element element: elements) {
-        JpdlBinding activityBinding = (JpdlBinding) getBinding(element, "activity");
-        if (activityBinding!=null) {
-          ActivityImpl activity = processDefinition.createActivity();
-          parse.pushObject(activity);
-          try {
-            activity.setType(activityBinding.getTagName());
-            activityBinding.parseName(element, activity, parse);
-            activityBinding.parseFlows(element, activity, parse);
-            ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(element, parse, this);
-            activity.setBehaviour(activityBehaviour);
-            
-            parseEventListeners(element, parse, activity);
-            
-          } finally {
-            parse.popObject();
+    	if (!"on".equals(XmlUtil.getTagLocalName(element))) {
+          JpdlBinding activityBinding = (JpdlBinding) getBinding(element, "activity");
+          if (activityBinding!=null) {
+            ActivityImpl activity = processDefinition.createActivity();
+            parse.pushObject(activity);
+            try {
+              activity.setType(activityBinding.getTagName());
+              activityBinding.parseName(element, activity, parse);
+              activityBinding.parseFlows(element, activity, parse);
+              ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(element, parse, this);
+              activity.setBehaviour(activityBehaviour);
+              
+              parseEventListeners(element, parse, activity);
+              
+            } finally {
+              parse.popObject();
+            }
+          } else {
+            log.debug("unrecognized activity: "+XmlUtil.getTagLocalName(element));
           }
-        } else {
-          log.debug("unrecognized activity: "+XmlUtil.getTagLocalName(element));
-        }
+    	}
       }
       
       for (UnresolvedTransition unresolvedTransition: unresolvedTransitions.list) {

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java	2009-04-07 15:42:35 UTC (rev 4481)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java	2009-04-07 16:09:57 UTC (rev 4482)
@@ -319,7 +319,7 @@
       URL schemaUrl = classLoader.getResource(schemaResource);
       if (schemaUrl!=null) {
         String schemaLocation = schemaUrl.toString();
-        log.debug("schema resource found: " + schemaResource);
+        log.trace("schema resource found: " + schemaResource);
         schemaLocations.add(schemaLocation);
       } else {
         log.debug("skipping unavailble schema resource: " + schemaResource);

Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java	2009-04-07 15:42:35 UTC (rev 4481)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java	2009-04-07 16:09:57 UTC (rev 4482)
@@ -42,7 +42,7 @@
     deployJpdlXmlString(
       "<process name='Insurance claim' key='ICL'>" +
       "  <on event='start'>" +
-      "    <java class='"+ProcessEventRecorder.class.getName()+"' />" +
+      "    <event-listener class='"+ProcessEventRecorder.class.getName()+"' />" +
       "  </on>" +
       "  <start>" +
       "    <transition to='a' />" +
@@ -50,6 +50,8 @@
       "  <state name='a' />" +
       "</process>"
     );
+    
+    executionService.startProcessInstanceByKey("ICL");
   }
 
 }