[jboss-svn-commits] JBL Code SVN: r13899 - in labs/jbossesb/trunk/product/services/jbpm: src/main/java/org/jboss/soa/esb/services/jbpm/actions and 2 other directories.

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

Author: kurt.stam at jboss.com
Date: 2007-07-31 01:23:09 -0400 (Tue, 31 Jul 2007)
New Revision: 13899

Modified:
   labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-jpdl.jar
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultCommandExecutorFactoryImpl.java
   labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml
Log:
JBESB-653 original jbpm-3.2.1 jars

Modified: labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-jpdl.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java	2007-07-31 05:20:27 UTC (rev 13898)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java	2007-07-31 05:23:09 UTC (rev 13899)
@@ -146,22 +146,6 @@
 		
 		return response;
 	} //________________________________
-    
-    public static void addLogs(Command command, Body body)
-    {
-        try
-        {
-            Object obj = getJbpmCommandService().execute(command);
-            body.add(Constants.RETURN_CODE, Constants.RETCODE_OK);
-            if (null!=obj)
-                body.add(Constants.JBPM_LOG_MAP, obj);
-        }
-        catch (Exception e)
-        {
-            body.add(Constants.RETURN_CODE, Constants.RETCODE_EXCEPTION);
-            body.add(Constants.EXCEPTION, e);
-        }
-    } //________________________________
 
 	/**
 	 * Should this class need any extra configuration, this is the placeholder where to check

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultCommandExecutorFactoryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultCommandExecutorFactoryImpl.java	2007-07-31 05:20:27 UTC (rev 13898)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultCommandExecutorFactoryImpl.java	2007-07-31 05:23:09 UTC (rev 13899)
@@ -135,7 +135,11 @@
 	{
 		public Message execute(Message request) throws Exception
 		{
-			GetProcessInstanceCommand command = new GetProcessInstanceCommand();
+            Boolean includeLogs = Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
+            if (includeLogs==null) {
+                includeLogs=false;
+            }
+			GetProcessInstanceCommand command = new GetProcessInstanceCommand(0,true,includeLogs);
 			Long id 	= Helper.getLongValue(request,Constants.PROCESS_INSTANCE_ID);
 			if (null!=id)
 				command.setProcessInstanceId(id);
@@ -164,12 +168,6 @@
 				command.setIncludeAllVariables(includeVars);
 			
 			Message response = CommandInterpreter.doTheJob(command);
-            Boolean includeLogs = Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
-            if (null!=includeLogs) {
-                GetProcessInstanceLogCommand logCommand = new GetProcessInstanceLogCommand();
-                logCommand.setProcessId(id);
-                CommandInterpreter.addLogs(logCommand, response.getBody());           
-            }
 			
 			Body body = response.getBody();
 			Object obj = body.get(Constants.JBPM_RETURN_OBJECT);
@@ -197,7 +195,11 @@
 		public Message execute(Message request) throws Exception
 		{
 			long 	taskId 	= Helper.getLongValue(request,Constants.TASK_INSTANCE_ID);
-			GetTaskInstanceCommand command = new GetTaskInstanceCommand(taskId);
+            Boolean includeLogs = Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
+            if (includeLogs==null) {
+                includeLogs=false;
+            }
+			GetTaskInstanceCommand command = new GetTaskInstanceCommand(taskId,true,includeLogs);
 			String[] vars = (String[])Helper.getObjectValue(request,Constants.VARIABLE_NAMES_ARRAY);
 			if (null!=vars)
 			{
@@ -215,12 +217,6 @@
 	
 			Message response = CommandInterpreter.doTheJob(command);
             
-            Boolean includeLogs = Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
-            if (null!=includeLogs) {
-                GetProcessInstanceLogCommand logCommand = new GetProcessInstanceLogCommand();
-                logCommand.setProcessId(taskId);
-                CommandInterpreter.addLogs(logCommand, response.getBody());           
-            }
 			Object obj = Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
 			if (obj instanceof TaskInstance)			
 			{

Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml	2007-07-31 05:20:27 UTC (rev 13898)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml	2007-07-31 05:23:09 UTC (rev 13899)
@@ -40,6 +40,7 @@
 			command="GetProcessInstanceCommand"
 			>
 			<include-logs value="true"/>
+			<include-all-variables value="true"/>
 			<variables>
 				<variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
 				<variable esb-name="yyy" jbpm-name="vJ22" />