[jboss-svn-commits] JBL Code SVN: r9749 - in labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util: jbpm and 1 other directory.

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

Author: estebanschifman
Date: 2007-02-25 19:05:44 -0500 (Sun, 25 Feb 2007)
New Revision: 9749

Modified:
   labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Invoker.java
   labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/jbpm/CommandVehicle.java
Log:
Add operations and fix bugs

Modified: labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Invoker.java
===================================================================
--- labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Invoker.java	2007-02-25 22:53:26 UTC (rev 9748)
+++ labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/Invoker.java	2007-02-26 00:05:44 UTC (rev 9749)
@@ -23,6 +23,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Collection;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
@@ -35,9 +36,9 @@
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierTimeoutException;
 import org.jboss.soa.esb.couriers.CourierUtil;
+import org.jboss.soa.esb.listeners.RegistryUtil;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.registry.RegistryException;
-import org.jboss.soa.esb.services.registry.RegistryFactory;
 
 
 /**
@@ -60,7 +61,7 @@
 	 * @throws MalformedEPRException
 	 * @throws CourierException
 	 */
-	public void invoke(AbstractCommandVehicle command, String category, String name)
+	public static void invoke(AbstractCommandVehicle command, String category, String name)
 		throws RegistryException, MalformedEPRException, CourierException
 	{
 		try { invokeAndAwaitResponse(command,category,name,-1); }
@@ -84,7 +85,7 @@
 	 * @throws CourierTimeoutException - If response was not received in specified time
 	 */
 	
-	public Message invokeAndAwaitResponse(AbstractCommandVehicle command, String category, String name
+	public static Message invokeAndAwaitResponse(AbstractCommandVehicle command, String category, String name
 						,int maxWaitMillis)
 		throws RegistryException, MalformedEPRException, CourierException, CourierTimeoutException
 	{
@@ -99,7 +100,8 @@
 		}
 		
 		call.setMessageID(uri);
-		EPR toEpr = RegistryFactory.getRegistry().findEPR(category, name);
+		Collection<EPR> eprs = RegistryUtil.getEprs(category, name);
+		EPR toEpr = (eprs.size()<1) ? null : eprs.iterator().next();
 		call.setTo(toEpr);
 
 		Courier sender = CourierFactory.getCourier(toEpr);
@@ -115,9 +117,10 @@
 		}
 
 		sender.deliver(outgoing);
-		if (! waitForResponse)
-			return null;
-		return receiver.pickup(maxWaitMillis);
+		return (waitForResponse)
+			? receiver.pickup(maxWaitMillis)
+			: null
+		;
 	}
 	
 	private static Logger _logger = Logger.getLogger(Invoker.class);

Modified: labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/jbpm/CommandVehicle.java
===================================================================
--- labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/jbpm/CommandVehicle.java	2007-02-25 22:53:26 UTC (rev 9748)
+++ labs/jbossesb/workspace/eschifman/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/jbpm/CommandVehicle.java	2007-02-26 00:05:44 UTC (rev 9749)
@@ -55,6 +55,7 @@
 	public static final String PROCESS_INSTANCE_ID			="instanceId";
 	public static final String TOKEN_ID						="tokenId";
 	public static final String TRANSITION_NAME				="transitionName";
+	public static final String CURRENT_NODE_NAME			="currentNodeName";
 	public static final String VARIABLE_NAMES_LIST			="variableNamesList";
 	public static final String VARIABLE_VALUES				="variableValuesMap";
 	public static final String USER_OBJECT					="userObject";
@@ -80,6 +81,7 @@
 		,setProcessInstanceVariables
 		,getTokenVariables
 		,setTokenVariables
+		,hasInstanceEnded
 		
 		// Operations originated in jBPM ActionHandlers
 		,responseToRequest
@@ -96,6 +98,7 @@
 	public long	  getInstanceId		() 			{ return (Long)		_values.get(PROCESS_INSTANCE_ID); }
 	public long   getTokenId		() 			{ return (Long)		_values.get(TOKEN_ID); }
 	public String getTransitionName	() 			{ return (String)	_values.get(TRANSITION_NAME); }
+	public String getCurrentNodeName() 			{ return (String)	_values.get(CURRENT_NODE_NAME); }
 	@SuppressWarnings("unchecked")
 	public Set<String> getVariableNames	()		{ return (Set<String>)_values.get(VARIABLE_NAMES_LIST); }
 	@SuppressWarnings("unchecked")
@@ -119,6 +122,7 @@
 	public void	setInstanceId		(long	obj){ super.setValue(PROCESS_INSTANCE_ID	,obj); }
 	public void	setTokenId			(long	obj){ super.setValue(TOKEN_ID				,obj); }
 	public void	setTransitionName 	(String	obj){ super.setValue(TRANSITION_NAME		,obj); }
+	public void	setCurrentNodeName 	(String	obj){ super.setValue(CURRENT_NODE_NAME		,obj); }
 	public void setVariableNames	(Set<String> obj){ super.setValue(VARIABLE_NAMES_LIST,obj); }
 	public void setVariableValues(Map<String,Object>obj)
 	{