[jboss-svn-commits] JBL Code SVN: r10892 - in labs/jbossesb/trunk/product: samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 11 12:56:45 EDT 2007
Author: estebanschifman
Date: 2007-04-11 12:56:45 -0400 (Wed, 11 Apr 2007)
New Revision: 10892
Removed:
labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/gpd.xml
labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/hibernate.cfg.xml
labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/processimage.jpg
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/actions/CommandInterpreter.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/util/CommandVehicle.java
Log:
Tune jbpm quickstart and related classes
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/gpd.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/gpd.xml 2007-04-11 16:55:43 UTC (rev 10891)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/gpd.xml 2007-04-11 16:56:45 UTC (rev 10892)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-diagram name="simple" width="690" height="503">
- <node name="start" x="0" y="0" width="140" height="40">
- <transition name="to_state">
- <label x="5" y="-10"/>
- </transition>
- </node>
- <node name="first" x="0" y="0" width="140" height="40">
- <transition name="to_end">
- <label x="5" y="-10"/>
- </transition>
- </node>
- <node name="end" x="0" y="0" width="140" height="40"/>
-</process-diagram>
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/hibernate.cfg.xml 2007-04-11 16:55:43 UTC (rev 10891)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/hibernate.cfg.xml 2007-04-11 16:56:45 UTC (rev 10892)
@@ -1,178 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
- <session-factory>
- <!-- jdbc connection properties -->
- <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
- <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
- <property name="hibernate.connection.url">jdbc:hsqldb:mem:.;sql.enforce_strict_size=true</property>
-<!--
- <property name="hibernate.connection.url">jdbc:hsqldb:hsql://localhost/juddi</property>
--->
- <property name="hibernate.connection.username">sa</property>
- <property name="hibernate.connection.password"></property>
-<!--
- <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
- <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
- <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/JbpmDB</property>
- <property name="hibernate.connection.username">postgres</property>
- <property name="hibernate.connection.password"></property>
--->
-
-
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
- <!-- other hibernate properties
- <property name="hibernate.show_sql">true</property>
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
- -->
-
- <!-- ############################################ -->
- <!-- # mapping files with external dependencies # -->
- <!-- ############################################ -->
-
- <!-- following mapping file has a dependendy on -->
- <!-- 'bsh-{version}.jar'. -->
- <!-- uncomment this if you don't have bsh on your -->
- <!-- classpath. you won't be able to use the -->
- <!-- script element in process definition files -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
-
- <!-- following mapping files have a dependendy on -->
- <!-- 'jbpm-identity-{version}.jar', mapping files -->
- <!-- of the pluggable jbpm identity component. -->
- <!-- comment out the following 3 lines if you don't-->
- <!-- want to use the default jBPM identity mgmgt -->
- <!-- component -->
- <mapping resource="org/jbpm/identity/User.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
-
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
-
- <!-- hql queries and type defs -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
-
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
- <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
-
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
-
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
-
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
-
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
-
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
-
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
-
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
- <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
-
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
-
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
-
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
-
- <!-- msg.db mapping files -->
- <mapping resource="org/jbpm/msg/Message.hbm.xml"/>
- <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>
-
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
-
- <!-- scheduler.exe mapping files -->
- <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/>
-
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
-
- </session-factory>
-</hibernate-configuration>
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/processimage.jpg
===================================================================
(Binary files differ)
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-11 16:55:43 UTC (rev 10891)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java 2007-04-11 16:56:45 UTC (rev 10892)
@@ -87,7 +87,7 @@
operation = CommandVehicle.Operation.deployProcessDefinition;
command = new CommandVehicle(operation);
- command.setProcessDefinition(getProcessDefinitionXml("processdefinition.xml"));
+ command.setProcessDefinitionXml(stringFromFile("processdefinition.xml"));
Message respMsg = invokeJbpm(command);
CommandVehicle response = (null==respMsg) ? null : new CommandVehicle(respMsg);
if (null!=response)
@@ -207,7 +207,7 @@
_logger.info("_______________________________________________________________________");
}
- protected String getProcessDefinitionXml(String pFileName) throws Exception
+ protected String stringFromFile(String pFileName) throws Exception
{
String userDir = System.getProperty("user.dir");
String baseDir = (userDir.endsWith("jbpm_simple1"))
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-11 16:55:43 UTC (rev 10891)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/CommandInterpreter.java 2007-04-11 16:56:45 UTC (rev 10892)
@@ -123,7 +123,8 @@
try
{
prepareJbpm();
- ProcessDefinition def = _command.getProcessDefinition();
+ String xmlString = _command.getProcessDefinitionXml();
+ ProcessDefinition def = ProcessDefinition.parseXmlString(xmlString);
_jbpmCtx.deployProcessDefinition(def);
_command.setProcessDefinitionName (def.getName());
_command.setProcessVersion (def.getVersion());
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/util/CommandVehicle.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/util/CommandVehicle.java 2007-04-11 16:55:43 UTC (rev 10891)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/util/CommandVehicle.java 2007-04-11 16:56:45 UTC (rev 10892)
@@ -26,8 +26,6 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.util.AbstractCommandVehicle;
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.jpdl.JpdlException;
/**
*
@@ -49,7 +47,7 @@
@Override
public String getCommandOpcodeKey() { return "jBPMOpCode";}
- public static final String PROCESS_DEFINITION ="processDefinition";
+ public static final String PROCESS_DEFINITION_XML ="processDefinitionXml";
public static final String PROCESS_DEFINITION_NAME ="processDefName";
public static final String PROCESS_DEFINITION_VERSION ="processDefVersion";
public static final String PROCESS_INSTANCE_ID ="instanceId";
@@ -94,7 +92,7 @@
public CommandVehicle(Message message){ super(message); }
public Object getReturnCode () { return _values.get(RETURN_CODE); }
- public ProcessDefinition getProcessDefinition() { return (ProcessDefinition)_values.get(PROCESS_DEFINITION); }
+ public String getProcessDefinitionXml() { return (String) _values.get(PROCESS_DEFINITION_XML); }
public String getProcessDefinitionName () { return (String) _values.get(PROCESS_DEFINITION_NAME); }
public int getProcessVersion () { return (Integer) _values.get(PROCESS_DEFINITION_VERSION); }
public long getInstanceId () { return (Long) _values.get(PROCESS_INSTANCE_ID); }
@@ -113,12 +111,7 @@
public String getErrorMessage () { return (String) _values.get(ERROR_MESSAGE); }
public void setReturnCode (Object obj){ super.setValue(RETURN_CODE ,obj); }
- public void setProcessDefinition(ProcessDefinition obj)
- { super.setValue(PROCESS_DEFINITION ,obj); }
- public void setProcessDefinition(String xmlString) throws JpdlException
- {
- super.setValue(PROCESS_DEFINITION ,ProcessDefinition.parseXmlString(xmlString));
- }
+ public void setProcessDefinitionXml(String obj){ super.setValue(PROCESS_DEFINITION_XML ,obj); }
public void setProcessDefinitionName(String obj){ super.setValue(PROCESS_DEFINITION_NAME,obj); }
public void setProcessVersion (int obj){ super.setValue(PROCESS_DEFINITION_VERSION,obj); }
public void setInstanceId (long obj){ super.setValue(PROCESS_INSTANCE_ID ,obj); }
More information about the jboss-svn-commits
mailing list