[jboss-svn-commits] JBL Code SVN: r11350 - in labs/jbossesb/trunk/product/services/jbpm/src: main/java/org/jboss/soa/esb/services/jbpm/actions and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 26 08:19:18 EDT 2007
Author: estebanschifman
Date: 2007-04-26 08:19:18 -0400 (Thu, 26 Apr 2007)
New Revision: 11350
Added:
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/simpleProcessDefinition.xml
Removed:
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessor.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessorUnitTest.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/process_01.xml
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/MessageFacadeFactory.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/actions/impl/facades/DeployProcessDefinitionFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetProcessInstanceFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskInstanceFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskListFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/SignalFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/StartWorkOnTaskFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/TaskInstanceEndFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/VariablesFacade.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreterUnitTest.java
labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/EsbActionHandlerUnitTest.java
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/testSingleCommands.xml
Log:
Rename jbpm related actions, test classes and config files
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-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -66,6 +66,7 @@
// tag names for xml configuration of actions
public static final String COMMAND_CODE_TAG ="command";
+ public static final String PROCESS_DEFINITION_FILE_TAG ="process-definition-file";
public static final String PROCESS_DEFINITION_XML_TAG ="process-definition-xml";
public static final String PROCESS_DEFINITION_NAME_TAG ="process-definition-name";
public static final String PROCESS_DEFINITION_ID_TAG ="process-definition-id";
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/MessageFacadeFactory.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/MessageFacadeFactory.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/MessageFacadeFactory.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -21,11 +21,11 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
+import org.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
import org.jboss.soa.esb.services.jbpm.actions.impl.DefaultMessageFacadeFactoryImpl;
/**
- * Factory to obtain appropriate MessageManipulator for jBPM SingleCommandProcessors
+ * Factory to obtain appropriate MessageManipulator for jBPM BpmProcessor
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*
@@ -33,7 +33,7 @@
public abstract class MessageFacadeFactory
{
- public abstract SingleCommandProcessor.MessageFacade
+ public abstract BpmProcessor.MessageFacade
getPreProcessor(ConfigTree config) throws ConfigurationException;
Copied: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java (from rev 11342, labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessor.java)
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessor.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -0,0 +1,88 @@
+/*
+ * 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.actions;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.ActionProcessingException;
+import org.jboss.soa.esb.addressing.MalformedEPRException;
+import org.jboss.soa.esb.couriers.CourierException;
+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.MessageFacadeFactory;
+
+/**
+*
+* Extend CommandInterpreter by specializing it to a single jBPM command.
+* Part of the message content will be taken from constructor time configuration
+* (from the action configuration XML)
+*
+* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
+*/
+public class BpmProcessor extends CommandInterpreter
+{
+
+ public static final String COMMAND_ATTRIBUTE_TAG = "command";
+
+ public BpmProcessor(ConfigTree config) throws ConfigurationException
+ {
+ super(config);
+ }
+ public Constants.OpCode getOpCode() { return _stuffer.getOpCode(); }
+ @Override
+ protected void checkMyParms() throws ConfigurationException
+ {
+ _stuffer = MessageFacadeFactory.getInstance().getPreProcessor(_config);
+ } // _______________________________
+
+ @Override
+ public Message process(Message message)
+ throws MalformedEPRException, CourierException, ActionProcessingException
+ {
+ message.getBody().add(Constants.COMMAND_CODE,getOpCode().toString());
+ _stuffer.preFormat(message);
+ Message response = super.process(message);
+ return _stuffer.postFormat(response);
+ } // _______________________________
+
+ protected MessageFacade _stuffer;
+ public interface MessageFacade
+ {
+ /**
+ * Obtain the operation code that this preprocessor will force into the command message
+ * @return Constants.OpCode
+ */
+ public Constants.OpCode getOpCode();
+ /**
+ * Some message values are fixed at action configuration time (from the jboss-esb.xml).
+ * <br/>This method is responsible of stuffing these static values into every Message
+ * before passing it to the generic CommandInterpreter process(Message) method
+ * <br/>Some of the Message content will thus come from configuration XML, and some will
+ * be the users' responsibility (e.g. processId, tokenId, etc)
+ * <br/>Variable name mapping between esb and jBPM is also handled by this interface
+ * @param message Message - Into which the static values will be added
+ */
+ public void preFormat(Message request);
+ public Message postFormat(Message response);
+ }
+}
Deleted: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessor.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessor.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -1,88 +0,0 @@
-/*
- * 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.actions;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.addressing.MalformedEPRException;
-import org.jboss.soa.esb.couriers.CourierException;
-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.MessageFacadeFactory;
-
-/**
-*
-* Extend CommandInterpreter by specializing it to a single jBPM command.
-* Part of the message content will be taken from constructor time configuration
-* (from the action configuration XML)
-*
-* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
-*/
-public class SingleCommandProcessor extends CommandInterpreter
-{
-
- public static final String COMMAND_ATTRIBUTE_TAG = "command";
-
- public SingleCommandProcessor(ConfigTree config) throws ConfigurationException
- {
- super(config);
- }
- public Constants.OpCode getOpCode() { return _stuffer.getOpCode(); }
- @Override
- protected void checkMyParms() throws ConfigurationException
- {
- _stuffer = MessageFacadeFactory.getInstance().getPreProcessor(_config);
- } // _______________________________
-
- @Override
- public Message process(Message message)
- throws MalformedEPRException, CourierException, ActionProcessingException
- {
- message.getBody().add(Constants.COMMAND_CODE,getOpCode().toString());
- _stuffer.preFormat(message);
- Message response = super.process(message);
- return _stuffer.postFormat(response);
- } // _______________________________
-
- protected MessageFacade _stuffer;
- public interface MessageFacade
- {
- /**
- * Obtain the operation code that this preprocessor will force into the command message
- * @return Constants.OpCode
- */
- public Constants.OpCode getOpCode();
- /**
- * Some message values are fixed at action configuration time (from the jboss-esb.xml).
- * <br/>This method is responsible of stuffing these static values into every Message
- * before passing it to the generic CommandInterpreter process(Message) method
- * <br/>Some of the Message content will thus come from configuration XML, and some will
- * be the users' responsibility (e.g. processId, tokenId, etc)
- * <br/>Variable name mapping between esb and jBPM is also handled by this interface
- * @param message Message - Into which the static values will be added
- */
- public void preFormat(Message request);
- public Message postFormat(Message response);
- }
-}
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-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/DefaultMessageFacadeFactoryImpl.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,8 +28,8 @@
import org.jboss.soa.esb.services.jbpm.Constants;
import org.jboss.soa.esb.services.jbpm.MessageFacadeFactory;
import org.jboss.soa.esb.services.jbpm.Constants.OpCode;
-import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
-import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor.MessageFacade;
+import org.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
+import org.jboss.soa.esb.services.jbpm.actions.BpmProcessor.MessageFacade;
import org.jboss.soa.esb.services.jbpm.actions.impl.facades.DeployProcessDefinitionFacade;
import org.jboss.soa.esb.services.jbpm.actions.impl.facades.GetProcessInstanceFacade;
import org.jboss.soa.esb.services.jbpm.actions.impl.facades.GetTaskInstanceFacade;
@@ -59,15 +59,15 @@
};
@Override
- public SingleCommandProcessor.MessageFacade getPreProcessor(ConfigTree config)
+ public BpmProcessor.MessageFacade getPreProcessor(ConfigTree config)
throws ConfigurationException
{
Constants.OpCode opCode = null;
- String sAux = config.getRequiredAttribute(SingleCommandProcessor.COMMAND_ATTRIBUTE_TAG);
+ String sAux = config.getRequiredAttribute(BpmProcessor.COMMAND_ATTRIBUTE_TAG);
try { opCode = Constants.OpCode.valueOf(sAux); }
catch (IllegalArgumentException e)
{
- throw new ConfigurationException("Attribute '"+SingleCommandProcessor.COMMAND_ATTRIBUTE_TAG+"' has an invalid value"
+ throw new ConfigurationException("Attribute '"+BpmProcessor.COMMAND_ATTRIBUTE_TAG+"' has an invalid value"
+"- see CommandVehicle.Operation enum for possible values");
}
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/DeployProcessDefinitionFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/DeployProcessDefinitionFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/DeployProcessDefinitionFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -22,12 +22,15 @@
package org.jboss.soa.esb.services.jbpm.actions.impl.facades;
+import java.io.InputStream;
+
import org.jboss.soa.esb.ConfigurationException;
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.Constants.OpCode;
-import org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor;
+import org.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
+import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.soa.esb.util.Util;
import org.jbpm.graph.def.ProcessDefinition;
@@ -38,14 +41,28 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class DeployProcessDefinitionFacade implements SingleCommandProcessor.MessageFacade
+public class DeployProcessDefinitionFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.DeployProcessDefinition; }
public DeployProcessDefinitionFacade(ConfigTree config) throws ConfigurationException
{
+ String filename=config.getAttribute(Constants.PROCESS_DEFINITION_FILE_TAG);
ConfigTree[] childs = config.getChildren(Constants.PROCESS_DEFINITION_XML_TAG);
- if (null==childs || childs.length<1)
+
+ if (null!=filename)
+ {
+ if (childs.length>0)
+ throw new ConfigurationException
+ ("You can specify ither '"+Constants.PROCESS_DEFINITION_FILE_TAG+"' attribute OR "
+ +Constants.PROCESS_DEFINITION_XML_TAG+"> element, but not both");
+
+ InputStream stream = ClassUtil.getResourceAsStream(filename, this.getClass());
+ _processDef = ProcessDefinition.parseXmlInputStream(stream);
+ return;
+ }
+
+ if (childs.length<1)
throw new ConfigurationException("Missing or invalid <"+Constants.PROCESS_DEFINITION_XML_TAG+"> element");
if (childs.length>1)
throw new ConfigurationException("Only one <"+Constants.PROCESS_DEFINITION_XML_TAG+"> element can be specified");
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -8,7 +8,7 @@
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.SingleCommandProcessor;
+import org.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
import org.jboss.soa.esb.util.Util;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.taskmgmt.exe.TaskInstance;
@@ -77,14 +77,14 @@
{
if (null==value)
throw new ConfigurationException("'value' attribute is required for the '"
- +tree.getAttribute(SingleCommandProcessor.COMMAND_ATTRIBUTE_TAG)
+ +tree.getAttribute(BpmProcessor.COMMAND_ATTRIBUTE_TAG)
+"' command");
}
else
{
if (null!=value)
throw new ConfigurationException("'value' attribute is incompatible with the '"
- +tree.getAttribute(SingleCommandProcessor.COMMAND_ATTRIBUTE_TAG)
+ +tree.getAttribute(BpmProcessor.COMMAND_ATTRIBUTE_TAG)
+"' command");
}
// add entry even if value is null, so we'll have mapping anyways
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetProcessInstanceFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetProcessInstanceFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetProcessInstanceFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,7 +28,7 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
/**
*
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class GetProcessInstanceFacade implements SingleCommandProcessor.MessageFacade
+public class GetProcessInstanceFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.GetProcessInstanceCommand; }
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskInstanceFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskInstanceFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskInstanceFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -30,7 +30,7 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
/**
*
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class GetTaskInstanceFacade implements SingleCommandProcessor.MessageFacade
+public class GetTaskInstanceFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.GetTaskInstanceCommand; }
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskListFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskListFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/GetTaskListFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -32,7 +32,7 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
import org.jbpm.taskmgmt.exe.TaskInstance;
/**
@@ -42,7 +42,7 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class GetTaskListFacade implements SingleCommandProcessor.MessageFacade
+public class GetTaskListFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.GetTaskListCommand; }
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/NewProcessInstanceFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,7 +28,7 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
/**
*
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class NewProcessInstanceFacade implements SingleCommandProcessor.MessageFacade
+public class NewProcessInstanceFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode()
{
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/SignalFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/SignalFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/SignalFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,7 +28,7 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
import org.jbpm.graph.exe.Token;
/**
@@ -38,7 +38,7 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class SignalFacade implements SingleCommandProcessor.MessageFacade
+public class SignalFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.SignalCommand; }
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/StartWorkOnTaskFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/StartWorkOnTaskFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/StartWorkOnTaskFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,13 +28,13 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
/**
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class StartWorkOnTaskFacade implements SingleCommandProcessor.MessageFacade
+public class StartWorkOnTaskFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.StartWorkOnTaskCommand; }
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/TaskInstanceEndFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/TaskInstanceEndFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/TaskInstanceEndFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,13 +28,13 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
/**
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class TaskInstanceEndFacade implements SingleCommandProcessor.MessageFacade
+public class TaskInstanceEndFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.TaskInstanceEndCommand; }
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/VariablesFacade.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/VariablesFacade.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/VariablesFacade.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -28,7 +28,7 @@
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.jboss.soa.esb.services.jbpm.actions.BpmProcessor;
/**
*
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
*/
-public class VariablesFacade implements SingleCommandProcessor.MessageFacade
+public class VariablesFacade implements BpmProcessor.MessageFacade
{
public OpCode getOpCode() { return Constants.OpCode.VariablesCommand; }
Copied: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java (from rev 11342, labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessorUnitTest.java)
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/BpmProcessorUnitTest.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -0,0 +1,166 @@
+/*
+ * 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.actions;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import junit.framework.JUnit4TestAdapter;
+
+import org.apache.log4j.Logger;
+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.util.Helper;
+import org.jbpm.JbpmConfiguration;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Test the jBPM command interpreter class
+ *
+ * @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a>
+ */
+
+
+public class BpmProcessorUnitTest
+{
+
+ private static Class thisClass = BpmProcessorUnitTest.class;
+ static Logger _logger = Logger.getLogger(thisClass);
+
+ private static File _hibernateConfFile;
+
+ public static junit.framework.Test suite()
+ {
+ return new JUnit4TestAdapter(thisClass);
+ }
+
+ @BeforeClass
+ public static void runBeforeAllTests()
+ {
+ _logger.info("@BeforeClass invoked");
+ try
+ {
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ assertTrue(false);
+ }
+ }
+
+
+ @AfterClass
+ public static void runAfterAllTests() throws Exception
+ {
+ _logger.info("@AfterClass invoked");
+ // Remove the hibernate.cfg.xml file we copied to the classpath root
+ if (null!=_hibernateConfFile)
+ {
+ JbpmConfiguration.getInstance().dropSchema();
+ _hibernateConfFile.delete();
+ }
+ }
+
+ @Test
+ public void mockTest()
+ {
+ // place holder so test will run even with no other @Test
+ _logger.info("Mock test invoked");
+ assertTrue(true);
+ }
+
+ @Test
+ public void testBpmProcessor()
+ {
+ Message request, response;
+ BpmProcessor command;
+ String ret;
+ try
+ {
+ String xml = JbpmTestUtil.stringFromFile("testSingleCommands.xml");
+ ConfigTree[] actions = ConfigTree.fromXml(xml).getChildren("action");
+ int index = 0;
+
+ command = new BpmProcessor(actions[index++]);
+ response = command.process(Helper.commandMessageTemplate());
+ _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
+ ret = Helper.getStringValue(response, Constants.RETURN_CODE);
+ assertTrue(Constants.RETCODE_OK.equals(ret));
+
+ // Keep the variables for comparison in future steps
+ ConfigTree[] vars = actions[index].getFirstChild(Constants.VARIABLES_TAG)
+ .getChildren(Constants.ONE_VARIABLE_TAG);
+
+ command = new BpmProcessor(actions[index++]);
+ response = command.process(Helper.commandMessageTemplate());
+ _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
+ ret = Helper.getStringValue(response, Constants.RETURN_CODE);
+ assertTrue(Constants.RETCODE_OK.equals(ret));
+
+ Long tokenId = (Long)response.getBody().get(Constants.TOKEN_ID);
+ Long processId = (Long)response.getBody().get(Constants.PROCESS_INSTANCE_ID);
+
+ command = new BpmProcessor(actions[index++]);
+ request = Helper.commandMessageTemplate();
+ Helper.setLongValue(request, Constants.TOKEN_ID, tokenId);
+ response = command.process(request);
+ _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
+ ret = Helper.getStringValue(response, Constants.RETURN_CODE);
+ assertTrue(Constants.RETCODE_OK.equals(ret));
+
+ // we've mapped differently, so check if mapping worked both ways
+ Body body = response.getBody();
+ assertTrue(vars[0].getAttribute("value").equals(body.get("xxx")));
+ assertTrue(vars[1].getAttribute("value").equals(body.get("yyy")));
+
+ command = new BpmProcessor(actions[index++]);
+ request = Helper.commandMessageTemplate();
+ Helper.setLongValue(request, Constants.PROCESS_INSTANCE_ID, processId);
+ response = command.process(request);
+ _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
+ ret = Helper.getStringValue(response, Constants.RETURN_CODE);
+ assertTrue(Constants.RETCODE_OK.equals(ret));
+
+ command = new BpmProcessor(actions[index++]);
+ request = Helper.commandMessageTemplate();
+ Helper.setLongValue(request, Constants.PROCESS_INSTANCE_ID, processId);
+ response = command.process(request);
+ _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
+ ret = Helper.getStringValue(response, Constants.RETURN_CODE);
+ assertTrue(Constants.RETCODE_OK.equals(ret));
+
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ _logger.error(e);
+ assertTrue(false);
+ }
+ } //________________________________
+
+}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreterUnitTest.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreterUnitTest.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -102,7 +102,7 @@
request = Helper.commandMessageTemplate();
Helper.setStringValue(request, Constants.COMMAND_CODE, opCode);
Helper.setStringValue(request, Constants.PROCESS_DEFINITION_XML
- , JbpmTestUtil.stringFromFile("process_01.xml"));
+ , JbpmTestUtil.stringFromFile("simpleProcessDefinition.xml"));
response = invokeJbpm(request);
_logger.info(JbpmTestUtil.dumpResponse(response, opCode));
Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/EsbActionHandlerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/EsbActionHandlerUnitTest.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/EsbActionHandlerUnitTest.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -112,16 +112,16 @@
for(Boolean processVars: new boolean[]{false,true})
try
{
- // use the same config as the SingleCommandProcessorUnitTest
+ // use the same config as the BpmProcessorUnitTest
String xml = JbpmTestUtil.stringFromFile("testSingleCommands.xml");
ConfigTree[] actions = ConfigTree.fromXml(xml).getChildren("action");
// create a process def
- SingleCommandProcessor command = new SingleCommandProcessor(actions[0]);
+ BpmProcessor command = new BpmProcessor(actions[0]);
command.process(Helper.commandMessageTemplate());
// create a process instance
- command = new SingleCommandProcessor(actions[1]);
+ command = new BpmProcessor(actions[1]);
msg = command.process(Helper.commandMessageTemplate());
ProcessInstance inst = (ProcessInstance)msg.getBody()
.get(Constants.JBPM_RETURN_OBJECT);
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-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -31,6 +31,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.jbpm.Constants;
+import org.jboss.soa.esb.util.ClassUtil;
public class JbpmTestUtil
{
@@ -38,7 +39,7 @@
public static String stringFromFile(String pFileName) throws IOException
{
- InputStream in = thisClass.getResourceAsStream(pFileName);
+ InputStream in = ClassUtil.getResourceAsStream(pFileName,thisClass);
ByteArrayOutputStream out = new ByteArrayOutputStream();
byte[]ba = new byte[1000];
int iQ = -1;
Deleted: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessorUnitTest.java 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/SingleCommandProcessorUnitTest.java 2007-04-26 12:19:18 UTC (rev 11350)
@@ -1,166 +0,0 @@
-/*
- * 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.actions;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import junit.framework.JUnit4TestAdapter;
-
-import org.apache.log4j.Logger;
-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.util.Helper;
-import org.jbpm.JbpmConfiguration;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test the jBPM command interpreter class
- *
- * @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a>
- */
-
-
-public class SingleCommandProcessorUnitTest
-{
-
- private static Class thisClass = SingleCommandProcessorUnitTest.class;
- static Logger _logger = Logger.getLogger(thisClass);
-
- private static File _hibernateConfFile;
-
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(thisClass);
- }
-
- @BeforeClass
- public static void runBeforeAllTests()
- {
- _logger.info("@BeforeClass invoked");
- try
- {
- }
- catch (Exception e)
- {
- e.printStackTrace();
- assertTrue(false);
- }
- }
-
-
- @AfterClass
- public static void runAfterAllTests() throws Exception
- {
- _logger.info("@AfterClass invoked");
- // Remove the hibernate.cfg.xml file we copied to the classpath root
- if (null!=_hibernateConfFile)
- {
- JbpmConfiguration.getInstance().dropSchema();
- _hibernateConfFile.delete();
- }
- }
-
- @Test
- public void mockTest()
- {
- // place holder so test will run even with no other @Test
- _logger.info("Mock test invoked");
- assertTrue(true);
- }
-
- @Test
- public void testSingleCommandProcessor()
- {
- Message request, response;
- SingleCommandProcessor command;
- String ret;
- try
- {
- String xml = JbpmTestUtil.stringFromFile("testSingleCommands.xml");
- ConfigTree[] actions = ConfigTree.fromXml(xml).getChildren("action");
- int index = 0;
-
- command = new SingleCommandProcessor(actions[index++]);
- response = command.process(Helper.commandMessageTemplate());
- _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
- ret = Helper.getStringValue(response, Constants.RETURN_CODE);
- assertTrue(Constants.RETCODE_OK.equals(ret));
-
- // Keep the variables for comparison in future steps
- ConfigTree[] vars = actions[index].getFirstChild(Constants.VARIABLES_TAG)
- .getChildren(Constants.ONE_VARIABLE_TAG);
-
- command = new SingleCommandProcessor(actions[index++]);
- response = command.process(Helper.commandMessageTemplate());
- _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
- ret = Helper.getStringValue(response, Constants.RETURN_CODE);
- assertTrue(Constants.RETCODE_OK.equals(ret));
-
- Long tokenId = (Long)response.getBody().get(Constants.TOKEN_ID);
- Long processId = (Long)response.getBody().get(Constants.PROCESS_INSTANCE_ID);
-
- command = new SingleCommandProcessor(actions[index++]);
- request = Helper.commandMessageTemplate();
- Helper.setLongValue(request, Constants.TOKEN_ID, tokenId);
- response = command.process(request);
- _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
- ret = Helper.getStringValue(response, Constants.RETURN_CODE);
- assertTrue(Constants.RETCODE_OK.equals(ret));
-
- // we've mapped differently, so check if mapping worked both ways
- Body body = response.getBody();
- assertTrue(vars[0].getAttribute("value").equals(body.get("xxx")));
- assertTrue(vars[1].getAttribute("value").equals(body.get("yyy")));
-
- command = new SingleCommandProcessor(actions[index++]);
- request = Helper.commandMessageTemplate();
- Helper.setLongValue(request, Constants.PROCESS_INSTANCE_ID, processId);
- response = command.process(request);
- _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
- ret = Helper.getStringValue(response, Constants.RETURN_CODE);
- assertTrue(Constants.RETCODE_OK.equals(ret));
-
- command = new SingleCommandProcessor(actions[index++]);
- request = Helper.commandMessageTemplate();
- Helper.setLongValue(request, Constants.PROCESS_INSTANCE_ID, processId);
- response = command.process(request);
- _logger.info(JbpmTestUtil.dumpResponse(response, command.getOpCode()));
- ret = Helper.getStringValue(response, Constants.RETURN_CODE);
- assertTrue(Constants.RETCODE_OK.equals(ret));
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- _logger.error(e);
- assertTrue(false);
- }
- } //________________________________
-
-}
\ No newline at end of file
Deleted: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/process_01.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/process_01.xml 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/process_01.xml 2007-04-26 12:19:18 UTC (rev 11350)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition
- xmlns="urn:jbpm.org:jpdl-3.1"
- name="simple">
- <start-state name="start">
- <transition name="to_state" to="first" />
- </start-state>
- <state name="first">
- <transition name="to_end" to="end" />
- </state>
- <end-state name="end"></end-state>
-</process-definition>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/simpleProcessDefinition.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/simpleProcessDefinition.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/simpleProcessDefinition.xml 2007-04-26 12:19:18 UTC (rev 11350)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+ xmlns="urn:jbpm.org:jpdl-3.1"
+ name="simple">
+ <start-state name="start">
+ <transition name="to_state" to="first" />
+ </start-state>
+ <state name="first">
+ <transition name="to_end" to="end" />
+ </state>
+ <end-state name="end"></end-state>
+</process-definition>
\ No newline at end of file
Property changes on: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/simpleProcessDefinition.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml 2007-04-26 10:02:46 UTC (rev 11349)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/testSingleCommands.xml 2007-04-26 12:19:18 UTC (rev 11350)
@@ -1,6 +1,6 @@
<testActions>
- <action name="TestDeploy"
- class="org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor"
+ <action name="TestEmbeddedDeploy"
+ class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="DeployProcessDefinition">
<process-definition-xml version="1.0" encoding="UTF-8">
<process-definition
@@ -23,7 +23,7 @@
</action>
<action name="aNewInstance"
- class="org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor"
+ class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="NewProcessInstanceCommand"
process-definition-name="simple"
actor="FrankSinatra"
@@ -35,7 +35,7 @@
</action>
<action name="nowGetItBack"
- class="org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor"
+ class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="GetProcessInstanceCommand"
>
<variables>
@@ -45,16 +45,22 @@
</action>
<action name="nowCancelIt"
- class="org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor"
+ class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="CancelProcessInstanceCommand"
>
</action>
<action name="getItAgain"
- class="org.jboss.soa.esb.services.jbpm.actions.SingleCommandProcessor"
+ class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
command="GetProcessInstanceCommand"
include-all-variables="true"
>
</action>
+ <action name="TestDeployFromFile"
+ class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+ command="DeployProcessDefinition"
+ process-definition-file="org/jboss/soa/esb/services/jbpm/actions/simpleProcessDefinition.xml"
+ />
+
</testActions>
More information about the jboss-svn-commits
mailing list