[jboss-svn-commits] JBL Code SVN: r18114 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product: samples/quickstarts/bpm_orchestration1 and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 25 10:48:26 EST 2008
Author: kurt.stam at jboss.com
Date: 2008-01-25 10:48:25 -0500 (Fri, 25 Jan 2008)
New Revision: 18114
Added:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/lib/ext/jbpm-ant.jar
Removed:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/DeployProcessDefinitionFacade.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/cmd/
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/services/jBPMIntegrationGuide.odt
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/services/jBPMIntegrationGuide.pdf
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageFacade.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/resources/testExceptionHandling.jpg
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/resources/testExceptionHandling.xml
Log:
http://jira.jboss.com/jira/browse/JBESB-1401, removing the deploy process command, adding the DeployProcessToServer ant task.
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/services/jBPMIntegrationGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/services/jBPMIntegrationGuide.pdf
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/build.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -38,22 +38,15 @@
<target name="runtest">
<echo message="This target is not implemented for this quickstart. Please run 'ant deployProcess' and 'ant startProcess'"/>
</target>
-
- <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
- <echo>Moves the changed process definition to the server without restarting all the services</echo>
- <copy overwrite="true"
- file="${project.process.dir}/processdefinition.xml"
- tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb/processdefinition.xml"/>
- </target>
- <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
- <echo>Sends a message to deploy the process definition</echo>
- <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
- <arg value="${jbossesb.inputdir}"/>
- <arg value=".deployProcessGW"/> <!-- file ext -->
- <arg value="Go Deploy It"/> <!-- the file contents -->
- <classpath refid="exec-classpath"/>
- </java>
+ <target name="deployProcess" description="deploys the process definition" depends="jbossesb-dependencies">
+ <echo>Deploy the process definition</echo>
+ <taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
+ <classpath refid="exec-classpath"/>
+ </taskdef>
+ <deployToServer>
+ <fileset dir="${basedir}/processDefinition" includes="*"/>
+ </deployToServer>
</target>
<target name="startProcess" depends="compile" description="Sends a message to start the process instance">
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -75,27 +75,6 @@
</providers>
<services>
- <service category="BPM_Orchestration_Deploy_Service" name="Deploy_Service"
- description="BPM Orchestration Sample 1: Use this service to deploy a process instance">
- <listeners>
- <fs-listener name="Gateway" busidref="deployGwChannel"
- maxThreads="1"
- is-gateway="true" />
- <fs-listener name="ESB-Listener" busidref="deployEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
- <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore">
- <property name="logSuccess" value="true"/>
- </action>
- <action name="DeployFromFile"
- class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
- <property name="command" value="DeployProcessDefinition" />
- <property name="process-definition-file" value="/processdefinition.xml" />
- </action>
-
- </actions>
- </service>
<service category="BPM_Orchestration_Starter_Service" name="Starter_Service"
description="BPM Orchestration Sample 1: Use this service to start a process instance">
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/build.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -31,12 +31,14 @@
<echo>Use "ant deployProcess" followed by "ant startProcess"</echo>
</target>
- <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
- <echo>Sends a message to deploy the process definition</echo>
- <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageDeploy" failonerror="true">
- <arg value="Hello World: Deploy the process def"/>
- <classpath refid="exec-classpath"/>
- </java>
+ <target name="deployProcess" description="deploys the process definition" depends="jbossesb-dependencies">
+ <echo>Deploy the process definition</echo>
+ <taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
+ <classpath refid="exec-classpath"/>
+ </taskdef>
+ <deployToServer>
+ <fileset dir="${basedir}/processDefinition" includes="*"/>
+ </deployToServer>
</target>
<target name="startProcess" depends="compile" description="Sends a message to start the process instance">
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration2/jboss-esb.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -62,30 +62,8 @@
</providers>
<services>
- <service category="BPM_Orchestration2_Deploy_Service" name="Deploy_Service"
- description="BPM Orchestration Sample 2: Use this service to deploy a process instance">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="deployGwChannel"
- maxThreads="1"
- is-gateway="true" />
- <jms-listener name="ESB-Listener" busidref="deployEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions>
- <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore">
- <property name="logSuccess" value="true"/>
- </action>
- <action name="DeployFromFile"
- class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
- <property name="command" value="DeployProcessDefinition" />
- <property name="process-definition-file" value="/processDefinition/processdefinition.xml" />
- </action>
- <action name="deployed-message" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="Process Definition Deployed" />
- </action>
- </actions>
- </service>
+
<service category="BPM_Orchestration2_Starter_Service" name="Starter_Service"
description="BPM Orchestration Sample 2: Use this service to start a process instance">
<listeners>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/build.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -35,14 +35,15 @@
<echo>Use "ant deployProcess" followed by "ant startProcess"</echo>
</target>
- <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
- <echo>Sends a message to deploy the process definition</echo>
- <java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration3.test.SendJMSMessage" failonerror="true">
- <arg value="queue/quickstart_bpm_orchestration3_deploy_Request_gw"/>
- <arg value="Hello Deploy"/>
- <classpath refid="exec-classpath"/>
- </java>
- </target>
+ <target name="deployProcess" description="deploys the process definition" depends="jbossesb-dependencies">
+ <echo>Deploy the process definition</echo>
+ <taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
+ <classpath refid="exec-classpath"/>
+ </taskdef>
+ <deployToServer>
+ <fileset dir="${basedir}/processDefinition" includes="*"/>
+ </deployToServer>
+ </target>
<target name="startProcess" depends="compile" description="Sends a message to start a new process instance">
<echo>Sends a message to start a new process instance</echo>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/jboss-esb.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration3/jboss-esb.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -48,29 +48,6 @@
</providers>
<services>
- <service category="BPM_Orchestration3_Deploy_Service" name="Deploy_Service"
- description="BPM Orchestration Sample 3: Use this service to deploy a process instance">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="deployGwChannel"
- maxThreads="1"
- is-gateway="true" />
- <jms-listener name="ESB-Listener" busidref="deployEsbChannel"
- maxThreads="1"/>
- </listeners>
- <actions mep="OneWay">
- <action name="testStore" class="org.jboss.soa.esb.actions.TestMessageStore">
- <property name="logSuccess" value="true"/>
- </action>
- <action name="DeployFromFile"
- class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
- <property name="command" value="DeployProcessDefinition" />
- <property name="process-definition-file" value="/processDefinition/processdefinition.xml" />
- </action>
- <action name="deployed-message" class="org.jboss.soa.esb.actions.SystemPrintln">
- <property name="message" value="Process Definition Deployed" />
- </action>
- </actions>
- </service>
<service category="BPM_Orchestration3_Starter_Service" name="Starter_Service"
description="BPM Orchestration Sample 3: Use this service to start a process instance">
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/build.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -29,6 +29,16 @@
<echo>Follow the instructions in the readme.</echo>
</target>
+ <target name="deployProcess" description="deploys the process definition" depends="jbossesb-dependencies">
+ <echo>Deploy the process definition</echo>
+ <taskdef name="deployToServer" classname="org.jbpm.ant.DeployProcessToServerTask">
+ <classpath refid="exec-classpath"/>
+ </taskdef>
+ <deployToServer>
+ <fileset dir="${basedir}/processDefinition" includes="*"/>
+ </deployToServer>
+ </target>
+
<target name="startProcess" depends="compile" description="Sends a message to start the process instance">
<echo>Sends a message to start the process instance</echo>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/docs/Readme.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/docs/Readme.pdf
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/jboss-esb.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -58,16 +58,12 @@
<jms-listener name="ESB-Listener"
busidref="startEsbChannel" maxThreads="1" />
</listeners>
- <actions>
-
- <action name="setup_key"
- class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
- <property name="script"
- value="/scripts/setup_key.groovy" />
+ <actions>
+ <action name="setup_key"
+ class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+ <property name="script"
+ value="/scripts/setup_key.groovy" />
</action>
-
-
- <!-- TODO: need an action that discovers and sets up key -->
<action name="start_a_new_order_process"
class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
<property name="command"
@@ -78,14 +74,12 @@
<property name="esbToBpmVars">
<mapping esb="BODY_CONTENT" bpm="entireOrderAsXML" />
</property>
-
+
</action>
-
- <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
+ <action name="dump2" class="org.jboss.soa.esb.actions.SystemPrintln">
<property name="message" value="After" />
<property name="printfull" value="true"/>
- </action>
-
+ </action>
</actions>
</service>
<service category="BPM_Orchestration4" name="IntakeService"
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/bpm_orchestration4/processDefinition/gpd.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<root-container name="bpm4_ESBOrderProcess" width="1097" height="813">
- <node name="start" x="225" y="10" width="140" height="40">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="Intake Order" x="114" y="81" width="140" height="40">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="Review Order" x="311" y="80" width="140" height="40">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="Calculate Discount" x="116" y="155" width="140" height="40">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="Review Discount" x="309" y="156" width="140" height="40">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="Ship It" x="216" y="228" width="140" height="40">
- <edge>
- <label x="5" y="-10"/>
- </edge>
- </node>
- <node name="end" x="219" y="296" width="140" height="40"/>
-</root-container>
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/lib/ext/jbpm-ant.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/lib/ext/jbpm-ant.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/Constants.java 2008-01-25 15:48:25 UTC (rev 18114)
@@ -100,9 +100,9 @@
public enum OpCode
{
- CallbackCommand,
- DeployProcessDefinition
-// AbstractCancelCommand
+ CallbackCommand
+// ,DeployProcessDefinition
+// ,AbstractCancelCommand
// ,AbstractGetObjectBaseCommand
// ,AsynchronousCommand
,CancelProcessInstanceCommand
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2008-01-25 15:48:25 UTC (rev 18114)
@@ -43,9 +43,7 @@
*
* <li/>esbCategoryName - for ESB registry lookup
* <li/>esbServiceName - for ESB registry lookup
- * <li>millisToWaitForResponse - if a value > 0 is supplied, a response will be
- * expected from the ESB service and maximum wait time will be set accordingly.
- * If response is not received, a CourierTimeoutException will be thrown </li>
+ * <li>millisToWaitForResponse - deprecated, please use a jBPM Timer </li>
*
* @author <a href="mailto:schifest at heuristica.com.ar">Esteban</a>
* @author <a href="mailto:kstam at jboss.com">Kurt T Stam</a>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java 2008-01-25 15:48:25 UTC (rev 18114)
@@ -34,7 +34,6 @@
import org.jboss.soa.esb.services.jbpm.Constants;
import org.jboss.soa.esb.services.jbpm.JBpmObjectMapper;
import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
import org.jbpm.command.CancelProcessInstanceCommand;
import org.jbpm.command.CommandService;
@@ -43,7 +42,6 @@
import org.jbpm.command.SignalCommand;
import org.jbpm.command.StartProcessInstanceCommand;
import org.jbpm.command.impl.CommandServiceImpl;
-import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
/**
@@ -77,34 +75,6 @@
throw new ConfigurationException(opCode.toString()+" not implemented,");
return command;
}
-
- protected static final Command DEPLOY_PROCESS_DEF_EXECUTOR = new Command()
- {
- public void execute(Message message) throws JbpmException
- {
- Object obj = MessageHelper.getObjectValue(message, Constants.PROCESS_DEFINITION);
- if (null==obj)
- {
- obj = ProcessDefinition.parseXmlString
- ((String)MessageHelper.getObjectValue(message,Constants.PROCESS_DEFINITION_XML));
- }
- final ProcessDefinition def = (ProcessDefinition)obj;
- logger.debug("Deploying new process definition " + def.getName());
- executeJbpmCommand(new org.jbpm.command.Command()
- {
- private static final long serialVersionUID = 1L;
- ProcessDefinition _def = def;
-
- public Object execute(JbpmContext jbpmCtx)
- {
- jbpmCtx.deployProcessDefinition(_def);
- logger.info("Process Definition '" + def.getName() + "' is deployed.");
- return null;
- }
- });
- }
- };
-
protected static final Command CANCEL_PROCESS_INSTANCE_EXECUTOR = new Command()
{
@@ -187,7 +157,6 @@
_values.put(Constants.OpCode.CallbackCommand ,CALLBACK_EXECUTOR);
_values.put(Constants.OpCode.CancelProcessInstanceCommand,CANCEL_PROCESS_INSTANCE_EXECUTOR);
_values.put(Constants.OpCode.SignalCommand ,SIGNAL_EXECUTOR);
- _values.put(Constants.OpCode.DeployProcessDefinition ,DEPLOY_PROCESS_DEF_EXECUTOR);
_values.put(Constants.OpCode.NewProcessInstanceCommand
,new CommandExecutor.NewProcessInstancePerformer(false));
_values.put(Constants.OpCode.StartProcessInstanceCommand
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/DeployProcessDefinitionFacade.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/DeployProcessDefinitionFacade.java 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/DeployProcessDefinitionFacade.java 2008-01-25 15:48:25 UTC (rev 18114)
@@ -1,115 +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.cmd;
-
-import java.io.InputStream;
-
-import org.apache.log4j.Logger;
-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.BpmProcessor;
-import org.jboss.soa.esb.util.ClassUtil;
-import org.jboss.soa.esb.util.Util;
-import org.jbpm.graph.def.ProcessDefinition;
-
-/**
- *
- * Implementation of a message preprocessor that obtains the process definition
- * from the action configuration XML
- *
- * @author <a href="mailto:schifest at heuristica.com.ar">schifest at heuristica.com.ar</a>
- */
-public class DeployProcessDefinitionFacade extends MessageFacade
-{
- public OpCode getOpCode() { return Constants.OpCode.DeployProcessDefinition; }
-
- public DeployProcessDefinitionFacade(ConfigTree config) throws ConfigurationException
- {
- _fileName=config.getAttribute(Constants.PROCESS_DEFINITION_FILE_TAG);
- ConfigTree[] childs = config.getChildren(Constants.PROCESS_DEFINITION_XML_TAG);
-
- if (null!=_fileName)
- {
- if (childs.length>0)
- throw new ConfigurationException
- ("You can specify either '"+Constants.PROCESS_DEFINITION_FILE_TAG+"' attribute OR "
- +Constants.PROCESS_DEFINITION_XML_TAG+"> element, but not both");
-
- InputStream stream = ClassUtil.getResourceAsStream(_fileName, BpmProcessor.class);
- _validProcessDef = 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");
-
- String version = childs[0].getAttribute("version");
- String encoding = childs[0].getAttribute("encoding");
- if (Util.isNullString(version) || Util.isNullString(encoding))
- throw new ConfigurationException("Wrong 'version' or 'encoding' attribute in <"+Constants.PROCESS_DEFINITION_XML_TAG+">");
- StringBuilder sb = new StringBuilder("<?xml version='").append(version)
- .append("' encoding='").append(encoding).append("' ?>\n")
- ;
-
- ConfigTree[] def = childs[0].getChildren("process-definition");
- if (null==def || def.length<1)
- throw new ConfigurationException("Missing or invalid <process-definition> element");
- if (def.length>1)
- throw new ConfigurationException("Only one <process-definition> element can be specified");
-
- final String xmlString = sb.append(def[0].toString()).toString();
- try
- {
- _validProcessDef = ProcessDefinition.parseXmlString(xmlString);
- }
- catch (Exception e)
- {
- throw new ConfigurationException(e);
- }
- }
-
- public void setJBPMContextParameters(Message message)
- {
- if (null!= _fileName)
- try
- {
- InputStream stream = ClassUtil.getResourceAsStream(_fileName, BpmProcessor.class);
- _validProcessDef = ProcessDefinition.parseXmlInputStream(stream);
- }
- catch (Exception e)
- {
- _logger.info("Keeping previous process definition");
- _logger.error("Invalid process definition file <"+_fileName+">",e);
- }
- message.getBody().add(Constants.PROCESS_DEFINITION, _validProcessDef);
- }
-
- protected String _fileName;
- protected ProcessDefinition _validProcessDef;
- private static final Logger _logger = Logger.getLogger(DeployProcessDefinitionFacade.class);
-}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageFacade.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageFacade.java 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageFacade.java 2008-01-25 15:48:25 UTC (rev 18114)
@@ -51,8 +51,6 @@
return new SignalFacade(config);
if (Constants.OpCode.StartProcessInstanceCommand.equals(opCode))
return new NewProcessInstanceFacade(config, true);
- if (Constants.OpCode.DeployProcessDefinition.equals(opCode))
- return new DeployProcessDefinitionFacade(config);
throw new UnsupportedOperationException(opCode.toString()+" not implemented");
}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -29,6 +29,6 @@
<action name="action" class="org.jboss.soa.esb.services.jbpm.actions.JBpmCallback"/>
</actions>
</service>
- </services>
+ </services>
</jbossesb>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/resources/testExceptionHandling.jpg
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/resources/testExceptionHandling.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/resources/testExceptionHandling.xml 2008-01-25 15:08:15 UTC (rev 18113)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/resources/testExceptionHandling.xml 2008-01-25 15:48:25 UTC (rev 18114)
@@ -19,6 +19,7 @@
<action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
<esbCategoryName>MockCategory</esbCategoryName>
<esbServiceName>MockService</esbServiceName>
+ <exceptionTransition>exception</exceptionTransition>
</action>
<transition name="ok" to="Service3"></transition>
<transition name="exception" to="ExceptionHandling"></transition>
@@ -28,6 +29,9 @@
<action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler">
<esbCategoryName>MockCategory</esbCategoryName>
<esbServiceName>MockService</esbServiceName>
+ <esbToBpmVars>
+ <mapping esb="SomeExceptionCode" bpm="exceptionCode"/>
+ </esbToBpmVars>
</action>
<transition name="ok" to="exceptionDecision"></transition>
@@ -36,7 +40,7 @@
<decision name="exceptionDecision">
<transition name="ok" to="end"></transition>
<transition name="exceptionCondition" to="ExceptionHandling">
- <condition>#{ exceptionCode==3}</condition>
+ <condition>#{exceptionCode==3}</condition>
</transition>
</decision>
</process-definition>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list