August 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5438 - jbpm4/trunk/modules/bpmn/src/main/lib.

by do-not-reply＠jboss.org

Author: kukeltje Date: 2009-08-06 16:26:09 -0400 (Thu, 06 Aug 2009) New Revision: 5438 Removed: jbpm4/trunk/modules/bpmn/src/main/lib/bsh-engine.jar Log: and the remove Deleted: jbpm4/trunk/modules/bpmn/src/main/lib/bsh-engine.jar =================================================================== (Binary files differ)

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5437 - in jbpm4/trunk/modules/bpmn: src/main/lib and 1 other directory.

by do-not-reply＠jboss.org

Author: kukeltje Date: 2009-08-06 16:25:44 -0400 (Thu, 06 Aug 2009) New Revision: 5437 Added: jbpm4/trunk/modules/bpmn/src/main/lib/bsh-engine-1.0.1.jar Modified: jbpm4/trunk/modules/bpmn/pom.xml Log: bsh-engine and pom change Modified: jbpm4/trunk/modules/bpmn/pom.xml =================================================================== --- jbpm4/trunk/modules/bpmn/pom.xml 2009-08-06 20:16:12 UTC (rev 5436) +++ jbpm4/trunk/modules/bpmn/pom.xml 2009-08-06 20:25:44 UTC (rev 5437) @@ -1,59 +1,107 @@ <?xml version="1.0" encoding="UTF-8"?> - - - - - - - - +  +  +  +  +  +  +  +  - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -  - <modelVersion>4.0.0</modelVersion> - <name>jBPM 4 - BPMN</name> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-bpmn</artifactId> - <packaging>jar</packaging> +  + <modelVersion>4.0.0</modelVersion> + <name>jBPM 4 - BPMN</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-bpmn</artifactId> + <packaging>jar</packaging> -  - <parent> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm</artifactId> - <version>4.1-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> -  - <dependencies> +  +  + <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - <version>2.0b4</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>2.0b4</version> + </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>com.sun.script</groupId> + <artifactId>bsh-engine</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> +  + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jbpm/test/xml/DbGenTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + +  + <profiles> +  + <profile> + <id>integration.test</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <properties> + <skipTests>true</skipTests> + </properties> + </profile> + </profiles> + </project> \ No newline at end of file Added: jbpm4/trunk/modules/bpmn/src/main/lib/bsh-engine-1.0.1.jar =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/bpmn/src/main/lib/bsh-engine-1.0.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5436 - in jbpm4/trunk/modules/bpmn/src: main/java/org/jbpm/bpmn/flownodes and 3 other directories.

by do-not-reply＠jboss.org

Author: kukeltje Date: 2009-08-06 16:16:12 -0400 (Thu, 06 Aug 2009) New Revision: 5436 Added: jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml Removed: jbpm4/trunk/modules/bpmn/src/main/java/jbpm.bpmn.flownodes.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayBinding.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ParallelGatewayActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/StartActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/TaskActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayTest.java jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java Log: Refactoring Deleted: jbpm4/trunk/modules/bpmn/src/main/java/jbpm.bpmn.flownodes.xml =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/jbpm.bpmn.flownodes.xml 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/jbpm.bpmn.flownodes.xml 2009-08-06 20:16:12 UTC (rev 5436) @@ -1,23 +0,0 @@ -<activities> - -  - <activity binding="org.jbpm.bpmn.flownodes.StartBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.EndBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.ExclusiveGatewayBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.ParallelGatewayBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.ReceiveBinding" /> - -  - <activity binding="org.jbpm.bpmn.flownodes.ManualTaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.ScriptTaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.ServiceTaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.TaskBinding" /> - <activity binding="org.jbpm.bpmn.flownodes.UserTaskBinding" /> - -</activities> - - Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -47,132 +47,104 @@ private static final long serialVersionUID = 1L; - private static final boolean FORK_ALLOWED = true; - private static final boolean FORK_DISALLOWED = !FORK_ALLOWED; - private static final boolean CONDITIONS_CHECKED = true; - private static final boolean CONDITIONS_IGNORED = !CONDITIONS_CHECKED; - - //protected String default_; - protected List<ActivityResource> activvityResources = new ArrayList(); + protected static final boolean FORK_ALLOWED = true; + protected static final boolean FORK_DISALLOWED = !FORK_ALLOWED; + protected static final boolean CONDITIONS_CHECKED = true; + protected static final boolean CONDITIONS_IGNORED = !CONDITIONS_CHECKED; - protected void leaveBpmnActivity(ExecutionImpl execution) { + // protected String default_; + protected List<ActivityResource> activvityResources = new ArrayList(); - proceedForkedIfAllowed(execution, FORK_ALLOWED, CONDITIONS_CHECKED, null); +// protected void leaveBpmnActivity(ExecutionImpl execution) { +// +// proceedForkedIfAllowed(execution, FORK_ALLOWED, CONDITIONS_CHECKED); +// +// } +// +// protected void leaveBpmnActivitySingle(ExecutionImpl execution) { +// proceedForkedIfAllowed(execution, FORK_DISALLOWED, CONDITIONS_CHECKED); +// +// } +// +// protected void leaveBpmnActivityAll(ExecutionImpl execution) { +// +// proceedForkedIfAllowed(execution, FORK_ALLOWED, CONDITIONS_IGNORED); +// +// } - } - - protected void leaveBpmnActivitySingle(ExecutionImpl execution, String default_) { - proceedForkedIfAllowed(execution, FORK_DISALLOWED, CONDITIONS_CHECKED, default_); - - } - - protected void leaveBpmnActivityAll(ExecutionImpl execution) { - - proceedForkedIfAllowed(execution, FORK_ALLOWED, CONDITIONS_IGNORED, null); - - } - /** * In BPMN multiple outgoing sequence flows behave like a fork. * * Code copied basically from jPDL fork. */ - private void proceedForkedIfAllowed(ExecutionImpl execution, boolean forkAllowed, boolean checkConditions, String default_) { + protected void proceed(ExecutionImpl execution, List<Transition> transitions) { log.debug("Proceeding"); + Activity activity = execution.getActivity(); - - // evaluate the conditions and find the transitions that should be forked - List<Transition> forkingTransitions = new ArrayList<Transition>(); - List<Transition> outgoingTransitions = activity.getOutgoingTransitions(); - log.debug("Analyzing "+ outgoingTransitions.size() + " transitions for " + activity.getName()); - for (Transition transition : outgoingTransitions) { - log.debug("Analyzing "+ transition.getName()); - Condition condition = transition.getCondition(); - //condition.evaluate(execution); log.debug("Evaluated"); - // also ignore the default transition of the exclusive gateway - if (((condition == null) || (!checkConditions) || (condition.evaluate(execution))) && (!transition.getName().equals(default_))) { - forkingTransitions.add(transition); - } - } - log.debug(forkingTransitions.size() + " out of " + outgoingTransitions.size() + " selected for " + activity.getName()); // if no outgoing transitions should be forked, - if (forkingTransitions.size() == 0) { - - if (default_ != null) { // take the default if it is there - for (Transition transition : outgoingTransitions) { - if (default_.equals(transition.getName())) { - // take it - execution.take(transition); - } - } - } else { - // end this execution - execution.end(); - } + if (transitions.size() == 0) { + execution.end(); } // if there is exactly 1 transition to be taken, just use the incoming // execution - else if (forkingTransitions.size() == 1) { - execution.take(forkingTransitions.get(0)); + else if (transitions.size() == 1) { + execution.take(transitions.get(0)); // if there are more transitions } else { - if (forkAllowed) { - ExecutionImpl concurrentRoot = null; - if (Execution.STATE_ACTIVE_ROOT.equals(execution.getState())) { - concurrentRoot = execution; - execution.setState(Execution.STATE_INACTIVE_CONCURRENT_ROOT); - execution.setActivity(null); - } else if (Execution.STATE_ACTIVE_CONCURRENT.equals(execution.getState())) { - concurrentRoot = execution.getParent(); - } + ExecutionImpl concurrentRoot = null; + if (Execution.STATE_ACTIVE_ROOT.equals(execution.getState())) { + concurrentRoot = execution; + execution.setState(Execution.STATE_INACTIVE_CONCURRENT_ROOT); + execution.setActivity(null); + } else if (Execution.STATE_ACTIVE_CONCURRENT.equals(execution.getState())) { + concurrentRoot = execution.getParent(); + } - for (Transition transition : forkingTransitions) { - // launch a concurrent path of execution - String childExecutionName = transition.getName(); - ExecutionImpl concurrentExecution = concurrentRoot.createExecution(childExecutionName); - concurrentExecution.setActivity(activity); - concurrentExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); - concurrentExecution.take(transition); + for (Transition transition : transitions) { + // launch a concurrent path of execution + String childExecutionName = transition.getName(); + ExecutionImpl concurrentExecution = concurrentRoot.createExecution(childExecutionName); + concurrentExecution.setActivity(activity); + concurrentExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); + concurrentExecution.take(transition); - if (concurrentRoot.isEnded()) { - break; - } + if (concurrentRoot.isEnded()) { + break; } - } else { - throw new JbpmException("To many outgoing transition conditions evaluated to true for " + execution.getActivity()); } } - } - protected List<Transition> findTransitions(ExecutionImpl execution, Activity activity) { + protected List<Transition> findTransitions(ExecutionImpl execution, boolean checkConditions) { + Activity activity = execution.getActivity(); + // evaluate the conditions and find the transitions that should be forked List<Transition> forkingTransitions = new ArrayList<Transition>(); List<Transition> outgoingTransitions = activity.getOutgoingTransitions(); for (Transition transition : outgoingTransitions) { Condition condition = transition.getCondition(); - if ((condition == null) || (condition.evaluate(execution))) { + // also ignore the default transition of the exclusive gateway + if ((condition == null || !checkConditions || condition.evaluate(execution)) && activity.getDefaultOutgoingTransition() != transition) { forkingTransitions.add(transition); } } + log.debug(forkingTransitions.size() + " out of " + outgoingTransitions.size() + " selected for " + activity.getName()); return forkingTransitions; - } - -// public String getDefault_ () { -// return this.default_; -// } -// -// public void setDefault_ (String default_) { -// this.default_ = default_; -// } - + + // public String getDefault_ () { + // return this.default_; + // } + // + // public void setDefault_ (String default_) { + // this.default_ = default_; + // } + public void addActivityResource(ActivityResource activityResource) { this.activvityResources.add(activityResource); } - - + } \ No newline at end of file Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayActivity.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayActivity.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -25,6 +25,8 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.activity.ActivityExecution; +import org.jbpm.bpmn.parser.BindingsParser; +import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.model.Activity; import org.jbpm.pvm.internal.model.Condition; import org.jbpm.pvm.internal.model.ExecutionImpl; @@ -38,15 +40,36 @@ String gatewayDirection = "unspecified"; // is the default behaviour String default_; - + private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(BindingsParser.class.getName()); + public void execute(ActivityExecution execution) { execute((ExecutionImpl) execution); } public void execute(ExecutionImpl execution) { - leaveBpmnActivitySingle(execution, default_); + + List<Transition> transitions = findTransitions(execution, CONDITIONS_CHECKED); + int numTransitions = transitions.size(); + + if (numTransitions == 0) { + Transition defaultTransition = execution.getActivity().getDefaultOutgoingTransition(); + if (defaultTransition != null) { + transitions.add(defaultTransition); + } else { + throw new JbpmException("No sequenceFlow condition evaluated to true for " + execution.getActivity() + " and no default sequenceFlow was speficied"); + } + } else if (numTransitions > 2) { + transitions = transitions.subList(0, 0); + log.info("More than one outgoing sequenceFlow conditions evaluated to true for " + execution.getActivity() + ", taking the first one (" + + transitions.get(0).getName() + ")"); + } + + // 1 condition evaluated to true... + proceed(execution, transitions); + } public String getGatewayDirection() { Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayBinding.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayBinding.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -68,13 +68,7 @@ if (transitionElement.getAttribute("id").equals(default_)) { defaultExists = true; - if (ce != null) { - // conditionExpression on the default sequenceflow SHALL be ignored - // according to the spec - log.debug("Default sequenceFlow (" + default_ + ") for '" + elementName - + "' has conditionExpressio(s). Ignoring them by removing them from the Document model"); - transitionElement.removeChild(ce); - } + // All but the 'default' sequenceFlow need to have a condition } else if (default_ != null && ce == null) { parse.addProblem("exclusiveGateway '" + elementName + "' has default sequenceFlow '" + default_ + "' but " + transitionElement.getAttribute("id") + " does not have a required conditionExpression", element); Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ParallelGatewayActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ParallelGatewayActivity.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/ParallelGatewayActivity.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -69,7 +69,7 @@ public void fork(ExecutionImpl execution) { - leaveBpmnActivityAll(execution); + proceed(execution, findTransitions(execution, CONDITIONS_IGNORED)); } @@ -81,7 +81,7 @@ if (Execution.STATE_ACTIVE_ROOT.equals(execution.getState())) { // just pass through - Transition transition = activity.getDefaultOutgoingTransition(); + Transition transition = activity.getOutgoingTransitions().get(0); if (transition==null) { throw new JbpmException("join must have an outgoing transition"); } @@ -112,7 +112,7 @@ } execution.setActivity(activity, outgoingExecution); - Transition transition = activity.getDefaultOutgoingTransition(); + Transition transition = activity.getOutgoingTransitions().get(0); if (transition==null) { throw new JbpmException("join must have an outgoing transition"); } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/StartActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/StartActivity.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/StartActivity.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -22,6 +22,7 @@ package org.jbpm.bpmn.flownodes; import org.jbpm.api.activity.ActivityExecution; +import org.jbpm.pvm.internal.model.ExecutionImpl; public class StartActivity extends BpmnActivity { @@ -29,5 +30,10 @@ private static final long serialVersionUID = 1L; public void execute(ActivityExecution execution) { + execute((ExecutionImpl) execution); } + + public void execute(ExecutionImpl execution) { + proceed(execution, findTransitions(execution, CONDITIONS_CHECKED)); + } } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/TaskActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/TaskActivity.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/TaskActivity.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -63,7 +63,7 @@ public void execute(ExecutionImpl execution) { - leaveBpmnActivity(execution); + proceed(execution, findTransitions(execution, CONDITIONS_CHECKED)); } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/UserTaskActivity.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -126,7 +126,7 @@ task.setSignalling(false); execution.setVariable("jbpm_outcome", signalName); - leaveBpmnActivity(execution); + proceed(execution, findTransitions(execution, CONDITIONS_CHECKED)); } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.dom4j.DocumentFactory; +import org.jbpm.api.JbpmException; import org.jbpm.api.activity.ActivityBehaviour; import org.jbpm.bpmn.flownodes.BpmnBinding; import org.jbpm.bpmn.flownodes.ExclusiveGatewayActivity; @@ -204,7 +205,7 @@ activity.setType(activityBinding.getTagName()); activity.setName(id); activity.setDescription(name); - + log.debug("Parse Activity: " + name); ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(nestedElement, parse, this); activity.setBehaviour(activityBehaviour); } finally { @@ -226,13 +227,26 @@ log.trace(" with " + ((conditionElement == null) ? "0" : "1") + " conditionExpression"); TransitionImpl transition = compositeElement.findActivity(sourceRef).createOutgoingTransition(); -// Activity a = compositeElement.findActivity(sourceRef); -// if (a.getType().equals("exclusiveGateway")) { -// if (transitionId.equals(((ExclusiveGatewayActivity) a).getDefault())) { -// compositeElement.findActivity(sourceRef).setDefaultOutgoingTransition(transition); -// } -// } + + try { + // If something went wrong parsing the activity, there is no behaviour and an exception is thrown in .getBehaviour() + ActivityBehaviour a = compositeElement.findActivity(sourceRef).getBehaviour(); + if (a instanceof ExclusiveGatewayActivity) { + if (transitionId.equals(((ExclusiveGatewayActivity) a).getDefault())) { + compositeElement.findActivity(sourceRef).setDefaultOutgoingTransition(transition); + } + } else { + // Other flownodes do not have default sequenceFlows, so set it to null + compositeElement.findActivity(sourceRef).setDefaultOutgoingTransition(null); + } + } catch (JbpmException je) { + // catch it and only re-throw if not this specific exception. + if (!je.getMessage().contains("no behaviour on")) { + throw je; + } + } + // 8.2.5 of the spec document if (conditionElement != null) { String type = conditionElement.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type"); Added: jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml 2009-08-06 20:16:12 UTC (rev 5436) @@ -0,0 +1,23 @@ +<activities> + +  + <activity binding="org.jbpm.bpmn.flownodes.StartBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.EndBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.ExclusiveGatewayBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.ParallelGatewayBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.ReceiveBinding" /> + +  + <activity binding="org.jbpm.bpmn.flownodes.ManualTaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.ScriptTaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.ServiceTaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.TaskBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.UserTaskBinding" /> + +</activities> + + Modified: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayTest.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayTest.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ExclusiveGatewayTest.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -110,7 +110,7 @@ try { Map variables = new HashMap(); - variables.put("test", "other value"); + variables.put("test", "no value"); ProcessInstance pi = executionService.startProcessInstanceByKey("ExclusiveGateway", variables ); String pid = pi.getId(); Modified: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/ParallelGatewayTest.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -65,8 +65,6 @@ TaskQuery taskQuery = taskService.createTaskQuery(); List<Task> allTasks = taskQuery.list(); - // since the uncontrolled sequence flow OUT of the activity behaves as a fork - // we now have two tasks assertEquals(2, allTasks.size()); assertEquals("UserTaskLeg1", allTasks.get(0).getActivityName()); assertEquals("UserTaskLeg2", allTasks.get(1).getActivityName()); @@ -105,5 +103,4 @@ assertTextPresent("parallelGateway 'The Fork' has the wrong number of incomming (1) and outgoing (2) transitions for gatewayDirection='converging'", problems.get(0).getMsg()); } } - } Modified: jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java 2009-08-06 14:48:06 UTC (rev 5435) +++ jbpm4/trunk/modules/bpmn/src/test/java/org/jbpm/bpmn/flownodes/UserTaskTest.java 2009-08-06 20:16:12 UTC (rev 5436) @@ -28,9 +28,8 @@ import org.jbpm.api.ProcessInstance; import org.jbpm.api.TaskQuery; import org.jbpm.api.task.Task; -import org.jbpm.bpmn.model.BpmnProcessDefinition; -import org.jbpm.bpmn.parser.BpmnParser; -import org.jbpm.pvm.internal.client.ClientProcessInstance; +//import org.jbpm.bpmn.model.BpmnProcessDefinition; +//import org.jbpm.bpmn.parser.BpmnParser; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.test.JbpmTestCase; @@ -40,24 +39,24 @@ */ public class UserTaskTest extends JbpmTestCase { - static BpmnParser bpmnParser = new BpmnParser(); +// static BpmnParser bpmnParser = new BpmnParser(); +// +// public void testParsing() { +// Parse parse = bpmnParser.createParse().setResource("org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml").execute(); +// +// if (!parse.getProblems().isEmpty()) { +// fail("No problems should have occured. Problems: " + parse.getProblems()); +// } +// +// List<BpmnProcessDefinition> processDefinitions = (List<BpmnProcessDefinition>) parse.getDocumentObject(); +// +// assertEquals(1, processDefinitions.size()); +// +// BpmnProcessDefinition pd = processDefinitions.get(0); +// assertNotNull(pd); +// assertEquals("UserTaskSimpleProcess", pd.getKey()); +// } - public void testParsing() { - Parse parse = bpmnParser.createParse().setResource("org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml").execute(); - - if (!parse.getProblems().isEmpty()) { - fail("No problems should have occured. Problems: " + parse.getProblems()); - } - - List<BpmnProcessDefinition> processDefinitions = (List<BpmnProcessDefinition>) parse.getDocumentObject(); - - assertEquals(1, processDefinitions.size()); - - BpmnProcessDefinition pd = processDefinitions.get(0); - assertNotNull(pd); - assertEquals("UserTaskSimpleProcess", pd.getKey()); - } - public void testNormalUserAssignment() { String deploymentId = repositoryService.createDeployment().addResourceFromClasspath("org/jbpm/bpmn/flownodes/UserTaskSimple.bpmn.xml").deploy();

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5435 - in jbpm4/trunk: modules/test-cactus and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-06 10:48:06 -0400 (Thu, 06 Aug 2009) New Revision: 5435 Added: jbpm4/trunk/qa/reinstall.jbpm.bat Modified: jbpm4/trunk/modules/test-cactus/pom.xml jbpm4/trunk/pom.xml Log: upgraded cactus to version 1.8.1 and junit to version 3.8.1 Modified: jbpm4/trunk/modules/test-cactus/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-06 08:55:16 UTC (rev 5434) +++ jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-06 14:48:06 UTC (rev 5435) @@ -70,9 +70,25 @@ </dependency> <dependency> <groupId>cactus</groupId> - <artifactId>cactus</artifactId> + <artifactId>cactus.core</artifactId> + <version>1.8.1</version> </dependency> <dependency> + <groupId>cactus</groupId> + <artifactId>cactus.integration.shared.api</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>cactus</groupId> + <artifactId>cactus.integration.ant</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.5.3</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>runtime</scope> @@ -121,6 +137,11 @@ <id>runtest</id> <dependencies> <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-examples</artifactId> <classifier>tests</classifier> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-08-06 08:55:16 UTC (rev 5434) +++ jbpm4/trunk/pom.xml 2009-08-06 14:48:06 UTC (rev 5435) @@ -46,7 +46,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <apache.ant.version>1.7.0</apache.ant.version> - <cactus.version>13-1.7.1</cactus.version> + <cactus.version>1.8.1</cactus.version> <freemarker.version>2.3.15</freemarker.version> <gwt.console.version>1.0.1-SNAPSHOT</gwt.console.version> <jbpm.gpd.version>4.1-SNAPSHOT</jbpm.gpd.version> @@ -59,7 +59,7 @@ <jboss.client.version>5.0.1.GA</jboss.client.version> <jsr233.version>2.0.5</jsr233.version> <juel.version>2.1.0</juel.version> - <junit.version>3.8.1</junit.version> + <junit.version>3.8.2</junit.version> <log4j.version>1.2.14</log4j.version> <mail.version>1.4.1</mail.version> <report.engine.version>2.3.2</report.engine.version> @@ -98,12 +98,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-examples</artifactId> - <classifier>tests</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> @@ -124,6 +118,12 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-examples</artifactId> + <classifier>tests</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> <version>${version}</version> <classifier>tests</classifier> Added: jbpm4/trunk/qa/reinstall.jbpm.bat =================================================================== --- jbpm4/trunk/qa/reinstall.jbpm.bat (rev 0) +++ jbpm4/trunk/qa/reinstall.jbpm.bat 2009-08-06 14:48:06 UTC (rev 5435) @@ -0,0 +1,5 @@ +echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties +cmd /C mvn -U -Pdistro clean install +cmd /C ant -f qa/build.xml reinstall.jbpm + +echo \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5434 - jbpm4/trunk/modules/distro.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-06 04:55:16 -0400 (Thu, 06 Aug 2009) New Revision: 5434 Modified: jbpm4/trunk/modules/distro/pom.xml Log: JBPM-2409 JBPM-2411 added classifiers to distro pom depenencies test-db and examples Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-08-06 08:43:39 UTC (rev 5433) +++ jbpm4/trunk/modules/distro/pom.xml 2009-08-06 08:55:16 UTC (rev 5434) @@ -37,6 +37,7 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-examples</artifactId> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -90,6 +91,7 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.eclipse.birt</groupId>

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5433 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/ant and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-06 04:43:39 -0400 (Thu, 06 Aug 2009) New Revision: 5433 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml Log: JBPM-2409 JBPM-2411 started installer refactoring to support tomcat and ci script cleanup Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-06 08:01:07 UTC (rev 5432) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-06 08:43:39 UTC (rev 5433) @@ -66,6 +66,10 @@ depends="delete.jboss, install.jboss" description="Deletes the previous jboss installation and re-installs jboss" /> + <target name="reinstall.jboss.and.jbpm" + depends="delete.jboss, install.jboss, install.jbpm.into.jboss" + description="Deletes the previous jboss installation and re-installs jboss and installs jbpm in it" /> +  <target name="delete.jboss" description="Deletes jboss installation"> @@ -92,111 +96,6 @@ <get src="${jboss.distro.url}" dest="${jboss.distro.path}" /> </target> -  - <target name="reinstall.tomcat" - depends="delete.tomcat, install.tomcat" - description="Deletes the previous tomcat installation and re-installs tomcat" /> - -  - <target name="delete.tomcat" - description="Deletes tomcat installation"> - <delete dir="${tomcat.home}" /> - </target> - -  - <target name="install.tomcat" - depends="get.tomcat" - description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat"> - <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" /> - <chmod perm="a+x" file="${tomcat.home}/bin/startup.sh" os="Linux, Mac OS X" /> - <chmod perm="a+x" file="${tomcat.home}/bin/shutdown.sh" os="Linux, Mac OS X" /> - </target> - -  - <condition property="is.tomcat.distro.available"> - <available file="${tomcat.distro.path}" /> - </condition> - <target name="get.tomcat" - unless="is.tomcat.distro.available" - description="Downloads tomcat into ${tomcat.distro.dir} if it is not available"> - <mkdir dir="${tomcat.distro.dir}" /> - <get src="${tomcat.distro.url}" dest="${tomcat.distro.path}" /> - </target> - -  - <target name="install.jbpm.into.tomcat" - depends="generate.cfg" - description="Installs jBPM into tomcat"> - -  - <jar destfile="${tomcat.home}/lib/jbpm.cfg.jar"> - <fileset dir="generated/cfg"> - <exclude name="logging.properties"/> - </fileset> - </jar> - - <copy todir="${tomcat.home}/lib" overwrite="true"> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - <fileset dir="${jbpm.home}/lib"> - <include name="gwt-console-server-integration.jar" /> - <include name="gwt-console-rpc.jar" /> - <include name="jbpm-console-integration.jar" /> - <include name="jbpm-console-form-plugin.jar" /> - <include name="jbpm-console-graphView-plugin.jar"/> - <include name="freemarker.jar" /> - <include name="livetribe-jsr223.jar" /> - <include name="juel*.jar" /> - <include name="hibernate-core.jar" /> - <include name="hibernate-cglib-repack.jar" /> - </fileset> - </copy> - - <copy todir="${tomcat.home}/webapps" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="gwt-console.war" /> - <include name="gwt-console-server.war" /> - </fileset> - </copy> - -  - <property name="birt.dir" value="${jboss.server.data.dir}/birt"/> - <mkdir dir="${birt.dir}"/> - <unzip src="${jbpm.home}/lib/report-engine.zip" dest="${birt.dir}"/> - <unzip src="${jbpm.home}/lib/jbpm-console-reports.jar" dest="${birt.dir}"/> - -  - <property name="container.lib.dir" value="${tomcat.home}/" /> - <antcall target="internal.copy.database.driver" /> - </target> - -  - <target name="start.tomcat" - description="Starts Tomcat and waits till it is booted, then lets Tomcat run in the background"> - <taskdef name="start-tomcat" - classname="org.jbpm.pvm.internal.ant.StartTomcatTask"> - <classpath> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - </classpath> - </taskdef> - <start-jboss tomcathome="${jboss.home}" /> - </target> - -  - <target name="stop.tomcat" - description="Signals Tomcat to stop, but doesn't wait till its finished"> - <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> - <arg line="-S"/> - </exec> - <exec executable="${jboss.home}/bin/shutdown.sh" os="Linux, Unix, Mac"> - <arg line="-S"/> - </exec> - </target> - -  <target name="install.jbpm.into.jboss" description="Installs jBPM into JBoss"> @@ -310,6 +209,114 @@ </exec> </target> +  + <target name="reinstall.tomcat" + depends="delete.tomcat, install.tomcat" + description="Deletes the previous tomcat installation and re-installs tomcat" /> + + <target name="reinstall.tomcat.and.jbpm" + depends="delete.tomcat, install.tomcat, install.jbpm.into.tomcat" + description="Deletes the previous tomcat installation and re-installs tomcat and installs jbpm in it" /> + +  + <target name="delete.tomcat" + description="Deletes tomcat installation"> + <delete dir="${tomcat.home}" /> + </target> + +  + <target name="install.tomcat" + depends="get.tomcat" + description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat"> + <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" /> + <chmod perm="a+x" file="${tomcat.home}/bin/startup.sh" os="Linux, Mac OS X" /> + <chmod perm="a+x" file="${tomcat.home}/bin/shutdown.sh" os="Linux, Mac OS X" /> + </target> + +  + <condition property="is.tomcat.distro.available"> + <available file="${tomcat.distro.path}" /> + </condition> + <target name="get.tomcat" + unless="is.tomcat.distro.available" + description="Downloads tomcat into ${tomcat.distro.dir} if it is not available"> + <mkdir dir="${tomcat.distro.dir}" /> + <get src="${tomcat.distro.url}" dest="${tomcat.distro.path}" /> + </target> + +  + <target name="install.jbpm.into.tomcat" + depends="generate.cfg" + description="Installs jBPM into tomcat"> + +  + <jar destfile="${tomcat.home}/lib/jbpm.cfg.jar"> + <fileset dir="generated/cfg"> + <exclude name="logging.properties"/> + </fileset> + </jar> + + <copy todir="${tomcat.home}/lib" overwrite="true"> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + <fileset dir="${jbpm.home}/lib"> + <include name="gwt-console-server-integration.jar" /> + <include name="gwt-console-rpc.jar" /> + <include name="jbpm-console-integration.jar" /> + <include name="jbpm-console-form-plugin.jar" /> + <include name="jbpm-console-graphView-plugin.jar"/> + <include name="freemarker.jar" /> + <include name="livetribe-jsr223.jar" /> + <include name="juel*.jar" /> + <include name="hibernate-core.jar" /> + <include name="hibernate-cglib-repack.jar" /> + </fileset> + </copy> + + <copy todir="${tomcat.home}/webapps" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="gwt-console.war" /> + <include name="gwt-console-server.war" /> + </fileset> + </copy> + +  + <property name="birt.dir" value="${jboss.server.data.dir}/birt"/> + <mkdir dir="${birt.dir}"/> + <unzip src="${jbpm.home}/lib/report-engine.zip" dest="${birt.dir}"/> + <unzip src="${jbpm.home}/lib/jbpm-console-reports.jar" dest="${birt.dir}"/> + +  + <property name="container.lib.dir" value="${tomcat.home}/" /> + <antcall target="internal.copy.database.driver" /> + </target> + +  + <target name="start.tomcat" + description="Starts Tomcat and waits till it is booted, then lets Tomcat run in the background"> + <taskdef name="start-tomcat" + classname="org.jbpm.pvm.internal.ant.StartTomcatTask"> + <classpath> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + </classpath> + </taskdef> + <start-tomcat tomcathome="${tomcat.home}" /> + </target> + +  + <target name="stop.tomcat" + description="Signals Tomcat to stop, but doesn't wait till its finished"> + <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="-S"/> + </exec> + <exec executable="${jboss.home}/bin/shutdown.sh" os="Linux, Unix, Mac"> + <arg line="-S"/> + </exec> + </target> +  <target name="internal.copy.database.driver" if="database.driver"> <condition property="database.driver" value="mysql-connector-java.jar"> @@ -328,5 +335,5 @@ <fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" /> <copy file="${jbpm.home}/lib/${database.driver}" todir="${container.lib.dir}" /> </target> - + </project> Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-06 08:43:39 UTC (rev 5433) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.jbpm.pvm.internal.ant; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + + +/** + * @author Tom Baeyens + */ +public class StartTomcatTask extends Task { + + private static final String END_MESSAGE = " Server startup in "; + + String configuration = null; + String tomcathome = null; + + public void execute() throws BuildException { + try { + // get some environment variableInstances + String fileSeparator = System.getProperty( "file.separator" ); + String os = getProject().getProperty( "os.name" ).toLowerCase(); + + // build the command string + String command = null; + if ( os.indexOf( "windows" ) != -1 ) { + command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "startup.bat"; + } else if ( os.indexOf( "linux" ) != -1 || os.indexOf( "mac" ) != -1) { + command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "startup.sh"; + } else { + throw new BuildException( "os '" + os + "' not supported in the starttomcat task." ); + } + + // launch the command and wait till the END_MESSAGE appears + Thread launcher = new Launcher(this, command, END_MESSAGE); + launcher.start(); + launcher.join(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + String getTomcatHome() { + if (tomcathome!=null) { + return tomcathome; + } + String tomcatHomeSysProp = getProject().getProperty( "tomcat.home" ); + if (tomcatHomeSysProp!=null) { + return tomcatHomeSysProp; + } + throw new BuildException("starttomcat couldn't figure out which tomcat to start: attribute tomcathome not specified and property tomcat.home was not set"); + } + + public void setTomcathome(String tomcathome) { + this.tomcathome = tomcathome; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5432 - in jbpm4/trunk/modules/devguide/src/main: docbook/en/images and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-06 04:01:07 -0400 (Thu, 06 Aug 2009) New Revision: 5432 Added: jbpm4/trunk/modules/devguide/src/main/diagrams/jobexecutor.odg Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/jobexecutor.overview.png Log: [JBPM-2402] verify job executor threads in case of errors update devguide diagram Added: jbpm4/trunk/modules/devguide/src/main/diagrams/jobexecutor.odg =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/devguide/src/main/diagrams/jobexecutor.odg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/jobexecutor.overview.png =================================================================== (Binary files differ)

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5431 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: test/java/org/jbpm/jpdl/el and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-08-05 20:18:25 -0400 (Wed, 05 Aug 2009) New Revision: 5431 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java Log: formatting Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-08-05 20:14:06 UTC (rev 5430) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-08-06 00:18:25 UTC (rev 5431) @@ -69,7 +69,6 @@ if (expression != null) { decisionExpression = expression; - } else if (decisionHandlerElement != null) { decisionDelegation = new Delegation(); @@ -100,7 +99,6 @@ + transitionName + "'"); } - } else if (decisionExpression != null) { Object result = JbpmExpressionEvaluator.evaluate(decisionExpression, executionContext); @@ -118,7 +116,6 @@ + transitionName + "'"); } - } else if (decisionConditions != null && !decisionConditions.isEmpty()) { // backwards compatible mode based on separate DecisionCondition's @@ -160,14 +157,11 @@ log.debug("decision didn't select transition, taking default " + transition); - // since the decision node evaluates condition expressions, the - // condition of the - // taken transition will always be met. therefor we can safely turn off - // the - // standard condition enforcement in the transitions after a decision - // node. + // since the decision node evaluates condition expressions, + // the condition of the taken transition will always be met. + // therefore we can safely turn off the standard condition enforcement + // in the transitions after a decision node. transition.removeConditionEnforcement(); - } catch (Exception exception) { raiseException(exception, executionContext); Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java 2009-08-05 20:14:06 UTC (rev 5430) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java 2009-08-06 00:18:25 UTC (rev 5431) @@ -5,45 +5,46 @@ import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -public class DecisionExpressionTest extends AbstractJbpmTestCase -{ +public class DecisionExpressionTest extends AbstractJbpmTestCase { - public static class Customer - { + public static class Customer { String priority; int number; - public Customer(String priority) - { + public Customer(String priority) { this.priority = priority; } - public Customer(int number) - { + public Customer(int number) { this.number = number; } - public String getPriority() - { + public String getPriority() { return priority; } - public int getNumber() - { + public int getNumber() { return number; } } - public ProcessDefinition createCustomerPriorityProcess() - { - return ProcessDefinition.parseXmlString("<process-definition>" + " <start-state>" + " <transition to='d'/>" + " </start-state>" - + " <decision name='d' expression='#{customer.priority}'>" + " <transition name='LOW' to='l' />" + " <transition name='MEDIUM' to='m' />" - + " <transition name='HIGH' to='h' />" + " </decision>" + " <state name='l' />" + " <state name='m' />" + " <state name='h' />" + public ProcessDefinition createCustomerPriorityProcess() { + return ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='d'/>" + + " </start-state>" + + " <decision name='d' expression='#{customer.priority}'>" + + " <transition name='LOW' to='l' />" + + " <transition name='MEDIUM' to='m' />" + + " <transition name='HIGH' to='h' />" + + " </decision>" + + " <state name='l' />" + + " <state name='m' />" + + " <state name='h' />" + "</process-definition>"); } - public void testCustomerPriorityLow() - { + public void testCustomerPriorityLow() { ProcessDefinition processDefinition = createCustomerPriorityProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer("LOW")); @@ -51,8 +52,7 @@ assertEquals("l", processInstance.getRootToken().getNode().getName()); } - public void testCustomerPriorityMedium() - { + public void testCustomerPriorityMedium() { ProcessDefinition processDefinition = createCustomerPriorityProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer("MEDIUM")); @@ -60,48 +60,47 @@ assertEquals("m", processInstance.getRootToken().getNode().getName()); } - public void testCustomerPriorityUndefined() - { + public void testCustomerPriorityUndefined() { ProcessDefinition processDefinition = createCustomerPriorityProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer("UNDEFINED")); - try - { + try { processInstance.signal(); fail("expected exception"); } - catch (JbpmException e) - { + catch (JbpmException e) { assertTrue(e.getMessage().indexOf("non existing transition") != -1); } } - public void testCustomerPriorityNull() - { + public void testCustomerPriorityNull() { ProcessDefinition processDefinition = createCustomerPriorityProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer(null)); - try - { + try { processInstance.signal(); fail("expected exception"); } - catch (JbpmException e) - { + catch (JbpmException e) { // OK } } - public ProcessDefinition createBooleanExpressionProcess() - { - return ProcessDefinition.parseXmlString("<process-definition>" + " <start-state>" + " <transition to='d'/>" + " </start-state>" - + " <decision name='d' expression='#{customer.number > 5}'>" + " <transition name='true' to='high-numbered-customer' />" - + " <transition name='false' to='low-numbered-customer' />" + " </decision>" + " <state name='high-numbered-customer' />" - + " <state name='low-numbered-customer' />" + "</process-definition>"); + public ProcessDefinition createBooleanExpressionProcess() { + return ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='d'/>" + + " </start-state>" + + " <decision name='d' expression='#{customer.number > 5}'>" + + " <transition name='true' to='high-numbered-customer' />" + + " <transition name='false' to='low-numbered-customer' />" + + " </decision>" + + " <state name='high-numbered-customer' />" + + " <state name='low-numbered-customer' />" + + "</process-definition>"); } - public void testBooleanExpressionTrue() - { + public void testBooleanExpressionTrue() { ProcessDefinition processDefinition = createBooleanExpressionProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer(9)); @@ -109,8 +108,7 @@ assertEquals("high-numbered-customer", processInstance.getRootToken().getNode().getName()); } - public void testBooleanExpressionFalse() - { + public void testBooleanExpressionFalse() { ProcessDefinition processDefinition = createBooleanExpressionProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer(3)); @@ -118,17 +116,27 @@ assertEquals("low-numbered-customer", processInstance.getRootToken().getNode().getName()); } - public ProcessDefinition createConditionProcess() - { - return ProcessDefinition.parseXmlString("<process-definition>" + " <start-state>" + " <transition to='d'/>" + " </start-state>" + " <decision name='d'>" - + " <transition to='low-numbered-customer' />" + " <transition to='high-numbered-customer'>" + " <condition expression='#{customer.number > 5}' />" - + " </transition>" + " <transition to='medium-numbered-customer'>" + " <condition expression='#{customer.number == 5}' />" + " </transition>" - + " </decision>" + " <state name='high-numbered-customer' />" + " <state name='medium-numbered-customer' />" + " <state name='low-numbered-customer' />" + public ProcessDefinition createConditionProcess() { + return ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='d'/>" + + " </start-state>" + + " <decision name='d'>" + + " <transition to='high-numbered-customer'>" + + " <condition expression='#{customer.number > 5}' />" + + " </transition>" + + " <transition to='medium-numbered-customer'>" + + " <condition expression='#{customer.number == 5}' />" + + " </transition>" + + " <transition to='low-numbered-customer' />" + + " </decision>" + + " <state name='high-numbered-customer' />" + + " <state name='medium-numbered-customer' />" + + " <state name='low-numbered-customer' />" + "</process-definition>"); } - public void testConditionHigh() - { + public void testConditionHigh() { ProcessDefinition processDefinition = createConditionProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer(9)); @@ -136,8 +144,7 @@ assertEquals("high-numbered-customer", processInstance.getRootToken().getNode().getName()); } - public void testConditionMedium() - { + public void testConditionMedium() { ProcessDefinition processDefinition = createConditionProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer(5)); @@ -145,8 +152,7 @@ assertEquals("medium-numbered-customer", processInstance.getRootToken().getNode().getName()); } - public void testConditionLow() - { + public void testConditionLow() { ProcessDefinition processDefinition = createConditionProcess(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.getContextInstance().setVariable("customer", new Customer(3));

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5430 - in jbpm4/trunk: modules/test-cactus and 5 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-05 16:14:06 -0400 (Wed, 05 Aug 2009) New Revision: 5430 Added: jbpm4/trunk/modules/test-cactus/src/main/webapp/index.html jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties Removed: jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/ Modified: jbpm4/trunk/modules/test-cactus/pom.xml jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java jbpm4/trunk/pom.xml Log: test-cactus module enhancements Modified: jbpm4/trunk/modules/test-cactus/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-05 16:26:50 UTC (rev 5429) +++ jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-05 20:14:06 UTC (rev 5430) @@ -17,7 +17,7 @@ <name>jBPM 4 - Cactus</name> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-cactus</artifactId> + <artifactId>jbpm-test-cactus</artifactId> <packaging>war</packaging>  @@ -33,25 +33,49 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-examples</artifactId> - <version>4.1-SNAPSHOT</version> <classifier>tests</classifier> - <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + </exclusion> + <exclusion> + <groupId>org.subethamail</groupId> + <artifactId>subethasmtp-wiser</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> - <version>4.1-SNAPSHOT</version> <classifier>tests</classifier> - <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + </exclusion> + <exclusion> + <groupId>org.subethamail</groupId> + <artifactId>subethasmtp-wiser</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> - <version>13-1.7.1</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>runtime</scope> </dependency> </dependencies> @@ -73,14 +97,41 @@ <echo message="${test_classpath}" /> <java classname="org.jbpm.cactustool.CactusTestGenerator"> <classpath path="${test_classpath}"/> - <arg line="src/test/java ../examples/src/test/java ../test-db/src/test/java" /> + <arg line="src/test/java ../examples/src/test/java" /> </java> </tasks> </configuration> </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>org/jbpm/test/AllIntegrationTests.java</include> + </includes> + </configuration> + </plugin> + </plugins> </build> + <profiles> + <profile> + <id>runtest</id> + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-examples</artifactId> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-db</artifactId> + <classifier>tests</classifier> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Modified: jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2009-08-05 16:26:50 UTC (rev 5429) +++ jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2009-08-05 20:14:06 UTC (rev 5430) @@ -46,9 +46,10 @@ out.println("package org.jbpm.test;"); out.println(); out.println("import junit.framework.Test;"); + out.println("import junit.framework.TestCase;"); out.println("import org.apache.cactus.ServletTestSuite;"); out.println(); - out.println("public class AllIntegrationTests {"); + out.println("public class AllIntegrationTests extends TestCase {"); out.println(); out.println(" public static Test suite() {"); out.println(" ServletTestSuite suite = new ServletTestSuite();"); @@ -71,9 +72,10 @@ private static void scanForTestClasses(String dirPath, String packageName, PrintWriter out) throws Exception { File dirFile = new File(dirPath); - if (!dirFile.getName().startsWith(".")) { - log("scanning dir "+dirFile.getCanonicalPath()); + if (".svn".equals(dirFile.getName())) { + return; } + log("scanning dir "+dirFile.getCanonicalPath()); File[] dirContentFiles = dirFile.listFiles(); if (dirContentFiles!=null) { for (File file : dirContentFiles) { Modified: jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml 2009-08-05 16:26:50 UTC (rev 5429) +++ jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml 2009-08-05 20:14:06 UTC (rev 5430) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd"> + +<web-app> + + <servlet> + <servlet-name>ServletRedirector</servlet-name> + <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ServletRedirector</servlet-name> + <url-pattern>/ServletRedirector</url-pattern> + </servlet-mapping> + +</web-app> Added: jbpm4/trunk/modules/test-cactus/src/main/webapp/index.html =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/webapp/index.html (rev 0) +++ jbpm4/trunk/modules/test-cactus/src/main/webapp/index.html 2009-08-05 20:14:06 UTC (rev 5430) @@ -0,0 +1 @@ +hi \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-cactus/src/main/webapp/index.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-05 16:26:50 UTC (rev 5429) +++ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-05 20:14:06 UTC (rev 5430) @@ -1,9 +1,10 @@ package org.jbpm.test; import junit.framework.Test; +import junit.framework.TestCase; import org.apache.cactus.ServletTestSuite; -public class AllIntegrationTests { +public class AllIntegrationTests extends TestCase { public static Test suite() { ServletTestSuite suite = new ServletTestSuite(); @@ -43,72 +44,6 @@ suite.addTestSuite(org.jbpm.examples.timer.event.TimerEventTest.class); suite.addTestSuite(org.jbpm.examples.timer.repeat.TimerRepeatTest.class); suite.addTestSuite(org.jbpm.examples.timer.transition.TimerTransitionTest.class); - suite.addTestSuite(org.jbpm.examples.async.eventlistener.AsyncEventListenerTest.class); - suite.addTestSuite(org.jbpm.examples.goup.concurrency.GroupConcurrencyTest.class); - suite.addTestSuite(org.jbpm.examples.goup.multipleentries.MultipleEntriesTest.class); - suite.addTestSuite(org.jbpm.examples.goup.simple.GroupSimpleTest.class); - suite.addTestSuite(org.jbpm.examples.goup.timer.GroupTimerTest.class); - suite.addTestSuite(org.jbpm.test.activities.DecisionTest.class); - suite.addTestSuite(org.jbpm.test.activities.ForkJoinInSameTransactionTest.class); - suite.addTestSuite(org.jbpm.test.activities.ForkTest.class); - suite.addTestSuite(org.jbpm.test.activities.ForkToTaskTest.class); - suite.addTestSuite(org.jbpm.test.activities.GroupBasicsTest.class); - suite.addTestSuite(org.jbpm.test.activities.GroupTimersTest.class); - suite.addTestSuite(org.jbpm.test.activities.JoinTest.class); - suite.addTestSuite(org.jbpm.test.activities.StatesJoinEndTest.class); - suite.addTestSuite(org.jbpm.test.activities.StateTest.class); - suite.addTestSuite(org.jbpm.test.activities.SubProcessTest.class); - suite.addTestSuite(org.jbpm.test.activities.TasksJoinEndTest.class); - suite.addTestSuite(org.jbpm.test.async.AsyncBasicsTest.class); - suite.addTestSuite(org.jbpm.test.async.AsyncEndCombinationTest.class); - suite.addTestSuite(org.jbpm.test.async.AsyncEventListenerOnEndTest.class); - suite.addTestSuite(org.jbpm.test.auth.UserProvidedAuthenticationTest.class); - suite.addTestSuite(org.jbpm.test.cfg.ConfigurationTest.class); - suite.addTestSuite(org.jbpm.test.deploy.DeploymentQueryTest.class); - suite.addTestSuite(org.jbpm.test.deploy.ImageTest.class); - suite.addTestSuite(org.jbpm.test.deploy.SuspendDeploymentTest.class); - suite.addTestSuite(org.jbpm.test.eventlistener.EventListenerTest.class); - suite.addTestSuite(org.jbpm.test.eventlistener.HqlEventListenerTest.class); - suite.addTestSuite(org.jbpm.test.execution.ConcurrentEndTest.class); - suite.addTestSuite(org.jbpm.test.execution.ExecutionEagerLoadingTest.class); - suite.addTestSuite(org.jbpm.test.execution.ExecutionQueryTest.class); - suite.addTestSuite(org.jbpm.test.execution.FindExecutionTest.class); - suite.addTestSuite(org.jbpm.test.execution.SignalExecutionTest.class); - suite.addTestSuite(org.jbpm.test.execution.StartExecutionTest.class); - suite.addTestSuite(org.jbpm.test.execution.SystemVariablesTest.class); - suite.addTestSuite(org.jbpm.test.history.AvgDurationTest.class); - suite.addTestSuite(org.jbpm.test.history.ChoiceDistributionTest.class); - suite.addTestSuite(org.jbpm.test.history.EndProcessInstanceTest.class); - suite.addTestSuite(org.jbpm.test.history.HistoryActivityInstanceQeuryTest.class); - suite.addTestSuite(org.jbpm.test.history.HistoryDetailQueryTest.class); - suite.addTestSuite(org.jbpm.test.history.HistoryTaskAssigneeTest.class); - suite.addTestSuite(org.jbpm.test.history.ProcessInstanceHistoryTest.class); - suite.addTestSuite(org.jbpm.test.identity.IdentityTest.class); - suite.addTestSuite(org.jbpm.test.mgmt.JobQueryTest.class); - suite.addTestSuite(org.jbpm.test.process.ActivityCoordinatesTest.class); - suite.addTestSuite(org.jbpm.test.process.DeploymentResourcesTest.class); - suite.addTestSuite(org.jbpm.test.process.DescriptionTest.class); - suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionQueryTest.class); - suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionStartFormTest.class); - suite.addTestSuite(org.jbpm.test.process.RepositoryServiceTest.class); - suite.addTestSuite(org.jbpm.test.reporting.SQLStmtTest.class); - suite.addTestSuite(org.jbpm.test.task.SubTaskTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskCommentsTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskCreateUpdateDeleteTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskListTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskParticipationsTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskPropertiesTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskQueryCandidatesTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskQueryProcessTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskQueryTest.class); - suite.addTestSuite(org.jbpm.test.task.TaskVariablesTest.class); - suite.addTestSuite(org.jbpm.test.taskactivity.TaskCandidatesTest.class); - suite.addTestSuite(org.jbpm.test.taskactivity.TaskCompletionTest.class); - suite.addTestSuite(org.jbpm.test.taskactivity.TaskOutcomesTest.class); - suite.addTestSuite(org.jbpm.test.taskactivity.TaskReassignTest.class); - suite.addTestSuite(org.jbpm.test.timer.TimerTest.class); - suite.addTestSuite(org.jbpm.test.variables.BasicVariablesTest.class); - suite.addTestSuite(org.jbpm.test.variables.VariableBasicTypesTest.class); return suite; } } Added: jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties (rev 0) +++ jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties 2009-08-05 20:14:06 UTC (rev 5430) @@ -0,0 +1 @@ +cactus.contextURL=http://localhost:8080/jbpm-test-cactus Property changes on: jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-08-05 16:26:50 UTC (rev 5429) +++ jbpm4/trunk/pom.xml 2009-08-05 20:14:06 UTC (rev 5430) @@ -99,6 +99,7 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-examples</artifactId> + <classifier>tests</classifier> <version>${version}</version> </dependency> <dependency> @@ -125,6 +126,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> <version>${version}</version> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId>

16 years, 9 months

1
0
0 / 0

JBoss JBPM SVN: r5429 - in jbpm4/trunk/modules: examples and 7 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-05 12:26:50 -0400 (Wed, 05 Aug 2009) New Revision: 5429 Added: jbpm4/trunk/modules/distro/src/main/files/install/downloads/ jbpm4/trunk/modules/test-cactus/src/main/webapp/ jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/ jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/ jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/cactus.properties jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/test-cactus/ jbpm4/trunk/modules/test-cactus/pom.xml jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java Log: test-cactus module enhancements Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-04 23:31:39 UTC (rev 5428) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-05 16:26:50 UTC (rev 5429) @@ -148,6 +148,8 @@ <include name="freemarker.jar" /> <include name="livetribe-jsr223.jar" /> <include name="juel*.jar" /> + <include name="hibernate-core.jar" /> + <include name="hibernate-cglib-repack.jar" /> </fileset> </copy> Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-08-04 23:31:39 UTC (rev 5428) +++ jbpm4/trunk/modules/examples/pom.xml 2009-08-05 16:26:50 UTC (rev 5429) @@ -82,10 +82,9 @@ </goals> <configuration> <excludes> - <exclude>jbpm.cfg.xml</exclude> - <exclude>jbpm.hibernate.cfg.xml</exclude> - <exclude>jbpm.mail.properties</exclude> + <exclude>jbpm.*</exclude> <exclude>logging.properties</exclude> + <exclude>META-INF/*</exclude> </excludes> </configuration> </execution> Property changes on: jbpm4/trunk/modules/test-cactus ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm4/trunk/modules/test-cactus/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-04 23:31:39 UTC (rev 5428) +++ jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-05 16:26:50 UTC (rev 5429) @@ -38,9 +38,16 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-db</artifactId> + <version>4.1-SNAPSHOT</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> - <version> 13-1.7.1</version> + <version>13-1.7.1</version> </dependency> <dependency> <groupId>junit</groupId> @@ -66,7 +73,7 @@ <echo message="${test_classpath}" /> <java classname="org.jbpm.cactustool.CactusTestGenerator"> <classpath path="${test_classpath}"/> - <arg line="src/test/java ../examples/src/test/java" /> + <arg line="src/test/java ../examples/src/test/java ../test-db/src/test/java" /> </java> </tasks> </configuration> Modified: jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2009-08-04 23:31:39 UTC (rev 5428) +++ jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2009-08-05 16:26:50 UTC (rev 5429) @@ -51,7 +51,7 @@ out.println("public class AllIntegrationTests {"); out.println(); out.println(" public static Test suite() {"); - out.println(" Test suite = new ServletTestSuite();"); + out.println(" ServletTestSuite suite = new ServletTestSuite();"); for (int i=1; i<args.length; i++) { String testSrcRoot = args[i]; @@ -71,13 +71,15 @@ private static void scanForTestClasses(String dirPath, String packageName, PrintWriter out) throws Exception { File dirFile = new File(dirPath); - log("scanning dir "+dirFile.getCanonicalPath()); + if (!dirFile.getName().startsWith(".")) { + log("scanning dir "+dirFile.getCanonicalPath()); + } File[] dirContentFiles = dirFile.listFiles(); if (dirContentFiles!=null) { for (File file : dirContentFiles) { String fileName = file.getName(); if (file.isFile() && file.getName().endsWith("Test.java")) { - String className = packageName + "." + fileName.substring(0, fileName.length()-5); + String className = packageName + "." + fileName.substring(0, fileName.length()-5)+".class"; log(" adding "+className); out.println(" suite.addTestSuite(" + className + ");"); Added: jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/cactus.properties =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/cactus.properties (rev 0) +++ jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/cactus.properties 2009-08-05 16:26:50 UTC (rev 5429) @@ -0,0 +1 @@ +cactus.contextURL=http://localhost/jbpm-test-cactus/ServletRedirector Property changes on: jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/classes/cactus.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml =================================================================== Property changes on: jbpm4/trunk/modules/test-cactus/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-04 23:31:39 UTC (rev 5428) +++ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-05 16:26:50 UTC (rev 5429) @@ -6,43 +6,109 @@ public class AllIntegrationTests { public static Test suite() { - Test suite = new ServletTestSuite(); - suite.addTestSuite(org.jbpm.examples.async.activity.AsyncActivityTest); - suite.addTestSuite(org.jbpm.examples.async.fork.AsyncForkTest); - suite.addTestSuite(org.jbpm.examples.concurrency.graphbased.ConcurrencyGraphBasedTest); - suite.addTestSuite(org.jbpm.examples.custom.CustomTest); - suite.addTestSuite(org.jbpm.examples.decision.conditions.DecisionConditionsTest); - suite.addTestSuite(org.jbpm.examples.decision.expression.DecisionExpressionTest); - suite.addTestSuite(org.jbpm.examples.decision.handler.DecisionHandlerTest); - suite.addTestSuite(org.jbpm.examples.end.multiple.EndMultipleTest); - suite.addTestSuite(org.jbpm.examples.end.processinstance.EndProcessInstanceTest); - suite.addTestSuite(org.jbpm.examples.end.state.EndStateTest); - suite.addTestSuite(org.jbpm.examples.eventlistener.EventListenerTest); - suite.addTestSuite(org.jbpm.examples.hql.HqlTest); - suite.addTestSuite(org.jbpm.examples.java.JavaInstantiateTest); - suite.addTestSuite(org.jbpm.examples.mail.inline.InlineMailTest); - suite.addTestSuite(org.jbpm.examples.mail.template.TemplateMailTest); - suite.addTestSuite(org.jbpm.examples.script.expression.ScriptExpressionTest); - suite.addTestSuite(org.jbpm.examples.script.text.ScriptTextTest); - suite.addTestSuite(org.jbpm.examples.services.ServicesTest); - suite.addTestSuite(org.jbpm.examples.sql.SqlTest); - suite.addTestSuite(org.jbpm.examples.state.choice.StateChoiceTest); - suite.addTestSuite(org.jbpm.examples.state.sequence.StateSequenceTest); - suite.addTestSuite(org.jbpm.examples.subprocess.outcomeactivity.SubProcessOutcomeActivityTest); - suite.addTestSuite(org.jbpm.examples.subprocess.outcomevalue.SubProcessOutcomeValueTest); - suite.addTestSuite(org.jbpm.examples.subprocess.variables.SubProcessVariablesTest); - suite.addTestSuite(org.jbpm.examples.task.assignee.TaskAssigneeTest); - suite.addTestSuite(org.jbpm.examples.task.assignmenthandler.TaskAssignmentHandlerTest); - suite.addTestSuite(org.jbpm.examples.task.candidates.TaskCandidatesTest); - suite.addTestSuite(org.jbpm.examples.task.comments.TaskCommentsTest); - suite.addTestSuite(org.jbpm.examples.task.notification.TaskNotificationTest); - suite.addTestSuite(org.jbpm.examples.task.reminder.TaskReminderTest); - suite.addTestSuite(org.jbpm.examples.task.swimlane.TaskSwimlaneTest); - suite.addTestSuite(org.jbpm.examples.task.variables.TaskVariablesTest); - suite.addTestSuite(org.jbpm.examples.timer.businesstime.TimerBusinessTimeTest); - suite.addTestSuite(org.jbpm.examples.timer.event.TimerEventTest); - suite.addTestSuite(org.jbpm.examples.timer.repeat.TimerRepeatTest); - suite.addTestSuite(org.jbpm.examples.timer.transition.TimerTransitionTest); + ServletTestSuite suite = new ServletTestSuite(); + suite.addTestSuite(org.jbpm.examples.async.activity.AsyncActivityTest.class); + suite.addTestSuite(org.jbpm.examples.async.fork.AsyncForkTest.class); + suite.addTestSuite(org.jbpm.examples.concurrency.graphbased.ConcurrencyGraphBasedTest.class); + suite.addTestSuite(org.jbpm.examples.custom.CustomTest.class); + suite.addTestSuite(org.jbpm.examples.decision.conditions.DecisionConditionsTest.class); + suite.addTestSuite(org.jbpm.examples.decision.expression.DecisionExpressionTest.class); + suite.addTestSuite(org.jbpm.examples.decision.handler.DecisionHandlerTest.class); + suite.addTestSuite(org.jbpm.examples.end.multiple.EndMultipleTest.class); + suite.addTestSuite(org.jbpm.examples.end.processinstance.EndProcessInstanceTest.class); + suite.addTestSuite(org.jbpm.examples.end.state.EndStateTest.class); + suite.addTestSuite(org.jbpm.examples.eventlistener.EventListenerTest.class); + suite.addTestSuite(org.jbpm.examples.hql.HqlTest.class); + suite.addTestSuite(org.jbpm.examples.java.JavaInstantiateTest.class); + suite.addTestSuite(org.jbpm.examples.mail.inline.InlineMailTest.class); + suite.addTestSuite(org.jbpm.examples.mail.template.TemplateMailTest.class); + suite.addTestSuite(org.jbpm.examples.script.expression.ScriptExpressionTest.class); + suite.addTestSuite(org.jbpm.examples.script.text.ScriptTextTest.class); + suite.addTestSuite(org.jbpm.examples.services.ServicesTest.class); + suite.addTestSuite(org.jbpm.examples.sql.SqlTest.class); + suite.addTestSuite(org.jbpm.examples.state.choice.StateChoiceTest.class); + suite.addTestSuite(org.jbpm.examples.state.sequence.StateSequenceTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.outcomeactivity.SubProcessOutcomeActivityTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.outcomevalue.SubProcessOutcomeValueTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.variables.SubProcessVariablesTest.class); + suite.addTestSuite(org.jbpm.examples.task.assignee.TaskAssigneeTest.class); + suite.addTestSuite(org.jbpm.examples.task.assignmenthandler.TaskAssignmentHandlerTest.class); + suite.addTestSuite(org.jbpm.examples.task.candidates.TaskCandidatesTest.class); + suite.addTestSuite(org.jbpm.examples.task.comments.TaskCommentsTest.class); + suite.addTestSuite(org.jbpm.examples.task.notification.TaskNotificationTest.class); + suite.addTestSuite(org.jbpm.examples.task.reminder.TaskReminderTest.class); + suite.addTestSuite(org.jbpm.examples.task.swimlane.TaskSwimlaneTest.class); + suite.addTestSuite(org.jbpm.examples.task.variables.TaskVariablesTest.class); + suite.addTestSuite(org.jbpm.examples.timer.businesstime.TimerBusinessTimeTest.class); + suite.addTestSuite(org.jbpm.examples.timer.event.TimerEventTest.class); + suite.addTestSuite(org.jbpm.examples.timer.repeat.TimerRepeatTest.class); + suite.addTestSuite(org.jbpm.examples.timer.transition.TimerTransitionTest.class); + suite.addTestSuite(org.jbpm.examples.async.eventlistener.AsyncEventListenerTest.class); + suite.addTestSuite(org.jbpm.examples.goup.concurrency.GroupConcurrencyTest.class); + suite.addTestSuite(org.jbpm.examples.goup.multipleentries.MultipleEntriesTest.class); + suite.addTestSuite(org.jbpm.examples.goup.simple.GroupSimpleTest.class); + suite.addTestSuite(org.jbpm.examples.goup.timer.GroupTimerTest.class); + suite.addTestSuite(org.jbpm.test.activities.DecisionTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkJoinInSameTransactionTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkToTaskTest.class); + suite.addTestSuite(org.jbpm.test.activities.GroupBasicsTest.class); + suite.addTestSuite(org.jbpm.test.activities.GroupTimersTest.class); + suite.addTestSuite(org.jbpm.test.activities.JoinTest.class); + suite.addTestSuite(org.jbpm.test.activities.StatesJoinEndTest.class); + suite.addTestSuite(org.jbpm.test.activities.StateTest.class); + suite.addTestSuite(org.jbpm.test.activities.SubProcessTest.class); + suite.addTestSuite(org.jbpm.test.activities.TasksJoinEndTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncBasicsTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncEndCombinationTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncEventListenerOnEndTest.class); + suite.addTestSuite(org.jbpm.test.auth.UserProvidedAuthenticationTest.class); + suite.addTestSuite(org.jbpm.test.cfg.ConfigurationTest.class); + suite.addTestSuite(org.jbpm.test.deploy.DeploymentQueryTest.class); + suite.addTestSuite(org.jbpm.test.deploy.ImageTest.class); + suite.addTestSuite(org.jbpm.test.deploy.SuspendDeploymentTest.class); + suite.addTestSuite(org.jbpm.test.eventlistener.EventListenerTest.class); + suite.addTestSuite(org.jbpm.test.eventlistener.HqlEventListenerTest.class); + suite.addTestSuite(org.jbpm.test.execution.ConcurrentEndTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionEagerLoadingTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionQueryTest.class); + suite.addTestSuite(org.jbpm.test.execution.FindExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.SignalExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.StartExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.SystemVariablesTest.class); + suite.addTestSuite(org.jbpm.test.history.AvgDurationTest.class); + suite.addTestSuite(org.jbpm.test.history.ChoiceDistributionTest.class); + suite.addTestSuite(org.jbpm.test.history.EndProcessInstanceTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryActivityInstanceQeuryTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryDetailQueryTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryTaskAssigneeTest.class); + suite.addTestSuite(org.jbpm.test.history.ProcessInstanceHistoryTest.class); + suite.addTestSuite(org.jbpm.test.identity.IdentityTest.class); + suite.addTestSuite(org.jbpm.test.mgmt.JobQueryTest.class); + suite.addTestSuite(org.jbpm.test.process.ActivityCoordinatesTest.class); + suite.addTestSuite(org.jbpm.test.process.DeploymentResourcesTest.class); + suite.addTestSuite(org.jbpm.test.process.DescriptionTest.class); + suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionQueryTest.class); + suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionStartFormTest.class); + suite.addTestSuite(org.jbpm.test.process.RepositoryServiceTest.class); + suite.addTestSuite(org.jbpm.test.reporting.SQLStmtTest.class); + suite.addTestSuite(org.jbpm.test.task.SubTaskTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskCommentsTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskCreateUpdateDeleteTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskListTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskParticipationsTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskPropertiesTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryCandidatesTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryProcessTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskVariablesTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskCandidatesTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskCompletionTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskOutcomesTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskReassignTest.class); + suite.addTestSuite(org.jbpm.test.timer.TimerTest.class); + suite.addTestSuite(org.jbpm.test.variables.BasicVariablesTest.class); + suite.addTestSuite(org.jbpm.test.variables.VariableBasicTypesTest.class); return suite; } }

16 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2009