[jboss-svn-commits] JBL Code SVN: r13790 - in labs/jbossesb/trunk/product/services/jbpm: src/main/java/org/jboss/soa/esb/services/jbpm and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 25 18:27:31 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-07-25 18:27:30 -0400 (Wed, 25 Jul 2007)
New Revision: 13790
Modified:
labs/jbossesb/trunk/product/services/jbpm/lib/ext/hibernate3.jar
labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-identity.jar
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/Constants.java
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/BpmProcessorUnitTest.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml
Log:
JBESB-653, Upgrading to jBPM-3.2.1. Note that I had to patch to jbpm-jpdl.jar. The jBPM jira will be attached in JBESB-653.
Modified: labs/jbossesb/trunk/product/services/jbpm/lib/ext/hibernate3.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-identity.jar
===================================================================
(Binary files differ)
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/Constants.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java 2007-07-25 21:27:30 UTC (rev 13789)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java 2007-07-25 22:27:30 UTC (rev 13790)
@@ -60,6 +60,7 @@
public static final String EXCEPTION ="jbpmException";
public static final String ERROR_MESSAGE ="jbpmErrorMsg";
public static final String RETURN_CODE ="jbpmReturnCode";
+ public static final String JBPM_LOG_MAP ="jbpmLogMap";
// Possible values of return codes after execution of an action
public static final String RETCODE_OK ="jbpmReturnOK";
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-25 21:27:30 UTC (rev 13789)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java 2007-07-25 22:27:30 UTC (rev 13790)
@@ -146,6 +146,22 @@
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-25 21:27:30 UTC (rev 13789)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultCommandExecutorFactoryImpl.java 2007-07-25 22:27:30 UTC (rev 13790)
@@ -39,6 +39,7 @@
import org.jbpm.command.CancelWorkOnTaskCommand;
import org.jbpm.command.Command;
import org.jbpm.command.GetProcessInstanceCommand;
+import org.jbpm.command.GetProcessInstanceLogCommand;
import org.jbpm.command.GetTaskInstanceCommand;
import org.jbpm.command.GetTaskListCommand;
import org.jbpm.command.NewProcessInstanceCommand;
@@ -52,6 +53,8 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.taskmgmt.exe.TaskInstance;
+import com.sun.mail.handlers.message_rfc822;
+
/**
* Default implementation of a performer factory for the CommandInterpreter
*
@@ -161,11 +164,14 @@
Boolean includeVars = Helper.getBooleanValue(request, Constants.INCLUDE_VARIABLES);
if (null!=includeVars)
command.setIncludeAllVariables(includeVars);
- Boolean includeLogs = Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
- if (null!=includeLogs)
- command.setIncludeLogs(includeLogs);
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);
@@ -208,11 +214,15 @@
if (null!=includeVars)
command.setIncludeAllVariables(includeVars);
}
- Boolean includeLogs = Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
- if (null!=includeLogs)
- command.setIncludeLogs(includeLogs);
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/BpmProcessorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java 2007-07-25 21:27:30 UTC (rev 13789)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java 2007-07-25 22:27:30 UTC (rev 13790)
@@ -148,6 +148,8 @@
_logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
ret = Helper.getStringValue(response, Constants.RETURN_CODE);
assertTrue(Constants.RETCODE_OK.equals(ret));
+
+
Long tokenId = (Long)response.getBody().get(Constants.TOKEN_ID);
Long processId = (Long)response.getBody().get(Constants.PROCESS_INSTANCE_ID);
Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java 2007-07-25 21:27:30 UTC (rev 13789)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java 2007-07-25 22:27:30 UTC (rev 13790)
@@ -28,10 +28,13 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
+import java.util.Iterator;
+import java.util.Map;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.jbpm.Constants;
import org.jboss.soa.esb.util.ClassUtil;
+import org.jbpm.logging.log.ProcessLog;
public class JbpmTestUtil
{
@@ -80,6 +83,8 @@
sb.append(getObject(message,Constants.TOKEN_ID));
sb.append(getObject(message,Constants.HAS_ENDED));
sb.append(getObject(message,Constants.BODY_CONTENT_VARIABLE_NAME));
+ sb.append(getObject(message,Constants.JBPM_LOG_MAP));
+
return sb.append("_______________________________________________________________________")
.toString();
}
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-25 21:27:30 UTC (rev 13789)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml 2007-07-25 22:27:30 UTC (rev 13790)
@@ -39,6 +39,7 @@
class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="GetProcessInstanceCommand"
>
+ <include-logs value="true"/>
<variables>
<variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
<variable esb-name="yyy" jbpm-name="vJ22" />
@@ -50,6 +51,7 @@
class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="VariablesCommand"
>
+ <include-logs value="true"/>
<variables>
<variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
</variables>
@@ -64,8 +66,8 @@
<action name="getItAgain"
class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="GetProcessInstanceCommand"
- include-all-variables="true"
>
+
<variables>
<variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
</variables>
More information about the jboss-svn-commits
mailing list