[jboss-svn-commits] JBL Code SVN: r11209 - in labs/jbossesb/trunk/product: services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Apr 22 16:07:14 EDT 2007


Author: estebanschifman
Date: 2007-04-22 16:07:14 -0400 (Sun, 22 Apr 2007)
New Revision: 11209

Added:
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/SignalFacade.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/StartWorkOnTaskFacade.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/TaskInstanceEndFacade.java
Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java
   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/CommandExecutorFactory.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/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultMessageFacadeFactoryImpl.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/DeployProcessDefinitionFacade.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/VariablesFacade.java
   labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
Log:
More work on jbpm classes

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java	2007-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -178,7 +178,7 @@
 		sb.append(getObject(message,Constants.ERROR_MESSAGE));
 		sb.append(getObject(message,Constants.EXCEPTION));
 		sb.append(getObject(message,Constants.ACTOR_ID));
-		sb.append(getObject(message,Constants.ACTOR_LIST));
+		sb.append(getObject(message,Constants.ACTOR_NAMES_ARRAY));
 		sb.append(getObject(message,Constants.CURRENT_NODE_NAME));
 		sb.append(getObject(message,Constants.JBPM_RETURN_OBJECT));
 		sb.append(getObject(message,Constants.PROCESS_DEFINITION_NAME));
@@ -186,7 +186,7 @@
 		sb.append(getObject(message,Constants.PROCESS_INSTANCE_ID));
 		sb.append(getObject(message,Constants.TASK_INSTANCE_ID));
 		sb.append(getObject(message,Constants.TOKEN_ID));
-		sb.append(getObject(message,Constants.PROCESS_HAS_ENDED));
+		sb.append(getObject(message,Constants.HAS_ENDED));
 		return sb.append("_______________________________________________________________________")
 			.toString();		
 	}

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-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -38,7 +38,7 @@
 	public static final String PROCESS_DEFINITION_ID		="jbpmProcessDefId";
 	public static final String PROCESS_DEFINITION_VERSION	="jbpmProcessDefVersion";
 	public static final String PROCESS_INSTANCE_ID			="jbpmProcessInstId";
-	public static final String PROCESS_HAS_ENDED			="jbpmProcessEnded";
+	public static final String HAS_ENDED					="jbpmObjectEnded";
 	public static final String TASK_INSTANCE_ID				="jbpmTaskInstId";
 	public static final String TASK_ID_LIST					="jbpmTaskIdList";
 	public static final String TOKEN_ID						="jbpmTokenId";
@@ -66,17 +66,18 @@
 
 	// tag names for xml configuration of actions
 	public static final String PROCESS_DEFINITION_XML_TAG	="ProcessDefinitionXml";
-	public static final String PROCESS_DEFINITION_NAME_TAG	="ProcessDefinitionName";
-	public static final String PROCESS_DEFINITION_ID_TAG	="ProcessDefinitionId";
-	public static final String TRANSITION_NAME_TAG			="TransitionName";
-	public static final String INCLUDE_ALL_VARS_TAG			="IncludeAllVariables";
-	public static final String INCLUDE_LOGS_TAG				="IncludeLogs";
+	public static final String PROCESS_DEFINITION_NAME_TAG	="processDefinitionName";
+	public static final String PROCESS_DEFINITION_ID_TAG	="processDefinitionId";
+	public static final String TRANSITION_NAME_TAG			="transitionName";
+	public static final String INCLUDE_ALL_VARS_TAG			="includeAllVariables";
+	public static final String INCLUDE_LOGS_TAG				="includeLogs";
 	public static final String VARIABLES_TAG				="Variables";
 	public static final String ONE_VARIABLE_TAG				="variable";
 	public static final String ESB_VARNAME_TAG				="esbName";
 	public static final String JBPM_VARNAME_TAG				="jbpmName";
 	public static final String ACTORS_TAG					="Actors";
 	public static final String ONE_ACTOR_TAG				="actor";
+	public static final String OVERWRITE_SWIMLANE_TAG		="overwriteSwimlane";
 
 	public enum OpCode
 	{

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandExecutorFactory.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandExecutorFactory.java	2007-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandExecutorFactory.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -37,7 +37,7 @@
 	
 	protected static final Object s_oSynch = new Integer(0);
 
-	private   static CommandExecutorFactory _factory;
+	protected static CommandExecutorFactory _factory;
 	public static CommandExecutorFactory getInstance()
 	{
 		if (null==_factory)

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-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -204,7 +204,6 @@
 	private static JbpmConfiguration s_jbpmConfig;
 	private static CommandService	s_jbpmService;
 	
-	protected CommandExecutor _performer;
 	public interface CommandExecutor
 	{
 		public Message execute (Message message) throws Exception;

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-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultCommandExecutorFactoryImpl.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.jbpm.Constants;
 import org.jboss.soa.esb.services.jbpm.actions.CommandExecutorFactory;
@@ -109,7 +110,7 @@
 		};
 	};
 
-	protected static final CommandExecutor DEPLOY_PROCESS_DEF_PERFORMER = new CommandExecutor() 
+	protected static final CommandExecutor DEPLOY_PROCESS_DEF_EXECUTOR = new CommandExecutor() 
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -131,13 +132,14 @@
 							return null;
 						}
 					});
-			Helper.setObjectValue(response, Constants.PROCESS_DEFINITION_NAME, def.getName());
-			Helper.setObjectValue(response, Constants.PROCESS_DEFINITION_VERSION, def.getVersion());
+			Helper.setObjectValue(response, Constants.PROCESS_DEFINITION_NAME	,def.getName());
+			Helper.setObjectValue(response, Constants.PROCESS_DEFINITION_ID		,def.getId());
+			Helper.setObjectValue(response, Constants.PROCESS_DEFINITION_VERSION,def.getVersion());
 			return response;
 		}
 	};
 
-	protected static final CommandExecutor CANCEL_PROCESS_INSTANCE_PERFORMER = new CommandExecutor() 
+	protected static final CommandExecutor CANCEL_PROCESS_INSTANCE_EXECUTOR = new CommandExecutor() 
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -146,7 +148,7 @@
 		} // _______________________________
 	};
 		
-	protected static final CommandExecutor CANCEL_TOKEN_PERFORMER = new CommandExecutor() 
+	protected static final CommandExecutor CANCEL_TOKEN_EXECUTOR = new CommandExecutor() 
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -155,7 +157,7 @@
 		} // _______________________________
 	};
 		
-	protected static final CommandExecutor CANCEL_WORK_ON_TASK_PERFORMER = new CommandExecutor() 
+	protected static final CommandExecutor CANCEL_WORK_ON_TASK_EXECUTOR = new CommandExecutor() 
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -164,7 +166,7 @@
 		} // _______________________________
 	};
 
-	protected static final CommandExecutor GET_PROCESS_INSTANCE_PERFORMER=new CommandExecutor()
+	protected static final CommandExecutor GET_PROCESS_INSTANCE_EXECUTOR=new CommandExecutor()
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -198,11 +200,31 @@
 			Boolean includeLogs	= Helper.getBooleanValue(request, Constants.INCLUDE_LOGS);
 			if (null!=includeLogs)
 				command.setIncludeLogs(includeLogs);
-			return CommandInterpreter.doTheJob(command);
+			
+			Message response = CommandInterpreter.doTheJob(command);
+			
+			Body body = response.getBody();
+			Object obj = body.get(Constants.JBPM_RETURN_OBJECT);
+			if (obj instanceof ProcessInstance)
+			{
+				ProcessInstance inst = (ProcessInstance)obj;
+				Helper.setLongValue(response, Constants.PROCESS_INSTANCE_ID, inst.getId());
+				Helper.setBooleanValue(response, Constants.HAS_ENDED, inst.hasEnded());
+				
+				Token token = inst.getRootToken();
+				Helper.setLongValue(response, Constants.TOKEN_ID,token.getId());
+				Helper.setStringValue(response, Constants.CURRENT_NODE_NAME, token.getNode().getName());
+
+				ProcessDefinition def = inst.getProcessDefinition();
+				Helper.setStringValue(response, Constants.PROCESS_DEFINITION_NAME,def.getName());
+				Helper.setIntValue(response, Constants.PROCESS_DEFINITION_VERSION,def.getVersion());
+				Helper.setLongValue(response, Constants.PROCESS_DEFINITION_ID,def.getId());
+			}
+			return response;
 		} // _______________________________
 	};
 
-	protected static final CommandExecutor GET_TASK_INSTANCE_PERFORMER=new CommandExecutor()
+	protected static final CommandExecutor GET_TASK_INSTANCE_EXECUTOR=new CommandExecutor()
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -227,12 +249,13 @@
 				command.setIncludeLogs(includeLogs);
 	
 			Message response = CommandInterpreter.doTheJob(command);
-			TaskInstance tInst = (TaskInstance)Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
-			if (null!=tInst)
+			Object obj = Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
+			if (obj instanceof TaskInstance)			
 			{
-				Helper.setLongValue(response, Constants.PROCESS_INSTANCE_ID	,tInst.getProcessInstance().getId());
-				Helper.setLongValue(response, Constants.TOKEN_ID			,tInst.getToken().getId());
-				Helper.setLongValue(response, Constants.TASK_INSTANCE_ID	,tInst.getId());
+				TaskInstance inst = (TaskInstance)obj;
+				Helper.setLongValue(response, Constants.PROCESS_INSTANCE_ID	,inst.getProcessInstance().getId());
+				Helper.setLongValue(response, Constants.TOKEN_ID			,inst.getToken().getId());
+				Helper.setLongValue(response, Constants.TASK_INSTANCE_ID	,inst.getId());
 			}
 	
 			return response;
@@ -268,15 +291,11 @@
 		} // _______________________________
 	};
 
-	protected static final CommandExecutor SIGNAL_PERFORMER=new CommandExecutor()
+	protected static final CommandExecutor SIGNAL_EXECUTOR=new CommandExecutor()
 	{
 		public Message execute(Message request) throws Exception
 		{
 			SignalCommand command = new SignalCommand();
-			String transition = Helper.getStringValue(request, Constants.TRANSITION_NAME);
-			if (null!=transition)
-				command.setTransitionName(transition);
-			
 			// try token id first
 			Long tokenId = Helper.getLongValue(request,Constants.TOKEN_ID);		
 			if (null== tokenId)
@@ -292,19 +311,28 @@
 			}
 			command.setTokenId(tokenId);
 			
+			String transition = Helper.getStringValue(request, Constants.TRANSITION_NAME);
+			if (null!=transition)
+				command.setTransitionName(transition);
+			
+			Map map = (Map)Helper.getObjectValue(request, Constants.VARIABLE_VALUES);
+			if (null!=map)
+				command.setVariables(map);
+			
 			Message response = CommandInterpreter.doTheJob(command);
-			Token token = (Token)Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
-			if (null!=token)
+			Object obj = Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
+			if (obj instanceof Token)
 			{
-				Helper.setLongValue(response, Constants.TOKEN_ID			,token.getId());			
+				Token token = (Token)obj;
+				Helper.setLongValue(response, Constants.TOKEN_ID		,token.getId());			
 				Helper.setLongValue(response, Constants.PROCESS_INSTANCE_ID, token.getProcessInstance().getId());
-				Helper.setBooleanValue(response, Constants.PROCESS_HAS_ENDED, token.hasEnded());
+				Helper.setBooleanValue(response, Constants.HAS_ENDED	,token.hasEnded());
 			}
 			return response;
 		} // _______________________________
 	};
 
-	protected static final CommandExecutor START_WORK_ON_TASK_PERFORMER=new CommandExecutor()
+	protected static final CommandExecutor START_WORK_ON_TASK_EXECUTOR=new CommandExecutor()
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -319,7 +347,7 @@
 		} // _______________________________
 	};
 	
-	protected static final CommandExecutor TASK_INSTANCE_END_PERFORMER=new CommandExecutor()
+	protected static final CommandExecutor TASK_INSTANCE_END_EXECUTOR=new CommandExecutor()
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -336,18 +364,19 @@
 				command.setTransitionName(transition);
 	
 			Message response = CommandInterpreter.doTheJob(command);
-			TaskInstance tInst = (TaskInstance)Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
-			if (null!=tInst)
+			Object obj = Helper.getObjectValue(response, Constants.JBPM_RETURN_OBJECT);
+			if (obj instanceof TaskInstance)			
 			{
-				Helper.setLongValue(response, Constants.PROCESS_INSTANCE_ID	,tInst.getProcessInstance().getId());
-				Helper.setLongValue(response, Constants.TOKEN_ID			,tInst.getToken().getId());
-				Helper.setLongValue(response, Constants.TASK_INSTANCE_ID	,tInst.getId());
+				TaskInstance inst = (TaskInstance)obj;
+				Helper.setLongValue(response, Constants.PROCESS_INSTANCE_ID	,inst.getProcessInstance().getId());
+				Helper.setLongValue(response, Constants.TOKEN_ID			,inst.getToken().getId());
+				Helper.setLongValue(response, Constants.TASK_INSTANCE_ID	,inst.getId());
 			}
 			return response;
 		} // _______________________________
 	};
 	
-	protected static final CommandExecutor VARIABLES_PERFORMER=new CommandExecutor()
+	protected static final CommandExecutor VARIABLES_EXECUTOR=new CommandExecutor()
 	{
 		public Message execute(Message request) throws Exception
 		{
@@ -380,21 +409,21 @@
 	protected static Map<Constants.OpCode,CommandExecutor> _values = new HashMap<Constants.OpCode,CommandExecutor>();	
 	static
 	{
-		_values.put(Constants.OpCode.DeployProcessDefinition	,DEPLOY_PROCESS_DEF_PERFORMER);
-		_values.put(Constants.OpCode.CancelProcessInstanceCommand,CANCEL_PROCESS_INSTANCE_PERFORMER);
-		_values.put(Constants.OpCode.CancelTokenCommand			,CANCEL_TOKEN_PERFORMER);
-		_values.put(Constants.OpCode.CancelWorkOnTaskCommand	,CANCEL_WORK_ON_TASK_PERFORMER);
-		_values.put(Constants.OpCode.GetProcessInstanceCommand	,GET_PROCESS_INSTANCE_PERFORMER);
-		_values.put(Constants.OpCode.GetTaskInstanceCommand		,GET_TASK_INSTANCE_PERFORMER);
+		_values.put(Constants.OpCode.DeployProcessDefinition	,DEPLOY_PROCESS_DEF_EXECUTOR);
+		_values.put(Constants.OpCode.CancelProcessInstanceCommand,CANCEL_PROCESS_INSTANCE_EXECUTOR);
+		_values.put(Constants.OpCode.CancelTokenCommand			,CANCEL_TOKEN_EXECUTOR);
+		_values.put(Constants.OpCode.CancelWorkOnTaskCommand	,CANCEL_WORK_ON_TASK_EXECUTOR);
+		_values.put(Constants.OpCode.GetProcessInstanceCommand	,GET_PROCESS_INSTANCE_EXECUTOR);
+		_values.put(Constants.OpCode.GetTaskInstanceCommand		,GET_TASK_INSTANCE_EXECUTOR);
 //		_values.put(Constants.OpCode.GetTaskListCommand			,???);
 		_values.put(Constants.OpCode.NewProcessInstanceCommand	
 				,new DefaultCommandExecutorFactoryImpl.NewProcessInstancePerformer(false));
-		_values.put(Constants.OpCode.SignalCommand				,SIGNAL_PERFORMER);
+		_values.put(Constants.OpCode.SignalCommand				,SIGNAL_EXECUTOR);
 		_values.put(Constants.OpCode.StartProcessInstanceCommand
 				,new DefaultCommandExecutorFactoryImpl.NewProcessInstancePerformer(true));
-		_values.put(Constants.OpCode.StartWorkOnTaskCommand		,START_WORK_ON_TASK_PERFORMER);
-		_values.put(Constants.OpCode.TaskInstanceEndCommand		,TASK_INSTANCE_END_PERFORMER);
-		_values.put(Constants.OpCode.VariablesCommand			,VARIABLES_PERFORMER);
+		_values.put(Constants.OpCode.StartWorkOnTaskCommand		,START_WORK_ON_TASK_EXECUTOR);
+		_values.put(Constants.OpCode.TaskInstanceEndCommand		,TASK_INSTANCE_END_EXECUTOR);
+		_values.put(Constants.OpCode.VariablesCommand			,VARIABLES_EXECUTOR);
 	}
 	
 	// this class will be used both for NewProcessInstance and for StartProcessInstance

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultMessageFacadeFactoryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultMessageFacadeFactoryImpl.java	2007-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultMessageFacadeFactoryImpl.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -35,6 +35,10 @@
 import org.jboss.soa.esb.services.jbpm.internal.facades.GetTaskInstanceFacade;
 import org.jboss.soa.esb.services.jbpm.internal.facades.GetTaskListFacade;
 import org.jboss.soa.esb.services.jbpm.internal.facades.NewProcessInstanceFacade;
+import org.jboss.soa.esb.services.jbpm.internal.facades.SignalFacade;
+import org.jboss.soa.esb.services.jbpm.internal.facades.StartWorkOnTaskFacade;
+import org.jboss.soa.esb.services.jbpm.internal.facades.TaskInstanceEndFacade;
+import org.jboss.soa.esb.services.jbpm.internal.facades.VariablesFacade;
 
 /**
  * Default implementation of a message preprocessor factory
@@ -78,15 +82,15 @@
 		if	(Constants.OpCode.NewProcessInstanceCommand		.equals(opCode))
 			return new NewProcessInstanceFacade		(config, false);
 		if	(Constants.OpCode.SignalCommand					.equals(opCode))
-			return null;
+			return new SignalFacade					(config);
 		if	(Constants.OpCode.StartProcessInstanceCommand	.equals(opCode))
 			return new NewProcessInstanceFacade		(config, true);
 		if	(Constants.OpCode.StartWorkOnTaskCommand		.equals(opCode))
-			return null;
+			return new StartWorkOnTaskFacade		(config);
 		if	(Constants.OpCode.TaskInstanceEndCommand		.equals(opCode))
-			return null;
+			return new TaskInstanceEndFacade		(config);
 		if	(Constants.OpCode.VariablesCommand				.equals(opCode))
-			return null;
+			return new VariablesFacade				(config);
 		
 		throw new ConfigurationException(opCode.toString()+" not implemented");
 	} // _______________________________

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/DeployProcessDefinitionFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/DeployProcessDefinitionFacade.java	2007-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/DeployProcessDefinitionFacade.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -83,6 +83,7 @@
     
 	public Message postFormat(Message message) 
 	{
+		
 		return message;
 	} // ________________________________
     

Added: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/SignalFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/SignalFacade.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/SignalFacade.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.internal.facades;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.Constants;
+import org.jboss.soa.esb.services.jbpm.Constants.OpCode;
+import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
+import org.jbpm.graph.exe.Token;
+
+/**
+ *
+ * Implementation of a message preprocessor to obtain data from a process instance 
+ * from the action configuration XML
+ * 
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a> 
+ */
+public class SignalFacade implements SingleCommandProcessor.MessageFacade
+{
+	public OpCode getOpCode() { return Constants.OpCode.SignalCommand; }
+
+	public SignalFacade(ConfigTree config) throws ConfigurationException
+	{
+		_transition		= config.getAttribute(Constants.TRANSITION_NAME_TAG);
+		_variables		= FacadeUtil.variablesFromConfig(config, false);
+	} // ________________________________
+	
+	public void preFormat(Message message) 
+	{
+		Body body = message.getBody();
+		if (null!=_transition)
+			body.add(Constants.TRANSITION_NAME, _transition);
+		if (null!=_variables)
+			body.add(Constants.VARIABLE_VALUES, _variables.jbpmVariables());
+	} // _______________________________
+    
+	public Message postFormat(Message response) 
+	{
+		Body body = response.getBody();
+		Object obj = body.get(Constants.JBPM_RETURN_OBJECT);
+		if (obj instanceof Token)
+			body.add(Constants.CURRENT_NODE_NAME,((Token)obj).getNode().getName());
+		return response;
+	} // ________________________________
+
+	String			_transition;
+	VariableMapping _variables;
+}


Property changes on: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/SignalFacade.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/StartWorkOnTaskFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/StartWorkOnTaskFacade.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/StartWorkOnTaskFacade.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.internal.facades;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.Constants;
+import org.jboss.soa.esb.services.jbpm.Constants.OpCode;
+import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
+
+/**
+ *
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a> 
+ */
+public class StartWorkOnTaskFacade implements SingleCommandProcessor.MessageFacade
+{
+	public OpCode getOpCode() { return Constants.OpCode.StartWorkOnTaskCommand; }
+
+	public StartWorkOnTaskFacade(ConfigTree config) throws ConfigurationException
+	{
+		_overwriteSwim	= FacadeUtil.booleanFromConfig(config,Constants.OVERWRITE_SWIMLANE_TAG);
+	} // ________________________________
+	
+	public void preFormat(Message message) 
+	{
+		Body body = message.getBody();
+		if (null!=_overwriteSwim)
+			body.add(Constants.OVERWRITE_SWIMLANE,_overwriteSwim);
+	} // _______________________________
+    
+	public Message postFormat(Message response) 
+	{
+		return response;
+	} // ________________________________
+
+	Boolean 	_overwriteSwim;
+}


Property changes on: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/StartWorkOnTaskFacade.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/TaskInstanceEndFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/TaskInstanceEndFacade.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/TaskInstanceEndFacade.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.services.jbpm.internal.facades;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.Constants;
+import org.jboss.soa.esb.services.jbpm.Constants.OpCode;
+import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
+
+/**
+ *
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a> 
+ */
+public class TaskInstanceEndFacade implements SingleCommandProcessor.MessageFacade
+{
+	public OpCode getOpCode() { return Constants.OpCode.TaskInstanceEndCommand; }
+
+	public TaskInstanceEndFacade(ConfigTree config) throws ConfigurationException
+	{
+		_variables	= FacadeUtil.variablesFromConfig(config, false);
+		_transitionName	= config.getAttribute(Constants.TRANSITION_NAME_TAG);
+	} // ________________________________
+	
+	public void preFormat(Message message) 
+	{
+		Body body = message.getBody();
+		if (null!=_variables && _variables.size()>0)
+			body.add(Constants.VARIABLE_VALUES, _variables.jbpmVariables());
+		if (null!=_transitionName)
+			body.add(Constants.TRANSITION_NAME, _transitionName);
+	} // _______________________________
+    
+	public Message postFormat(Message response) 
+	{
+		return response;
+	} // ________________________________
+
+	String			_transitionName;
+	VariableMapping _variables;
+}


Property changes on: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/TaskInstanceEndFacade.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/VariablesFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/VariablesFacade.java	2007-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/internal/facades/VariablesFacade.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -1,5 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
 package org.jboss.soa.esb.services.jbpm.internal.facades;
 
-public class VariablesFacade {
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Body;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.Constants;
+import org.jboss.soa.esb.services.jbpm.Constants.OpCode;
+import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
 
+/**
+ *
+ * Implementation of a message preprocessor to obtain data from a process instance 
+ * from the action configuration XML
+ * 
+ * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a> 
+ */
+public class VariablesFacade implements SingleCommandProcessor.MessageFacade
+{
+	public OpCode getOpCode()	{ return Constants.OpCode.VariablesCommand; }
+
+	public VariablesFacade(ConfigTree config) throws ConfigurationException
+	{
+		_variables	= FacadeUtil.variablesFromConfig(config, false);
+	} // ________________________________
+	
+	public void preFormat(Message message) 
+	{
+		Body body = message.getBody();
+		if (null!=_variables && _variables.size()>0)
+			body.add(Constants.VARIABLE_VALUES, _variables.jbpmVariables());
+	} // _______________________________
+    
+	public Message postFormat(Message response) 
+	{
+		return response;
+	} // ________________________________
+
+	VariableMapping _variables;
 }

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-04-22 18:35:48 UTC (rev 11208)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	2007-04-22 20:07:14 UTC (rev 11209)
@@ -91,7 +91,7 @@
 		sb.append(getObject(message,Constants.PROCESS_INSTANCE_ID));
 		sb.append(getObject(message,Constants.TASK_INSTANCE_ID));
 		sb.append(getObject(message,Constants.TOKEN_ID));
-		sb.append(getObject(message,Constants.PROCESS_HAS_ENDED));
+		sb.append(getObject(message,Constants.HAS_ENDED));
 		return sb.append("_______________________________________________________________________")
 			.toString();		
 	}




More information about the jboss-svn-commits mailing list