[jboss-svn-commits] JBL Code SVN: r17160 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions.

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

Author: kurt.stam at jboss.com
Date: 2007-12-10 12:11:42 -0500 (Mon, 10 Dec 2007)
New Revision: 17160

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/JBpmCallback.java
Log:
JBESB-1367, letting the remaining exceptions bubble up to the action pipeline.

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java	2007-12-10 14:54:35 UTC (rev 17159)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java	2007-12-10 17:11:42 UTC (rev 17160)
@@ -26,14 +26,12 @@
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.actions.ActionLifecycle;
 import org.jboss.soa.esb.actions.ActionLifecycleException;
-import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.jbpm.Constants;
 import org.jboss.soa.esb.services.jbpm.cmd.Command;
 import org.jboss.soa.esb.services.jbpm.cmd.CommandExecutor;
 import org.jboss.soa.esb.services.jbpm.cmd.MessageFacade;
-import org.jbpm.JbpmException;
 
 /**
 *
@@ -69,21 +67,14 @@
         this.configTree = configTree;
 	}
 
-	public Message process(Message message)
-		throws ActionProcessingException
+	public Message process(Message message) throws ConfigurationException
 	{
 		message.getBody().add(Constants.COMMAND_CODE, messageFacade.getOpCode().toString());
 		messageFacade.setJBPMContextParameters(message);
-        try {
-            CommandExecutor commandExecutor = CommandExecutor.getInstance();
-            String commandString  = (String)message.getBody().get(Constants.COMMAND_CODE);
-            Command command = commandExecutor.getCommand(commandString);
-            command.execute(message);
-        }catch (JbpmException jbpme) {
-                throw new ActionProcessingException(jbpme.getMessage(), jbpme);
-        } catch (ConfigurationException ce) {
-            throw new ActionProcessingException(ce.getMessage(), ce);
-        }
+        CommandExecutor commandExecutor = CommandExecutor.getInstance();
+        String commandString  = (String)message.getBody().get(Constants.COMMAND_CODE);
+        Command command = commandExecutor.getCommand(commandString);
+        command.execute(message);
         return message;
 	}
     

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/JBpmCallback.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/JBpmCallback.java	2007-12-10 14:54:35 UTC (rev 17159)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/JBpmCallback.java	2007-12-10 17:11:42 UTC (rev 17160)
@@ -32,7 +32,6 @@
 import org.jboss.soa.esb.services.jbpm.Constants;
 import org.jboss.soa.esb.services.jbpm.cmd.Command;
 import org.jboss.soa.esb.services.jbpm.cmd.CommandExecutor;
-import org.jbpm.JbpmException;
 
 /**
 * @author <a href="mailto:kurt.stam at jboss.com">Kurt Stam</a>
@@ -60,22 +59,13 @@
      * @return
      * @throws ActionProcessingException
 	 */
-	public Message process(Message message) throws ActionProcessingException
+	public Message process(Message message) throws ConfigurationException
 	{     
         //Send a callback signal to jBPM
-        try {
-            CommandExecutor commandExecutor = CommandExecutor.getInstance();
-            String commandString  = Constants.OpCode.CallbackCommand.toString();
-            Command command = commandExecutor.getCommand(commandString);
-            command.execute(message);
-        } catch (JbpmException jbpme) {
-            logger.error(jbpme.getMessage(), jbpme);
-        } catch (ConfigurationException ce) {
-            logger.error(ce.getMessage(), ce);
-        } catch (Throwable t) {
-            //TODO Kurt figure out if what we if and what we want to throw
-            logger.error(t.getMessage(), t);
-        }
+        CommandExecutor commandExecutor = CommandExecutor.getInstance();
+        String commandString  = Constants.OpCode.CallbackCommand.toString();
+        Command command = commandExecutor.getCommand(commandString);
+        command.execute(message);
         return message;
 	}