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

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

Author: estebanschifman
Date: 2007-03-18 17:43:30 -0400 (Sun, 18 Mar 2007)
New Revision: 10315

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/jbpm/CommandInterpreter.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/AbstractCommandVehicle.java
Log:
Clarify log messages - Readability...

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/jbpm/CommandInterpreter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/jbpm/CommandInterpreter.java	2007-03-18 21:19:24 UTC (rev 10314)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/jbpm/CommandInterpreter.java	2007-03-18 21:43:30 UTC (rev 10315)
@@ -140,7 +140,10 @@
 			_command.setReturnCode(CommandVehicle.RETCODE_EXCEPTION);
 			_command.setException(e);
 		}
-		finally	{ cleanupJbpm(); } 
+		finally	
+		{ 
+			cleanupJbpm(); 
+		} 
 	} //________________________________
 	public void newProcessInstance()
 	{
@@ -161,7 +164,10 @@
 			_command.setReturnCode(CommandVehicle.RETCODE_EXCEPTION);
 			_command.setException(e);
 		}
-		finally	{ cleanupJbpm(); } 
+		finally	
+		{ 
+			cleanupJbpm(); 
+		} 
 	} //________________________________
 
 	public void signalProcess()
@@ -186,7 +192,10 @@
 			_command.setReturnCode(CommandVehicle.RETCODE_EXCEPTION);
 			_command.setException(e);
 		}
-		finally	{ cleanupJbpm(); } 
+		finally	
+		{ 
+			cleanupJbpm(); 
+		} 
 	} //________________________________
 
 	public void signalToken()
@@ -212,7 +221,10 @@
 			_command.setReturnCode(CommandVehicle.RETCODE_EXCEPTION);
 			_command.setException(e);
 		}
-		finally	{ cleanupJbpm(); } 
+		finally	
+		{ 
+			cleanupJbpm(); 
+		} 
 	} //________________________________
 
 	public void getProcessInstanceVariabes()
@@ -291,7 +303,10 @@
 			_command.setReturnCode(CommandVehicle.RETCODE_EXCEPTION);
 			_command.setException(e);
 		}
-		finally	{ cleanupJbpm(); } 
+		finally	
+		{ 
+			cleanupJbpm(); 
+		} 
 	} //________________________________
 
 	public void getTokenVariabes()
@@ -348,7 +363,10 @@
 			_command.setReturnCode(CommandVehicle.RETCODE_EXCEPTION);
 			_command.setException(e);
 		}
-		finally	{ cleanupJbpm(); } 
+		finally	
+		{ 
+			cleanupJbpm(); 
+		} 
 	} //________________________________
 	
 	/**
@@ -395,6 +413,11 @@
 		_token			= null;
 	} //________________________________
 	
+	/**
+	 * Encapsulate obtention of jBPM configuration here.
+	 * <br/>If it can't be cached, we only need to change this method.
+	 * @return JbpmConfiguration
+	 */
 	protected static JbpmConfiguration getJbpmConfig()
 	{
 		if (null== s_jbpmConfig)

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/AbstractCommandVehicle.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/AbstractCommandVehicle.java	2007-03-18 21:19:24 UTC (rev 10314)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/AbstractCommandVehicle.java	2007-03-18 21:43:30 UTC (rev 10315)
@@ -22,9 +22,13 @@
 package org.jboss.soa.esb.util;
 
 import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
+import org.apache.log4j.Logger;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.jboss.soa.esb.util.jbpm.CommandVehicle.Operation;
@@ -51,6 +55,8 @@
 	 */
 	public abstract String getCommandOpcodeKey();
 	
+	private Logger _logger = Logger.getLogger(AbstractCommandVehicle.class);
+	
 	protected Map<String,Object>_values = new HashMap<String,Object>();
 
 	protected Enum	_operator;
@@ -86,6 +92,15 @@
 	public Message toCommandMessage() 			
 	{
 		Message message = MessageFactory.getInstance().getMessage();
+		URI	 uri	= null;
+		try  { uri = new URI(UUID.randomUUID().toString()); }
+		catch (URISyntaxException e)
+		{
+			_logger.fatal("Problem with UUID.randomUUID() - This should not happen");
+			return null;
+		}
+		message.getHeader().getCall().setMessageID(uri);
+
 		_values.put(getCommandOpcodeKey(), _operator.toString());
 		message.getBody().add(getCommandValuesTag(), _values);