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

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

Author: kevin.conner at jboss.com
Date: 2007-10-25 05:25:54 -0400 (Thu, 25 Oct 2007)
New Revision: 16065

Modified:
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java
Log:
Tidied up jBPM command interpreter: JBESB-1248

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-10-25 06:21:18 UTC (rev 16064)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java	2007-10-25 09:25:54 UTC (rev 16065)
@@ -26,13 +26,8 @@
 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.addressing.EPR;
 import org.jboss.soa.esb.addressing.MalformedEPRException;
-import org.jboss.soa.esb.addressing.util.DefaultReplyTo;
-import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.couriers.CourierFactory;
-import org.jboss.soa.esb.couriers.CourierUtil;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
@@ -64,7 +59,6 @@
 		
 	}
 
-	private CommandInterpreter() {}
 	public CommandInterpreter(ConfigTree config) throws ConfigurationException
 	{
 		_config = config;
@@ -85,50 +79,9 @@
 			throw new ActionProcessingException(e.getMessage(), e);
 		}
 	
-		return replyMessage(message,response);
+		return response;
 	} //________________________________
-		
-	/**
-	 * @param message - Containing payload and replyToEpr where to send the reply.
-	 * @throws Exception
-	 */
-	public static Message defaultReply(Message message)
-		throws MalformedEPRException,CourierException
-	{
-		EPR reply = DefaultReplyTo.getReplyToAddress(message);
-
-		if (null==reply)
-			_logger.error("Null replyToEPR in message - response will not be sent to invoker");
-		else
-		{
-			Courier courier = CourierFactory.getCourier(reply);
-                        try
-                        {
-                            courier.deliver(message);
-                        }
-                        finally
-                        {
-                            CourierUtil.cleanCourier(courier) ;
-                        }
-		}
-		return message;
-	} // ________________________________
-
-	public static Message replyMessage(Message input, Message output)
-		throws CourierException, MalformedEPRException
-	{
-		EPR toEpr	= input.getHeader().getCall().getTo();
-		if (null!=toEpr)
-			output.getHeader().getCall().setTo(toEpr);
-		EPR replyTo	= input.getHeader().getCall().getReplyTo();
-		if (null!=replyTo)
-			output.getHeader().getCall().setReplyTo	(replyTo);
-		EPR faultTo	= input.getHeader().getCall().getFaultTo();
-		if (null!=faultTo)
-			output.getHeader().getCall().setFaultTo	(faultTo);
-		return (null==replyTo)? output : defaultReply(output);
-	} //________________________________
-		
+			
 	public static Message doTheJob(Command command) throws JbpmException
 	{
 		Message response = Helper.commandMessageTemplate();