Author: jbarrez Date: 2009-12-21 13:56:08 -0500 (Mon, 21 Dec 2009) New Revision: 6013 Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl Removed: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/ Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java Log: Cleanup BPMN 2.0 examples for console usage Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-21 18:07:52 UTC (rev 6012) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-12-21 18:56:08 UTC (rev 6013) @@ -73,6 +73,13 @@ <exclude name="org/jbpm/examples/task/notification process.jpdl.xml" /> <exclude name="org/jbpm/examples/task/reminder process.jpdl.xml" /> <exclude name="org/jbpm/examples/rulesdecision/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/notification/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/reminder/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/bpmn/event/terminateend/terminate_end_event.bpmn.xml" /> + <exclude name="org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway.bpmn.xml" /> + <exclude name="org/jbpm/examples/bpmn/gateway/exclusive/exclusive_gateway_default_seq_flow.bpmn.xml" /> + <exclude name="org/jbpm/examples/bpmn/gateway/parallel/parallel_gateway.bpmn.xml" /> + <exclude name="org/jbpm/examples/bpmn/task/service/service_task_java.bpmn.xml" /> </fileset> </jar> <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" classpathref="jbpm.libs.incl.dependencies" /> Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-21 18:07:52 UTC (rev 6012) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-21 18:56:08 UTC (rev 6013) @@ -17,9 +17,9 @@ super.setUp(); NewDeployment deployment = repositoryService.createDeployment(); - deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml"); - deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl"); - deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl"); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml"); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl"); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl"); String deployId = deployment.deploy(); registerDeployment(deployId); Copied: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl (from rev 5986, jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl) =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/request_vacation.ftl 2009-12-21 18:56:08 UTC (rev 6013) @@ -0,0 +1,30 @@ +<html> +<head> + <style type="text/css"> + ${CSS!".body {font-family:sans-serif;}"} + </style> +</head> + <body> + + <form action="${form.action}" method="POST" enctype="multipart/form-data"> + + <h3>How many days would you like to go on vacation?</h3> + <select name="number_of_days"> + <option value="3">3 days</option> + <option value="5">5 days</option> + <option value="10">10 days</option> + </select><br> + + <br/> + <br/> + + Your name: <input type="text" name="employee_name" /><br/> + + <br/> + <br/> + + <input type="submit" name="Done"/> + + </form> + </body> +</html> \ No newline at end of file Copied: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml (from rev 5986, jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml) =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/vacationrequest.bpmn.xml 2009-12-21 18:56:08 UTC (rev 6013) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions id="vacationRequest" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../../../../bpmn/src/main/resources/BPMN20.xsd" + xmlns="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/vacation_request" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <process id="vacationRequestProcess" name="BPMN2 Example process using task forms"> + + <startEvent id="start" /> + + <sequenceFlow id="flow1" name="fromStartToRequestVacation" + sourceRef="start" targetRef="requestVacation" /> + + <userTask id="requestVacation" name="Request Vacation" + implementation="other"> + <potentialOwner resourceRef="user" /> + <rendering id="requestForm"> + <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl</jbpm:form> + </rendering> + </userTask> + + <sequenceFlow id="flow2" + name="fromRequestVacationToVerifyRequest" sourceRef="requestVacation" + targetRef="verifyRequest" /> + + <userTask id="verifyRequest" name="Verify Request" + implementation="other"> + <potentialOwner resourceRef="manager" /> + <rendering id="verifyForm"> + <jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form> + </rendering> + </userTask> + + <sequenceFlow id="flow3" name="fromVerifyRequestToEnd" + sourceRef="verifyRequest" targetRef="theEnd"> + <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'OK'}</conditionExpression> + </sequenceFlow> + + <sequenceFlow id="flow4" + name="fromVerifyRequestToSendRejectionMessage" sourceRef="verifyRequest" + targetRef="sendRejectionMessage"> + <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'Not OK'}</conditionExpression> + </sequenceFlow> + + <scriptTask id="sendRejectionMessage" name="Send rejection Message" + scriptLanguage="bsh"> + <script> + <![CDATA[System.out.println("Vacation request refused!");]]> + </script> + </scriptTask> + + <sequenceFlow id="flow5" + name="fromSendRejectionMessageToEnd" sourceRef="sendRejectionMessage" + targetRef="theEnd" /> + + <endEvent id="theEnd" name="End" /> + + + </process> +</definitions> Copied: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl (from rev 5986, jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl) =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/task/usertask/taskform/verify_request.ftl 2009-12-21 18:56:08 UTC (rev 6013) @@ -0,0 +1,24 @@ +<html> +<head> + <style type="text/css"> + ${CSS!".body {font-family:sans-serif;}"} + </style> +</head> + <body> + + <form action="${form.action}" method="POST" enctype="multipart/form-data"> + + <h3>Your employee, ${employee_name} would like to go on vacation</h3> + Number of days: ${number_of_days}<br/> + + <hr> + + In case you reject, please provide a reason:<br/> + <input type="textarea" name="reason"/><br/> + + <input type="submit" name="verificationResult" value="OK"> + <input type="submit" name="verificationResult" value="Not OK"> + + </form> + </body> +</html> \ No newline at end of file