[jboss-svn-commits] JBL Code SVN: r25310 - in labs/jbossesb/branches/JBESB_4_4_GA_FP/product: samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions and 1 other directories.

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

Author: tfennelly
Date: 2009-02-17 12:45:28 -0500 (Tue, 17 Feb 2009)
New Revision: 25310

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
   labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java
   labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/ProcessInfo.java
   labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2417

Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2009-02-17 16:47:07 UTC (rev 25309)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2009-02-17 17:45:28 UTC (rev 25310)
@@ -68,7 +68,9 @@
                     </property>             
                  </action>
 
-                 <action name="spy2" 
+                <action name="processInfo"
+                  class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.ProcessInfo"/>
+                 <action name="spy2"
                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
 
               </actions>

Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java	2009-02-17 16:47:07 UTC (rev 25309)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/MessageSpy.java	2009-02-17 17:45:28 UTC (rev 25310)
@@ -24,6 +24,8 @@
 import org.jboss.soa.esb.actions.AbstractActionLifecycle;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.cmd.MessageHelper;
+import org.jboss.soa.esb.services.jbpm.Constants;
 import org.apache.log4j.Logger;
 
 public class MessageSpy extends AbstractActionLifecycle {

Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/ProcessInfo.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/ProcessInfo.java	2009-02-17 16:47:07 UTC (rev 25309)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/esb_actions/ProcessInfo.java	2009-02-17 17:45:28 UTC (rev 25310)
@@ -23,6 +23,7 @@
 import org.jboss.soa.esb.actions.AbstractActionLifecycle;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.Constants;
 import org.apache.log4j.Logger;
 
 public class ProcessInfo extends AbstractActionLifecycle {
@@ -32,7 +33,8 @@
 
 	public Message process(Message message) {
 	  logger.info("Token ID: " + message.getBody().get("jbpmTokenId"));
-	  logger.info("Process Name: " + message.getBody().get("jbpmProcessDefName"));
+      logger.info("Process ID: " + message.getBody().get(Constants.PROCESS_INSTANCE_ID));
+      logger.info("Process Name: " + message.getBody().get("jbpmProcessDefName"));
 	  logger.info("Process Version: " + message.getBody().get("jbpmProcessDefVersion"));
 	  return message;
 	}

Modified: labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java	2009-02-17 16:47:07 UTC (rev 25309)
+++ labs/jbossesb/branches/JBESB_4_4_GA_FP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java	2009-02-17 17:45:28 UTC (rev 25310)
@@ -228,16 +228,23 @@
 			if (null!=variables) command.setVariables(variables);
             
             logger.debug("New process instance with command=" + command);
-			executeJbpmCommand(command);
-		}
+            Object result = executeJbpmCommand(command);
+
+            if(result instanceof ProcessInstance) {
+                ProcessInstance processInstance = (ProcessInstance) result;
+
+                MessageHelper.setLongValue(esbMessage, Constants.PROCESS_INSTANCE_ID, processInstance.getId());
+            }
+        }
 	}
     
-    private static void executeJbpmCommand(org.jbpm.command.Command command)
+    private static Object executeJbpmCommand(org.jbpm.command.Command command)
     {
         if (logger.isDebugEnabled()) {
             logger.debug(command);
         }
-        getJbpmCommandService().execute(command);
+
+        return getJbpmCommandService().execute(command);
     }
     
     /**