November 2010 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6828 - projects/jsf-console/branches/jsf-console-3.2-soa and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-11-16 19:53:13 -0500 (Tue, 16 Nov 2010) New Revision: 6828 Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml Log: JBPM-2979 replace jbpm-parent with jboss-parent in jsf-console Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-11-17 00:41:58 UTC (rev 6827) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-11-17 00:53:13 UTC (rev 6828) @@ -44,7 +44,7 @@ <maven.compiler.target>1.4</maven.compiler.target> <maven.compiler.source>1.4</maven.compiler.source> -  +  <cargo.version>1.0.3</cargo.version>  Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-11-17 00:41:58 UTC (rev 6827) +++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2010-11-17 00:53:13 UTC (rev 6828) @@ -25,9 +25,9 @@  <parent> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-parent</artifactId> - <version>1.0.4</version> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5</version> </parent>  @@ -41,6 +41,10 @@  <properties> + <maven.compiler.target>1.4</maven.compiler.target> + <maven.compiler.source>1.4</maven.compiler.source> + +  <javax.faces.version>1.2_13</javax.faces.version> <jbpm.version>3.2.9</jbpm.version> </properties> @@ -111,16 +115,6 @@  <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - <pluginManagement> <plugins> <plugin>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6827 - in jbpm3/branches/jbpm-3.2-soa: ci and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-11-16 19:41:58 -0500 (Tue, 16 Nov 2010) New Revision: 6827 Modified: jbpm3/branches/jbpm-3.2-soa/ jbpm3/branches/jbpm-3.2-soa/ci/container.sh jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2979 replace jbpm-parent with jboss-parent as the latter declares plugin versions; parameterize Maven settings file in CI scripts Property changes on: jbpm3/branches/jbpm-3.2-soa ___________________________________________________________________ Name: svn:ignore - target .settings settings.xml + target .settings Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-11-16 15:34:50 UTC (rev 6826) +++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-11-17 00:41:58 UTC (rev 6827) @@ -5,13 +5,14 @@ # # Exported shell variables required: # WORKSPACE work directory -# JAVA_HOME location of java development kit -# JAVA_15_HOME required if testing against java 1.4 only -# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql -# CONTAINER jboss405, jboss423, jboss501, jboss510 +# JAVA_HOME JDK location +# JAVA_15_HOME JDK 1.5 location; required if JAVA_HOME points to JDK 1.4 +# DATABASE one of db2, hsqldb, mssql, mysql, oracle, postgresql +# CONTAINER one of jboss405, jboss423, jboss501, jboss510 # MYTESTIP_1 bind address # MCAST_ADDR multicast address -# SOURCE_REPO location of jboss distributions +# SOURCE_REPO JBoss distributions directory +# MAVEN_SETTINGS Maven settings file; optional, defaults to ci/settings-qa.xml # Determine JBoss AS version case $CONTAINER in @@ -50,15 +51,17 @@ # Set up Maven export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -# Prevent override of an existing settings.xml file, allowing for local runs -cp -u ci/settings-qa.xml settings.xml +[ -z $MAVEN_SETTINGS ] && MAVEN_SETTINGS=ci/settings-qa.xml +# Display Maven version +mvn -v + # Determine jBPM version -mvn -V -s settings.xml -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +mvn -s $MAVEN_SETTINGS -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt JBPM_VERSION=`grep '^3\.' $WORKSPACE/version.txt` # Build jBPM -mvn -U -s settings.xml -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION \ +mvn -U -s $MAVEN_SETTINGS -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION \ -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install if [ $? -ne 0 ]; then echo "ERROR: failed to build distro" @@ -78,7 +81,7 @@ fi # Fetch proprietary JDBC drivers -mvn -s settings.xml -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve +mvn -s $MAVEN_SETTINGS -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve # DB2 driver if [ "$DATABASE" = "db2" ]; then @@ -146,8 +149,8 @@ fi # Run enterprise test suite -mvn -f enterprise/pom.xml -s settings.xml -Djboss.bind.address=$MYTESTIP_1 \ - -Dsurefire.jvm.args="-Xms64m -Xmx256m" integration-test | tee $WORKSPACE/tests.log +mvn -f enterprise/pom.xml -s $MAVEN_SETTINGS -Djboss.bind.address=$MYTESTIP_1 \ + -Dsurefire.jvm.args="-Xms64m -Xmx256m" verify | tee $WORKSPACE/tests.log # Stop JBoss AS $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S Modified: jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-11-16 15:34:50 UTC (rev 6826) +++ jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-11-17 00:41:58 UTC (rev 6827) @@ -1,12 +1,12 @@ #!/bin/sh # -# Build the project with Maven and -# run the standalone test suite +# Build the project with Maven and run the standalone test suite # -# Exported shell variables required: -# JAVA_HOME location of java development kit -# JAVA_15_HOME required if testing against java 1.4 only -# DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql +# Environment variables +# JAVA_HOME JDK location +# JAVA_15_HOME JDK 1.5 location; required if JAVA_HOME points to JDK 1.4 +# DATABASE one of db2, hsqldb, mssql, mysql, oracle, postgresql +# MAVEN_SETTINGS Maven settings file; optional, defaults to ci/settings-qa.xml # Determine Java platform version JAVA=$JAVA_HOME/bin/java @@ -22,10 +22,12 @@ # Set up Maven export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -# Prevent override of an existing settings.xml file, allowing for local runs -cp -u ci/settings-qa.xml settings.xml +[ -z $MAVEN_SETTINGS ] && MAVEN_SETTINGS=ci/settings-qa.xml +# Display Maven version +mvn -v + # Run standalone test suite export JAVA_HOME=$ORIG_JAVA_HOME -mvn -V -U -s settings.xml -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ - -Dmaven.test.failure.ignore=true test +mvn -U -s $MAVEN_SETTINGS -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ + -Dmaven.test.failure.ignore=true clean test Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-11-16 15:34:50 UTC (rev 6826) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-11-17 00:41:58 UTC (rev 6827) @@ -20,14 +20,14 @@ <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/jbpm3</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/jbpm3</developerConnection> - <url>http://fisheye.jboss.org/browse/JbpmSvn/jbpm3</url> + <url>http://fisheye.jboss.org/browse/jbpm/jbpm3</url> </scm>  <parent> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-parent</artifactId> - <version>1.0.4</version> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>5</version> </parent>  @@ -41,6 +41,10 @@  <properties> + <maven.compiler.target>1.4</maven.compiler.target> + <maven.compiler.source>1.4</maven.compiler.source> + +  <cargo.version>1.0.3</cargo.version>  @@ -399,17 +403,9 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - - <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <source>1.4</source> + <source>${maven.compiler.source}</source> <quiet>true</quiet> </configuration> </plugin> @@ -446,11 +442,6 @@ </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-3</version> - </plugin> - - <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> <version>2.1.2</version>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6826 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-16 10:34:50 -0500 (Tue, 16 Nov 2010) New Revision: 6826 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java Log: optimize log Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -41,9 +41,10 @@ } public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - ActivityImpl activity = execution.getActivity(); ActivityBehaviour activityBehaviour = activity.getActivityBehaviour(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -64,9 +64,10 @@ } public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - EventImpl event = execution.getEvent(); ObservableElementImpl observableElement = event.getObservableElement(); int eventListenerIndex = execution.getEventListenerIndex(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -42,10 +42,11 @@ } public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + log.debug("activity " + activity); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - log.debug("activity " + activity); - execution.setActivity(activity); ExecutionImpl propagatingExecution = execution.startActivity(activity); propagatingExecution.performAtomicOperation(AtomicOperation.EXECUTE_ACTIVITY); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -36,10 +36,11 @@ private static final Log log = Log.getLog(MoveToParentActivity.class.getName()); public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + log.debug("activity " + execution.getActivity() + ", parent activity : " + execution.getActivity().getParentActivity()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - log.debug("activity " + execution.getActivity() + ", parent activity : " + execution.getActivity().getParentActivity()); - ActivityImpl activity = execution.getActivity(); ActivityImpl parentActivity = activity.getParentActivity(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -55,9 +55,10 @@ @Override public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - ActivityImpl activity = execution.getActivity(); ExternalActivityBehaviour activityBehaviour = (ExternalActivityBehaviour) activity Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -41,9 +41,10 @@ } public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - ActivityImpl activity = execution.getActivity(); ExecutionImpl propagatingExecution = execution; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -43,9 +43,10 @@ } public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - TransitionImpl transition = execution.getTransition(); ActivityImpl source = transition.getSource(); ActivityImpl destination = transition.getDestination(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java 2010-11-16 06:16:57 UTC (rev 6825) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java 2010-11-16 15:34:50 UTC (rev 6826) @@ -42,9 +42,10 @@ } public void perform(ExecutionImpl execution) { + if (log.isDebugEnabled()) { + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + } - log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); - TransitionImpl transition = execution.getTransition(); execution.setActivity(null);

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6825 - in jbpm4/trunk/modules: bpmn/src/main/java/org/jbpm/bpmn/parser and 4 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-16 01:16:57 -0500 (Tue, 16 Nov 2010) New Revision: 6825 Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowEventBinding.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowSignalEvent.java Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateCatchEventBinding.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/SubProcessActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java Log: JBPM-2735 immediate throw signal event Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateCatchEventBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateCatchEventBinding.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateCatchEventBinding.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -33,11 +33,11 @@ * @author Joram Barrez */ public class IntermediateCatchEventBinding extends BpmnBinding { - + public IntermediateCatchEventBinding() { super("intermediateCatchEvent"); } - + public Object parse(Element element, Parse parse, BpmnParser bpmnParser) { String id = XmlUtil.attribute(element, "id"); Element eventDefinition = XmlUtil.element(element); @@ -46,27 +46,27 @@ } else { parse.addProblem("Invalid eventDefinition type : " + eventDefinition.getNodeName()); } - + return null; } - - protected IntermediateCatchTimerEvent createIntermediateTimerCatchEvent(String catchEventId, + + protected IntermediateCatchTimerEvent createIntermediateTimerCatchEvent(String catchEventId, Element eventDefinitionElement, BpmnParser parser, Parse parse) { - + IntermediateCatchTimerEvent intermediateCatchTimerEvent = new IntermediateCatchTimerEvent(); TimerDefinitionImpl timerDefinition = parser.parseTimerEventDefinition(eventDefinitionElement, parse, catchEventId); - + // Attach the timerDefinition to the current activity. - // That way, the PVM will automatically pcik it up when the execution arrives in the activity. + // That way, the PVM will automatically pick it up when the execution arrives in the activity. ActivityImpl activity = parse.contextStackFind(ActivityImpl.class); activity.addTimerDefinition(timerDefinition); - + // The timer will fire an event on which this class will listen. String eventName = "INTERMEDIATE_TIMER_" + catchEventId; timerDefinition.setEventName(eventName); EventImpl timerEvent = activity.createEvent(eventName); timerEvent.createEventListenerReference(intermediateCatchTimerEvent); - + return intermediateCatchTimerEvent; } Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowEventBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowEventBinding.java (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowEventBinding.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -0,0 +1,65 @@ +/* + * 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.bpmn.flownodes; + +import org.jbpm.bpmn.parser.BpmnParser; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.EventImpl; +import org.jbpm.pvm.internal.model.TimerDefinitionImpl; +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.xml.Parse; +import org.w3c.dom.Element; + +/** + * @author Huisheng Xu + */ +public class IntermediateThrowEventBinding extends BpmnBinding { + + public IntermediateThrowEventBinding() { + super("intermediateThrowEvent"); + } + + public Object parse(Element element, Parse parse, BpmnParser bpmnParser) { + String id = XmlUtil.attribute(element, "id"); + Element eventDefinition = XmlUtil.element(element); + if ("signalEventDefinition".equals(eventDefinition.getNodeName())) { + return createIntermediateSignalThrowEvent(id, eventDefinition, bpmnParser, parse); + } else { + parse.addProblem("Invalid eventDefinition type : " + eventDefinition.getNodeName()); + } + + return null; + } + + protected IntermediateThrowSignalEvent createIntermediateSignalThrowEvent(String throwEventId, + Element eventDefinitionElement, BpmnParser parser, Parse parse) { + + // String eventName = "INTERMEDIATE_SIGNAL_" + throwEventId; + String eventName = XmlUtil.attribute(eventDefinitionElement, "signalRef"); + + IntermediateThrowSignalEvent intermediateThrowSignalEvent = new IntermediateThrowSignalEvent(); + intermediateThrowSignalEvent.setSignalCode(eventName); + + return intermediateThrowSignalEvent; + } + +} Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowSignalEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowSignalEvent.java (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/IntermediateThrowSignalEvent.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -0,0 +1,61 @@ +/* + * 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.bpmn.flownodes; + +import org.jbpm.api.activity.ActivityExecution; +import org.jbpm.api.listener.EventListener; +import org.jbpm.api.listener.EventListenerExecution; +import org.jbpm.pvm.internal.model.ExecutionImpl; + +/** + * + * @author Huisheng Xu + */ +public class IntermediateThrowSignalEvent extends BpmnActivity implements EventListener, BpmnEvent { + + private static final long serialVersionUID = 1L; + + protected String signalCode; + + public void execute(ActivityExecution execution) { + ExecutionImpl executionImpl = (ExecutionImpl) execution; + execute(executionImpl); + proceed(executionImpl, findOutgoingSequenceFlow(executionImpl, CONDITIONS_CHECKED)); + } + + public void execute(ExecutionImpl execution) { + execution.fire(signalCode, execution.getActivity()); + } + + public void notify(EventListenerExecution execution) throws Exception { + this.execute((ExecutionImpl) execution); + } + + public void setSignalCode(String signalCode) { + this.signalCode = signalCode; + } + + public boolean isDefaultEnabled() { + return true; + } + +} Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/SubProcessActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/SubProcessActivity.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/SubProcessActivity.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -49,7 +49,7 @@ if (!startActivities.isEmpty()) { ExecutionImpl parent = execution.createScope(execution.getActivity()); - for (Activity startActivity: startActivities) { + for (Activity startActivity : startActivities) { parent.setState(Execution.STATE_INACTIVE_CONCURRENT_ROOT); ExecutionImpl concurrentExecution = parent.createExecution(); concurrentExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); @@ -69,7 +69,7 @@ List<Activity> startActivities = new ArrayList<Activity>(); for (Activity nestedActivity : execution.getActivity().getActivities()) { - if ( (nestedActivity.getIncomingTransitions()==null) + if ( (nestedActivity.getIncomingTransitions() == null) || (nestedActivity.getIncomingTransitions().isEmpty())) { startActivities.add(nestedActivity); } 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 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -341,6 +341,7 @@ event = refActivity.createEvent(eventName); } EventListenerReference eventListenerReference = event.createEventListenerReference(boundaryEscalationEvent); + eventListenerReference.setPropagationEnabled(true); escalationActivity.setActivityBehaviour(boundaryEscalationEvent); } @@ -362,6 +363,7 @@ event = refActivity.createEvent(eventName); } EventListenerReference eventListenerReference = event.createEventListenerReference(boundarySignalEvent); + eventListenerReference.setPropagationEnabled(true); signalActivity.setActivityBehaviour(boundarySignalEvent); } @@ -381,6 +383,7 @@ event = refActivity.createEvent(eventName); } EventListenerReference eventListenerReference = event.createEventListenerReference(boundaryErrorEvent); + eventListenerReference.setPropagationEnabled(true); errorActivity.setActivityBehaviour(boundaryErrorEvent); } Modified: jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/bpmn/src/main/resources/jbpm.bpmn.flownodes.xml 2010-11-16 06:16:57 UTC (rev 6825) @@ -6,6 +6,7 @@  <activity binding="org.jbpm.bpmn.flownodes.IntermediateCatchEventBinding" /> + <activity binding="org.jbpm.bpmn.flownodes.IntermediateThrowEventBinding" />  <activity binding="org.jbpm.bpmn.flownodes.ExclusiveGatewayBinding" /> Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -19,7 +19,7 @@ * 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.examples.bpmn.event.error; +package org.jbpm.examples.bpmn.event.signal; import org.jbpm.api.NewDeployment; import org.jbpm.api.ProcessInstance; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventImpl.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -47,7 +47,7 @@ // listener references ////////////////////////////////////////////////////// public EventListenerReference createEventListenerReference() { - if (listenerReferences==null) { + if (listenerReferences == null) { listenerReferences = new ArrayList<EventListenerReference>(); } EventListenerReference activityReference = new EventListenerReference(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/EventListenerReference.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -50,16 +50,16 @@ } public boolean isAsync() { - return Continuation.SYNCHRONOUS!=continuation; + return Continuation.SYNCHRONOUS != continuation; } // customized getters and setters /////////////////////////////////////////// public EventListener getEventListener() { - if (eventListener!=null) { + if (eventListener != null) { return eventListener; } - if (eventListenerDescriptor!=null) { + if (eventListenerDescriptor != null) { EventListener createdEventListener = (EventListener) ReflectUtil.instantiateUserCode(eventListenerDescriptor, processDefinition, null); if (!isEventListenerStateful) { eventListener = createdEventListener; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -101,7 +101,7 @@ /** a unique id for this execution. */ protected String id; - + /** user id/name who started the process instance, can be null */ protected String initiator; @@ -533,7 +533,7 @@ // in graph based processDefinition languages we assume that a // default transition is available TransitionImpl defaultTransition = findDefaultTransition(); - if (defaultTransition!=null) { + if (defaultTransition != null) { take(defaultTransition); } // in block structured processDefinition languages we assume that @@ -543,7 +543,7 @@ ActivityImpl parentActivity = getActivity().getParentActivity(); // if there is a parent activity - if (parentActivity!=null) { + if (parentActivity != null) { // propagate to the parent performAtomicOperation(AtomicOperation.PROPAGATE_TO_PARENT); } @@ -574,7 +574,7 @@ public void fire(String eventName, ObservableElementImpl observableElement, AtomicOperation eventCompletedOperation) { EventImpl event = findEvent(observableElement, eventName); - if (event!=null) { + if (event != null) { setEvent(event); setEventSource(observableElement); setEventListenerIndex(0); @@ -648,7 +648,7 @@ } public void performAtomicOperationSync(AtomicOperation operation) { - if (atomicOperations==null) { + if (atomicOperations == null) { // initialise the fifo queue of atomic operations atomicOperations = new LinkedList<AtomicOperation>(); atomicOperations.offer(operation); @@ -656,7 +656,7 @@ ExecutionContext originalExecutionContext = null; ExecutionContext executionContext = null; EnvironmentImpl environment = EnvironmentImpl.getCurrent(); - if (environment!=null) { + if (environment != null) { originalExecutionContext = (ExecutionContext) environment .getContext(Context.CONTEXTNAME_EXECUTION); if (originalExecutionContext != null @@ -670,7 +670,7 @@ } try { - while (! atomicOperations.isEmpty()) { + while (!atomicOperations.isEmpty()) { AtomicOperation atomicOperation = atomicOperations.poll(); atomicOperation.perform(this); } @@ -678,10 +678,10 @@ finally { atomicOperations = null; - if (executionContext!=null) { + if (executionContext != null) { environment.removeContext(executionContext); } - if (originalExecutionContext!=null) { + if (originalExecutionContext != null) { environment.setContext(originalExecutionContext); } } @@ -1046,7 +1046,7 @@ } subProcessInstance = (ExecutionImpl) processDefinition.createProcessInstance(key); subProcessInstance.setSuperProcessExecution(this); - + return subProcessInstance; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteActivity.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -31,39 +31,34 @@ import org.jbpm.pvm.internal.util.Clock; public class ExecuteActivity extends AtomicOperation { - + private static final long serialVersionUID = 1L; - + private static final Log log = Log.getLog(ExecuteActivity.class.getName()); - + public boolean isAsync(ExecutionImpl execution) { return execution.getActivity().isAsync(); } public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + ActivityImpl activity = execution.getActivity(); - - if (log.isDebugEnabled()) { - if (execution.getName()!=null) { - log.debug(execution.toString()+" executes "+activity); - } else { - log.debug("executing "+activity); - } - } - + ActivityBehaviour activityBehaviour = activity.getActivityBehaviour(); - + try { execution.setPropagation(Propagation.UNSPECIFIED); execution.setHistoryActivityStart(Clock.getTime()); activityBehaviour.execute(execution); - + } catch (Exception e) { - execution.handleException(activity, null, null, e, execution.toString()+" couldn't execute "+activityBehaviour+" for activity "+activity); + execution.handleException(activity, null, null, e, execution.toString() + " couldn't execute " + activityBehaviour + " for activity " + activity); } - - if (execution.getPropagation()==Propagation.UNSPECIFIED) { + + if (execution.getPropagation() == Propagation.UNSPECIFIED) { execution.proceed(); } } @@ -74,7 +69,7 @@ public MessageImpl createAsyncMessage(ExecutionImpl execution) { ExecuteActivityMessage executeActivityMessage = new ExecuteActivityMessage(execution); - if (execution.getActivity().getContinuation()==Continuation.EXCLUSIVE) { + if (execution.getActivity().getContinuation() == Continuation.EXCLUSIVE) { executeActivityMessage.setExclusive(true); } return executeActivityMessage; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -37,23 +37,23 @@ * @author Tom Baeyens */ public class ExecuteEventListener extends AtomicOperation { - + private static final long serialVersionUID = 1L; - + private static Log log = Log.getLog(ExecuteEventListener.class.getName()); - + public boolean isAsync(ExecutionImpl execution) { int eventListenerIndex = execution.getEventListenerIndex(); EventImpl event = execution.getEvent(); - - if ( (eventListenerIndex==0) + + if ( (eventListenerIndex == 0) && (event.isAsync()) ) { return true; } - + List<EventListenerReference> eventListenerReferences = event.getListenerReferences(); - if ( (eventListenerReferences==null) + if ( (eventListenerReferences == null) || (eventListenerReferences.isEmpty()) ) { return false; @@ -64,11 +64,14 @@ } public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + EventImpl event = execution.getEvent(); ObservableElementImpl observableElement = event.getObservableElement(); int eventListenerIndex = execution.getEventListenerIndex(); List<EventListenerReference> eventListenerReferences = event.getListenerReferences(); - if ( (eventListenerReferences!=null) + if ( (eventListenerReferences != null) && (!eventListenerReferences.isEmpty()) ) { EventListenerReference eventListenerReference = eventListenerReferences.get(eventListenerIndex); @@ -103,7 +106,7 @@ // find the next event with listeners EventImpl propagatedEvent = ExecutionImpl.findEvent(parent, event.getName()); - // if there is an propagated event with listeners + // if there is an propagated event with listeners if (propagatedEvent != null) { // propagate to the that event execution.setEvent(propagatedEvent); @@ -111,7 +114,7 @@ execution.performAtomicOperation(AtomicOperation.EXECUTE_EVENT_LISTENER); } else { - // event is completed, perform the eventCompletedOperation + // event is completed, perform the eventCompletedOperation AtomicOperation eventCompletedOperation = execution.getEventCompletedOperation(); execution.setEvent(null); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToChildActivity.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; +import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ActivityImpl; @@ -29,9 +30,11 @@ * @author Tom Baeyens */ public class MoveToChildActivity extends AtomicOperation { - + private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(MoveToChildActivity.class.getName()); + private ActivityImpl activity; public MoveToChildActivity(ActivityImpl activity) { @@ -39,6 +42,10 @@ } public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + log.debug("activity " + activity); + execution.setActivity(activity); ExecutionImpl propagatingExecution = execution.startActivity(activity); propagatingExecution.performAtomicOperation(AtomicOperation.EXECUTE_ACTIVITY); @@ -51,4 +58,8 @@ public MessageImpl createAsyncMessage(ExecutionImpl execution) { return null; } + + public String toString() { + return "MoveToChildActivity"; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.model.op; +import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ActivityImpl; @@ -32,11 +33,18 @@ private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(MoveToParentActivity.class.getName()); + public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + log.debug("activity " + execution.getActivity() + ", parent activity : " + execution.getActivity().getParentActivity()); + ActivityImpl activity = execution.getActivity(); ActivityImpl parentActivity = activity.getParentActivity(); + ExecutionImpl propagatingExecution = execution.endActivity(activity); - + propagatingExecution.setActivity(parentActivity); propagatingExecution.performAtomicOperation(new Signal(null, null)); } @@ -48,7 +56,7 @@ public boolean isAsync(ExecutionImpl execution) { return false; } - + public String toString() { return "MoveToParentActivity"; } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -55,13 +55,10 @@ @Override public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + ActivityImpl activity = execution.getActivity(); - if (execution.getName() != null) { - log.debug(execution.toString() + " signals " + activity); - } - else { - log.debug("signalling " + activity + ", signalName=" + signalName); - } ExternalActivityBehaviour activityBehaviour = (ExternalActivityBehaviour) activity .getActivityBehaviour(); @@ -80,7 +77,7 @@ execution.proceed(); } } - + @Override public String toString() { return "Signal(" + signalName + ')'; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionEndActivity.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.model.op; import org.jbpm.api.model.Event; +import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; @@ -33,13 +34,18 @@ private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(TransitionEndActivity.class.getName()); + public boolean isAsync(ExecutionImpl execution) { return false; } public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + ActivityImpl activity = execution.getActivity(); - + ExecutionImpl propagatingExecution = execution; if (activity.isLocalScope()) { propagatingExecution = execution.destroyScope(activity); @@ -47,7 +53,7 @@ ActivityImpl parentActivity = activity.getParentActivity(); ActivityImpl destination = execution.getTransition().getDestination(); - if ( (parentActivity!=null) + if ( (parentActivity != null) && (!parentActivity.contains(destination)) ) { propagatingExecution.setActivity(parentActivity); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionStartActivity.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -23,6 +23,7 @@ import org.jbpm.api.JbpmException; import org.jbpm.api.model.Event; +import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; @@ -32,48 +33,53 @@ * @author Tom Baeyens */ public class TransitionStartActivity extends AtomicOperation { - + private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(TransitionStartActivity.class.getName()); + public boolean isAsync(ExecutionImpl execution) { return false; } public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + TransitionImpl transition = execution.getTransition(); ActivityImpl source = transition.getSource(); ActivityImpl destination = transition.getDestination(); - + ActivityImpl activity = execution.getActivity(); - if (activity==null) { + if (activity == null) { // find outer most activity to start activity = destination; - while ( (activity.getParentActivity()!=null) + while ( (activity.getParentActivity() != null) && (!activity.getParentActivity().contains(source)) ) { activity = activity.getParentActivity(); } - - } else if (activity==destination){ + + } else if (activity == destination){ activity = null; } else { ActivityImpl parent = activity; activity = destination; - while ( (activity!=null) - && (activity.getParent()!=parent) + while ( (activity != null) + && (activity.getParent() != parent) ) { activity = activity.getParentActivity(); } - if (activity==null) { + if (activity == null) { throw new JbpmException("implementation bug: couldn't find parent "+parent+" around destination "+destination); } } - if (activity==null) { + if (activity == null) { execution.setTransition(null); execution.performAtomicOperation(AtomicOperation.EXECUTE_ACTIVITY); - + } else { execution.setActivity(activity); @@ -85,7 +91,7 @@ propagatingExecution.fire(Event.START, activity, AtomicOperation.TRANSITION_START_ACTIVITY); } } - + public MessageImpl createAsyncMessage(ExecutionImpl execution) { throw new UnsupportedOperationException("please implement me"); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java 2010-11-14 17:01:38 UTC (rev 6824) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/TransitionTake.java 2010-11-16 06:16:57 UTC (rev 6825) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.model.op; import org.jbpm.api.model.Event; +import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.TransitionImpl; @@ -34,12 +35,18 @@ private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(TransitionTake.class.getName()); + public boolean isAsync(ExecutionImpl execution) { return false; } public void perform(ExecutionImpl execution) { + + log.debug("execution : " + execution + ", activity : " + execution.getActivity() + ", transition : " + execution.getTransition()); + TransitionImpl transition = execution.getTransition(); + execution.setActivity(null); execution.fire(Event.TAKE, transition, AtomicOperation.TRANSITION_START_ACTIVITY); }

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6824 - in jbpm4/trunk/modules: bpmn/src/main/java/org/jbpm/bpmn/parser and 4 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-14 12:01:38 -0500 (Sun, 14 Nov 2010) New Revision: 6824 Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundarySignalEvent.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_interrupting.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_none_interrupting.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java Log: JBPM-2724 signal end event Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundarySignalEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundarySignalEvent.java (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundarySignalEvent.java 2010-11-14 17:01:38 UTC (rev 6824) @@ -0,0 +1,88 @@ +/* + * 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.bpmn.flownodes; + +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.api.Execution; +import org.jbpm.api.listener.EventListener; +import org.jbpm.api.listener.EventListenerExecution; +import org.jbpm.api.model.Transition; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.op.AtomicOperation; + +/** + * boundary escalation event. + * + * @author Huisheng Xu + */ +public class BoundarySignalEvent extends BpmnActivity implements EventListener, BpmnEvent { + + protected String boundarySignalEventActivityName; + protected boolean interrupting; + + @SuppressWarnings("unchecked") + public void execute(ExecutionImpl execution) { + if (interrupting) { + ExecutionImpl parent = execution.destroyScope(execution.getActivity()); + this.executeBoundaryEventBranch(parent); + } else { + ExecutionImpl parent = execution.getParent(); + ExecutionImpl childExecution = parent.createExecution(); + childExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); + this.executeBoundaryEventBranch(childExecution); + if (execution.getState() != Execution.STATE_INACTIVE_CONCURRENT_ROOT) { + this.proceed(execution, this.findOutgoingSequenceFlow(execution, true)); + } else { + ExecutionImpl noneInterruptingExecution = parent.createExecution(); + this.proceed(noneInterruptingExecution, this.findOutgoingSequenceFlow(noneInterruptingExecution, true)); + } + } + } + + protected void executeBoundaryEventBranch(ExecutionImpl execution) { + ProcessDefinitionImpl processDefinitionImpl = execution.getProcessDefinition(); + ActivityImpl activityImpl = processDefinitionImpl.getActivity(boundarySignalEventActivityName); + execution.moveTo(activityImpl); + execution.take(activityImpl.getOutgoingTransitions().get(0)); + } + + public void notify(EventListenerExecution execution) { + this.execute((ExecutionImpl) execution); + } + + public void setBoundarySignalEventActivityName(String boundarySignalEventActivityName) { + this.boundarySignalEventActivityName = boundarySignalEventActivityName; + } + + public boolean isInterrupting() { + return interrupting; + } + + public void setInterrupting(boolean interrupting) { + this.interrupting = interrupting; + } + +} Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-14 16:38:29 UTC (rev 6823) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-14 17:01:38 UTC (rev 6824) @@ -50,6 +50,8 @@ protected String escalationCode = null; + protected String signalCode = null; + public void execute(ActivityExecution execution) { execute((ExecutionImpl)execution); } @@ -76,6 +78,8 @@ parent.fire(errorCode, (ActivityImpl) activity.getParentActivity()); } else if (parent != null && escalationCode != null) { parent.fire(escalationCode, (ActivityImpl) activity.getParentActivity()); + } else if (parent != null && signalCode != null) { + parent.fire(signalCode, (ActivityImpl) activity.getParentActivity()); } else { execution.signal(); } @@ -105,6 +109,10 @@ parent.fire(escalationCode, (ActivityImpl) activity.getParentActivity()); } + if (parent != null && signalCode != null) { + parent.fire(signalCode, (ActivityImpl) activity.getParentActivity()); + } + // Special case: if during concurrent execution all child executions are ended, // then the parent execution must be ended too. if (parent != null && parent.getExecutions().isEmpty() @@ -130,4 +138,8 @@ public void setEscalationCode(String escalationCode) { this.escalationCode = escalationCode; } + + public void setSignalCode(String signalCode) { + this.signalCode = signalCode; + } } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java 2010-11-14 16:38:29 UTC (rev 6823) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java 2010-11-14 17:01:38 UTC (rev 6824) @@ -61,6 +61,11 @@ endActivity.setEscalationCode(XmlUtil.attribute(escalationEventDefinition, "escalationRef")); } + Element signalEventDefinition = XmlUtil.element(element, "signalEventDefinition"); + if (signalEventDefinition != null) { + endActivity.setSignalCode(XmlUtil.attribute(signalEventDefinition, "signalRef")); + } + return endActivity; } 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 2010-11-14 16:38:29 UTC (rev 6823) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-14 17:01:38 UTC (rev 6824) @@ -41,6 +41,7 @@ import org.jbpm.bpmn.flownodes.BpmnActivity; import org.jbpm.bpmn.flownodes.BoundaryEscalationEvent; import org.jbpm.bpmn.flownodes.BoundaryErrorEvent; +import org.jbpm.bpmn.flownodes.BoundarySignalEvent; import org.jbpm.bpmn.flownodes.BoundaryTimerEvent; import org.jbpm.bpmn.model.BpmnProcessDefinition; import org.jbpm.bpmn.model.SequenceflowCondition; @@ -279,12 +280,15 @@ Element timerEventDefinition = XmlUtil.element(boundaryEventElement, "timerEventDefinition"); Element errorEventDefinition = XmlUtil.element(boundaryEventElement, "errorEventDefinition"); Element escalationEventDefinition = XmlUtil.element(boundaryEventElement, "escalationEventDefinition"); + Element signalEventDefinition = XmlUtil.element(boundaryEventElement, "signalEventDefinition"); if (timerEventDefinition != null) { this.parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity, refActivity, parse); } else if (errorEventDefinition != null) { this.parseBoundaryErrorEventDefinition(errorEventDefinition, nestedActivity, refActivity, parse); } else if (escalationEventDefinition != null) { this.parseBoundaryEscalationEventDefinition(escalationEventDefinition, interrupting, nestedActivity, refActivity, parse); + } else if (signalEventDefinition != null) { + this.parseBoundarySignalEventDefinition(signalEventDefinition, interrupting, nestedActivity, refActivity, parse); } else { parse.addProblem("Unsupported boundary event type : " + boundaryEventElement); } @@ -341,6 +345,27 @@ escalationActivity.setActivityBehaviour(boundaryEscalationEvent); } + public void parseBoundarySignalEventDefinition(Element signalEventDefinition, + boolean interrupting, + ActivityImpl signalActivity, + ActivityImpl refActivity, + Parse parse) { + + BoundarySignalEvent boundarySignalEvent = new BoundarySignalEvent(); + boundarySignalEvent.setInterrupting(interrupting); + boundarySignalEvent.setBoundarySignalEventActivityName(signalActivity.getName()); + + String eventName = XmlUtil.attribute(signalEventDefinition, "signalRef"); + + EventImpl event = refActivity.getEvent(eventName); + if (event == null) { + event = refActivity.createEvent(eventName); + } + EventListenerReference eventListenerReference = event.createEventListenerReference(boundarySignalEvent); + + signalActivity.setActivityBehaviour(boundarySignalEvent); + } + public void parseBoundaryErrorEventDefinition(Element errorEventDefinition, ActivityImpl errorActivity, ActivityImpl refActivity, Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/signal/BoundarySignalEventTest.java 2010-11-14 17:01:38 UTC (rev 6824) @@ -0,0 +1,59 @@ +/* + * 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.examples.bpmn.event.error; + +import org.jbpm.api.NewDeployment; +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.history.HistoryProcessInstance; +import org.jbpm.test.JbpmTestCase; + +/** + * + * @author Huisheng Xu + */ +public class BoundarySignalEventTest extends JbpmTestCase { + + public void testInterruptingSignalBoundaryEvent() { + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/signal/boundary_signal_event_interrupting.bpmn.xml"); + registerDeployment(deployment.deploy()); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_signal_event"); + assertProcessInstanceEnded(processInstance); + + HistoryProcessInstance hip = historyService.createHistoryProcessInstanceQuery().uniqueResult(); + assertNotNull(hip); + } + + public void testNoneInterruptingSignalBoundaryEvent() { + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/signal/boundary_signal_event_none_interrupting.bpmn.xml"); + registerDeployment(deployment.deploy()); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_signal_event"); + // assertProcessInstanceEnded(processInstance); + + HistoryProcessInstance hip = historyService.createHistoryProcessInstanceQuery().uniqueResult(); + assertNotNull(hip); + } + +} Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_interrupting.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_interrupting.bpmn.xml 2010-11-14 17:01:38 UTC (rev 6824) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_signal_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <signal id="MySignal" signalCode="MySignal" /> + + <process id="boundary_signal_event" name="Signal Boundary Event Process"> + <startEvent id="startEvent" name="StartProcess"/> + <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> + <subProcess id="subProcess" name="Hello" > + <startEvent id="sub-start" name="StartSubProcess"/> + <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> + <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> + <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> + <endEvent id="sub-error" name="SignalEvent"> + <signalEventDefinition signalRef="MySignal"/> + </endEvent> + <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> + <userTask id="sub-task" name="Task" /> + <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> + <endEvent id="sub-end" name="EndEvent"/> + </subProcess> + <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> + <endEvent id="terminateEnd" name="EndProcess"> + <terminateEventDefinition/> + </endEvent> + <boundaryEvent id="signalEvent" name="SignalEvent" attachedToRef="subProcess" > + <signalEventDefinition signalRef="MySignal" /> + </boundaryEvent> + <sequenceFlow id="flow7" sourceRef="signalEvent" targetRef="task"/> + <scriptTask id="task" name="Goodbye"> + <script>System.out.println("Escalation handled");</script> + </scriptTask> + <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> + <endEvent id="endEvent" name="EndProcess"/> + </process> +</definitions> Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_none_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_none_interrupting.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/signal/boundary_signal_event_none_interrupting.bpmn.xml 2010-11-14 17:01:38 UTC (rev 6824) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_signal_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <signal id="MySignal" signalCode="MySignal" /> + + <process id="boundary_signal_event" name="Signal Boundary Event Process"> + <startEvent id="startEvent" name="StartProcess"/> + <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> + <subProcess id="subProcess" name="Hello" > + <startEvent id="sub-start" name="StartSubProcess"/> + <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> + <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> + <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> + <endEvent id="sub-error" name="SignalEvent"> + <signalEventDefinition signalRef="MySignal"/> + </endEvent> + <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> + <userTask id="sub-task" name="Task" /> + <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> + <endEvent id="sub-end" name="EndEvent"/> + </subProcess> + <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> + <endEvent id="terminateEnd" name="EndProcess"> + <terminateEventDefinition/> + </endEvent> + <boundaryEvent id="signalEvent" name="SignalEvent" attachedToRef="subProcess" cancelActivity="false"> + <signalEventDefinition signalRef="MySignal" /> + </boundaryEvent> + <sequenceFlow id="flow7" sourceRef="signalEvent" targetRef="task"/> + <scriptTask id="task" name="Goodbye"> + <script>System.out.println("Escalation handled");</script> + </scriptTask> + <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> + <endEvent id="endEvent" name="EndProcess"/> + </process> +</definitions>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6823 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/bpmn/event/escalation and 1 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-14 11:38:29 -0500 (Sun, 14 Nov 2010) New Revision: 6823 Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_interrupting.bpmn.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_none_interrupting.bpmn.xml Removed: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java Log: JBPM-2733 none interrupting escalation boundary event Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java 2010-11-14 16:11:03 UTC (rev 6822) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java 2010-11-14 16:38:29 UTC (rev 6823) @@ -53,7 +53,12 @@ ExecutionImpl childExecution = parent.createExecution(); childExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); this.executeBoundaryEventBranch(childExecution); - this.proceed(execution, this.findOutgoingSequenceFlow(execution, true)); + if (execution.getState() != Execution.STATE_INACTIVE_CONCURRENT_ROOT) { + this.proceed(execution, this.findOutgoingSequenceFlow(execution, true)); + } else { + ExecutionImpl noneInterruptingExecution = parent.createExecution(); + this.proceed(noneInterruptingExecution, this.findOutgoingSequenceFlow(noneInterruptingExecution, true)); + } } } 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 2010-11-14 16:11:03 UTC (rev 6822) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BpmnActivity.java 2010-11-14 16:38:29 UTC (rev 6823) @@ -22,6 +22,7 @@ package org.jbpm.bpmn.flownodes; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,7 +41,7 @@ /** * Basic activity for BPMN activities (tasks, gateways) - * + * * @author bernd.ruecker(a)camunda.com * @author Ronald van Kuijk (kukeltje) * @author Joram Barrez @@ -53,15 +54,15 @@ protected static final boolean CONDITIONS_CHECKED = true; protected static final boolean CONDITIONS_IGNORED = !CONDITIONS_CHECKED; - + protected String default_; protected List<ActivityResource> activityResources = new ArrayList<ActivityResource>(); - + public void execute(ActivityExecution execution) throws Exception { execute((ExecutionImpl) execution); } - + public abstract void execute(ExecutionImpl executionImpl); /** @@ -69,9 +70,9 @@ * Code initially based on the JPDL fork logic. */ protected void proceed(ExecutionImpl execution, List<Transition> transitions) { - if (LOG.isDebugEnabled()) { - LOG.debug("Proceeding from execution in " + execution.getActivityName()); - } + if (LOG.isDebugEnabled()) { + LOG.debug("Proceeding from execution in " + execution.getActivityName()); + } Activity activity = execution.getActivity(); @@ -106,7 +107,7 @@ concurrentExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); childExecutionsMap.put(transition, concurrentExecution); } - + // For a correct functionality, the child executions must all exist before the actual transitions are taken. // So we start following the outgoing transitions after child execution creation. for (Transition transition : childExecutionsMap.keySet()) { @@ -125,22 +126,25 @@ */ protected List<Transition> findOutgoingSequenceFlow(ExecutionImpl execution, boolean checkConditions) { ActivityImpl activity = execution.getActivity(); + if (activity == null) { + return Collections.EMPTY_LIST; + } // evaluate the conditions and find the transitions that should be forked List<Transition> forkingTransitions = new ArrayList<Transition>(); List<TransitionImpl> outgoingTransitions = (List) activity.getOutgoingTransitions(); - + for (TransitionImpl transition : outgoingTransitions) { Condition condition = transition.getCondition(); - if ( ( (condition == null) || (!checkConditions) || (condition.evaluate(execution)) ) + if ( ( (condition == null) || (!checkConditions) || (condition.evaluate(execution)) ) && (activity.getDefaultOutgoingTransition() != transition) ) { forkingTransitions.add(transition); } } - + if (LOG.isDebugEnabled()) { - LOG.debug(forkingTransitions.size() + " out of " + outgoingTransitions.size() + " selected for " + activity.getName()); + LOG.debug(forkingTransitions.size() + " out of " + outgoingTransitions.size() + " selected for " + activity.getName()); } - + // If no outgoing sequence flow found, check if there is a default sequence flow if (forkingTransitions.isEmpty() && isDefaultEnabled()) { Transition defaultSeqFlow = execution.getActivity().getDefaultOutgoingTransition(); @@ -150,29 +154,29 @@ LOG.debug("Selected default sequence flow for " + execution.getActivityName()); } } else { - throw new JbpmException("No sequence flow condition evaluated to true for " + + throw new JbpmException("No sequence flow condition evaluated to true for " + execution.getActivityName() + " and no default sequenceFlow was speficied"); } } else if (forkingTransitions.isEmpty()){ throw new JbpmException("No outgoing sequence flow found for " + execution.getActivityName()); } - + return forkingTransitions; } public void addActivityResource(ActivityResource activityResource) { this.activityResources.add(activityResource); } - + /** * Most of the BPMN activities allow to specify a default outgoing sequence * flow. Subclasses must override this method when the default definition does * not make sense (eg. ParallelGateway) */ public boolean isDefaultEnabled() { - return true; + return true; } - + public String getDefault() { return default_; } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java 2010-11-14 16:11:03 UTC (rev 6822) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java 2010-11-14 16:38:29 UTC (rev 6823) @@ -32,15 +32,11 @@ */ public class BoundaryEscalationEventTest extends JbpmTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); + public void testInterruptingEscalationBoundaryEvent() { NewDeployment deployment = repositoryService.createDeployment(); - deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml"); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_interrupting.bpmn.xml"); registerDeployment(deployment.deploy()); - } - public void testProcessStartToEnd() { ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_escalation_event"); assertProcessInstanceEnded(processInstance); @@ -48,4 +44,16 @@ assertNotNull(hip); } + public void testNoneInterruptingEscalationBoundaryEvent() { + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_none_interrupting.bpmn.xml"); + registerDeployment(deployment.deploy()); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_escalation_event"); + // assertProcessInstanceEnded(processInstance); + + HistoryProcessInstance hip = historyService.createHistoryProcessInstanceQuery().uniqueResult(); + assertNotNull(hip); + } + } Deleted: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml 2010-11-14 16:11:03 UTC (rev 6822) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml 2010-11-14 16:38:29 UTC (rev 6823) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" - xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" - typeLanguage="http://www.w3.org/2001/XMLSchema" - expressionLanguage="http://www.w3.org/1999/XPath" - targetNamespace="http://jbpm.org/example/bpmn2/boundary_escalation_event" - xmlns:jbpm="http://jbpm.org/bpmn2"> - - <escalation id="MyEscalation" escalationCode="MyEscalation" /> - - <process id="boundary_escalation_event" name="Error Boundary Escalation Process"> - <startEvent id="startEvent" name="StartProcess"/> - <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> - <subProcess id="subProcess" name="Hello" > - <startEvent id="sub-start" name="StartSubProcess"/> - <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> - <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> - <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> - <endEvent id="sub-error" name="EscalationEvent"> - <escalationEventDefinition escalationRef="MyEscalation"/> - </endEvent> - <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> - <userTask id="sub-task" name="Task" /> - <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> - <endEvent id="sub-end" name="EndEvent"/> - </subProcess> - <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> - <endEvent id="terminateEnd" name="EndProcess"> - <terminateEventDefinition/> - </endEvent> - <boundaryEvent id="escalationEvent" name="EscalationEvent" attachedToRef="subProcess" > - <escalationEventDefinition escalationRef="MyEscalation" /> - </boundaryEvent> - <sequenceFlow id="flow7" sourceRef="escalationEvent" targetRef="task"/> - <scriptTask id="task" name="Goodbye"> - <script>System.out.println("Escalation handled");</script> - </scriptTask> - <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> - <endEvent id="endEvent" name="EndProcess"/> - </process> -</definitions> Copied: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_interrupting.bpmn.xml (from rev 6821, jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml) =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_interrupting.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_interrupting.bpmn.xml 2010-11-14 16:38:29 UTC (rev 6823) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_escalation_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <escalation id="MyEscalation" escalationCode="MyEscalation" /> + + <process id="boundary_escalation_event" name="Escalation Boundary Event Process"> + <startEvent id="startEvent" name="StartProcess"/> + <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> + <subProcess id="subProcess" name="Hello" > + <startEvent id="sub-start" name="StartSubProcess"/> + <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> + <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> + <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> + <endEvent id="sub-error" name="EscalationEvent"> + <escalationEventDefinition escalationRef="MyEscalation"/> + </endEvent> + <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> + <userTask id="sub-task" name="Task" /> + <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> + <endEvent id="sub-end" name="EndEvent"/> + </subProcess> + <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> + <endEvent id="terminateEnd" name="EndProcess"> + <terminateEventDefinition/> + </endEvent> + <boundaryEvent id="escalationEvent" name="EscalationEvent" attachedToRef="subProcess" > + <escalationEventDefinition escalationRef="MyEscalation" /> + </boundaryEvent> + <sequenceFlow id="flow7" sourceRef="escalationEvent" targetRef="task"/> + <scriptTask id="task" name="Goodbye"> + <script>System.out.println("Escalation handled");</script> + </scriptTask> + <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> + <endEvent id="endEvent" name="EndProcess"/> + </process> +</definitions> Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_none_interrupting.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_none_interrupting.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event_none_interrupting.bpmn.xml 2010-11-14 16:38:29 UTC (rev 6823) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_escalation_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <escalation id="MyEscalation" escalationCode="MyEscalation" /> + + <process id="boundary_escalation_event" name="Escalation Boundary Event Process"> + <startEvent id="startEvent" name="StartProcess"/> + <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> + <subProcess id="subProcess" name="Hello" > + <startEvent id="sub-start" name="StartSubProcess"/> + <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> + <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> + <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> + <endEvent id="sub-error" name="EscalationEvent"> + <escalationEventDefinition escalationRef="MyEscalation"/> + </endEvent> + <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> + <userTask id="sub-task" name="Task" /> + <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> + <endEvent id="sub-end" name="EndEvent"/> + </subProcess> + <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> + <endEvent id="terminateEnd" name="EndProcess"> + <terminateEventDefinition/> + </endEvent> + <boundaryEvent id="escalationEvent" name="EscalationEvent" attachedToRef="subProcess" cancelActivity="false"> + <escalationEventDefinition escalationRef="MyEscalation" /> + </boundaryEvent> + <sequenceFlow id="flow7" sourceRef="escalationEvent" targetRef="task"/> + <scriptTask id="task" name="Goodbye"> + <script>System.out.println("Escalation handled");</script> + </scriptTask> + <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> + <endEvent id="endEvent" name="EndProcess"/> + </process> +</definitions>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6822 - jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-14 11:11:03 -0500 (Sun, 14 Nov 2010) New Revision: 6822 Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java Log: JBPM-2726 escalation end event Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-14 16:09:15 UTC (rev 6821) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndActivity.java 2010-11-14 16:11:03 UTC (rev 6822) @@ -48,6 +48,8 @@ protected String errorCode = null; + protected String escalationCode = null; + public void execute(ActivityExecution execution) { execute((ExecutionImpl)execution); } @@ -72,6 +74,8 @@ ExecutionImpl parent = (ExecutionImpl) execution.getParent(); // save parent before it is nullified if (parent != null && errorCode != null) { parent.fire(errorCode, (ActivityImpl) activity.getParentActivity()); + } else if (parent != null && escalationCode != null) { + parent.fire(escalationCode, (ActivityImpl) activity.getParentActivity()); } else { execution.signal(); } @@ -97,6 +101,10 @@ parent.fire(errorCode, (ActivityImpl) activity.getParentActivity()); } + if (parent != null && escalationCode != null) { + parent.fire(escalationCode, (ActivityImpl) activity.getParentActivity()); + } + // Special case: if during concurrent execution all child executions are ended, // then the parent execution must be ended too. if (parent != null && parent.getExecutions().isEmpty() @@ -118,4 +126,8 @@ public void setErrorCode(String errorCode) { this.errorCode = errorCode; } + + public void setEscalationCode(String escalationCode) { + this.escalationCode = escalationCode; + } } Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java 2010-11-14 16:09:15 UTC (rev 6821) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/EndEventBinding.java 2010-11-14 16:11:03 UTC (rev 6822) @@ -56,6 +56,11 @@ endActivity.setErrorCode(XmlUtil.attribute(errorEventDefinition, "errorRef")); } + Element escalationEventDefinition = XmlUtil.element(element, "escalationEventDefinition"); + if (escalationEventDefinition != null) { + endActivity.setEscalationCode(XmlUtil.attribute(escalationEventDefinition, "escalationRef")); + } + return endActivity; }

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6821 - in jbpm4/trunk/modules: bpmn/src/main/java/org/jbpm/bpmn/parser and 4 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-11-14 11:09:15 -0500 (Sun, 14 Nov 2010) New Revision: 6821 Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java Log: JBPM-2732 interrupting boundary escalation event Added: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java (rev 0) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryEscalationEvent.java 2010-11-14 16:09:15 UTC (rev 6821) @@ -0,0 +1,83 @@ +/* + * 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.bpmn.flownodes; + +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.api.Execution; +import org.jbpm.api.listener.EventListener; +import org.jbpm.api.listener.EventListenerExecution; +import org.jbpm.api.model.Transition; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.op.AtomicOperation; + +/** + * boundary escalation event. + * + * @author Huisheng Xu + */ +public class BoundaryEscalationEvent extends BpmnActivity implements EventListener, BpmnEvent { + + protected String boundaryEscalationEventActivityName; + protected boolean interrupting; + + @SuppressWarnings("unchecked") + public void execute(ExecutionImpl execution) { + if (interrupting) { + ExecutionImpl parent = execution.destroyScope(execution.getActivity()); + this.executeBoundaryEventBranch(parent); + } else { + ExecutionImpl parent = execution.getParent(); + ExecutionImpl childExecution = parent.createExecution(); + childExecution.setState(Execution.STATE_ACTIVE_CONCURRENT); + this.executeBoundaryEventBranch(childExecution); + this.proceed(execution, this.findOutgoingSequenceFlow(execution, true)); + } + } + + protected void executeBoundaryEventBranch(ExecutionImpl execution) { + ProcessDefinitionImpl processDefinitionImpl = execution.getProcessDefinition(); + ActivityImpl activityImpl = processDefinitionImpl.getActivity(boundaryEscalationEventActivityName); + execution.moveTo(activityImpl); + execution.take(activityImpl.getOutgoingTransitions().get(0)); + } + + public void notify(EventListenerExecution execution) { + this.execute((ExecutionImpl) execution); + } + + public void setBoundaryEscalationEventActivityName(String boundaryEscalationEventActivityName) { + this.boundaryEscalationEventActivityName = boundaryEscalationEventActivityName; + } + + public boolean isInterrupting() { + return interrupting; + } + + public void setInterrupting(boolean interrupting) { + this.interrupting = interrupting; + } + +} Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java =================================================================== --- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java 2010-11-12 22:32:13 UTC (rev 6820) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/flownodes/BoundaryTimerEvent.java 2010-11-14 16:09:15 UTC (rev 6821) @@ -68,6 +68,10 @@ this.execute((ExecutionImpl) execution); } + public void setBoundaryTimerEventActivityName(String boundaryTimerEventActivityName) { + this.boundaryTimerEventActivityName = boundaryTimerEventActivityName; + } + public boolean isInterrupting() { return interrupting; } @@ -76,8 +80,4 @@ this.interrupting = interrupting; } - public void setBoundaryTimerEventActivityName(String boundaryTimerEventActivityName) { - this.boundaryTimerEventActivityName = boundaryTimerEventActivityName; - } - } 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 2010-11-12 22:32:13 UTC (rev 6820) +++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2010-11-14 16:09:15 UTC (rev 6821) @@ -39,6 +39,7 @@ import org.jbpm.bpmn.common.Resource; import org.jbpm.bpmn.common.ResourceParameter; import org.jbpm.bpmn.flownodes.BpmnActivity; +import org.jbpm.bpmn.flownodes.BoundaryEscalationEvent; import org.jbpm.bpmn.flownodes.BoundaryErrorEvent; import org.jbpm.bpmn.flownodes.BoundaryTimerEvent; import org.jbpm.bpmn.model.BpmnProcessDefinition; @@ -277,10 +278,13 @@ Element timerEventDefinition = XmlUtil.element(boundaryEventElement, "timerEventDefinition"); Element errorEventDefinition = XmlUtil.element(boundaryEventElement, "errorEventDefinition"); + Element escalationEventDefinition = XmlUtil.element(boundaryEventElement, "escalationEventDefinition"); if (timerEventDefinition != null) { this.parseBoundaryTimerEventDefinition(timerEventDefinition, interrupting, nestedActivity, refActivity, parse); } else if (errorEventDefinition != null) { this.parseBoundaryErrorEventDefinition(errorEventDefinition, nestedActivity, refActivity, parse); + } else if (escalationEventDefinition != null) { + this.parseBoundaryEscalationEventDefinition(escalationEventDefinition, interrupting, nestedActivity, refActivity, parse); } else { parse.addProblem("Unsupported boundary event type : " + boundaryEventElement); } @@ -316,6 +320,27 @@ timerActivity.setActivityBehaviour(boundaryTimerEvent); } + public void parseBoundaryEscalationEventDefinition(Element escalationEventDefinition, + boolean interrupting, + ActivityImpl escalationActivity, + ActivityImpl refActivity, + Parse parse) { + + BoundaryEscalationEvent boundaryEscalationEvent = new BoundaryEscalationEvent(); + boundaryEscalationEvent.setInterrupting(interrupting); + boundaryEscalationEvent.setBoundaryEscalationEventActivityName(escalationActivity.getName()); + + String eventName = XmlUtil.attribute(escalationEventDefinition, "escalationRef"); + + EventImpl event = refActivity.getEvent(eventName); + if (event == null) { + event = refActivity.createEvent(eventName); + } + EventListenerReference eventListenerReference = event.createEventListenerReference(boundaryEscalationEvent); + + escalationActivity.setActivityBehaviour(boundaryEscalationEvent); + } + public void parseBoundaryErrorEventDefinition(Element errorEventDefinition, ActivityImpl errorActivity, ActivityImpl refActivity, Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/event/escalation/BoundaryEscalationEventTest.java 2010-11-14 16:09:15 UTC (rev 6821) @@ -0,0 +1,51 @@ +/* + * 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.examples.bpmn.event.error; + +import org.jbpm.api.NewDeployment; +import org.jbpm.api.ProcessInstance; +import org.jbpm.api.history.HistoryProcessInstance; +import org.jbpm.test.JbpmTestCase; + +/** + * + * @author Huisheng Xu + */ +public class BoundaryEscalationEventTest extends JbpmTestCase { + + @Override + protected void setUp() throws Exception { + super.setUp(); + NewDeployment deployment = repositoryService.createDeployment(); + deployment.addResourceFromClasspath("org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml"); + registerDeployment(deployment.deploy()); + } + + public void testProcessStartToEnd() { + ProcessInstance processInstance = executionService.startProcessInstanceByKey("boundary_escalation_event"); + assertProcessInstanceEnded(processInstance); + + HistoryProcessInstance hip = historyService.createHistoryProcessInstanceQuery().uniqueResult(); + assertNotNull(hip); + } + +} Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/event/escalation/boundary_escalation_event.bpmn.xml 2010-11-14 16:09:15 UTC (rev 6821) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" + typeLanguage="http://www.w3.org/2001/XMLSchema" + expressionLanguage="http://www.w3.org/1999/XPath" + targetNamespace="http://jbpm.org/example/bpmn2/boundary_escalation_event" + xmlns:jbpm="http://jbpm.org/bpmn2"> + + <escalation id="MyEscalation" escalationCode="MyEscalation" /> + + <process id="boundary_escalation_event" name="Error Boundary Escalation Process"> + <startEvent id="startEvent" name="StartProcess"/> + <sequenceFlow id="flow1" sourceRef="startEvent" targetRef="subProcess"/> + <subProcess id="subProcess" name="Hello" > + <startEvent id="sub-start" name="StartSubProcess"/> + <sequenceFlow id="flow2" sourceRef="sub-start" targetRef="sub-parallel"/> + <parallelGateway id="sub-parallel" gatewayDirection="Diverging"/> + <sequenceFlow id="flow3" sourceRef="sub-parallel" targetRef="sub-error"/> + <endEvent id="sub-error" name="EscalationEvent"> + <escalationEventDefinition escalationRef="MyEscalation"/> + </endEvent> + <sequenceFlow id="flow4" sourceRef="sub-parallel" targetRef="sub-task"/> + <userTask id="sub-task" name="Task" /> + <sequenceFlow id="flow5" sourceRef="sub-task" targetRef="sub-end"/> + <endEvent id="sub-end" name="EndEvent"/> + </subProcess> + <sequenceFlow id="flow6" sourceRef="subProcess" targetRef="terminateEnd"/> + <endEvent id="terminateEnd" name="EndProcess"> + <terminateEventDefinition/> + </endEvent> + <boundaryEvent id="escalationEvent" name="EscalationEvent" attachedToRef="subProcess" > + <escalationEventDefinition escalationRef="MyEscalation" /> + </boundaryEvent> + <sequenceFlow id="flow7" sourceRef="escalationEvent" targetRef="task"/> + <scriptTask id="task" name="Goodbye"> + <script>System.out.println("Escalation handled");</script> + </scriptTask> + <sequenceFlow id="flow8" sourceRef="task" targetRef="endEvent"/> + <endEvent id="endEvent" name="EndProcess"/> + </process> +</definitions>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6820 - in jbpm3/branches/jbpm-3.2-soa: ci and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-11-12 17:32:13 -0500 (Fri, 12 Nov 2010) New Revision: 6820 Added: jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml Removed: jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml jbpm3/branches/jbpm-3.2-soa/profiles.example.xml Modified: jbpm3/branches/jbpm-3.2-soa/ jbpm3/branches/jbpm-3.2-soa/ci/container.sh jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh Log: JBPM-2979 migrate continuous integration builds from profiles to settings file Property changes on: jbpm3/branches/jbpm-3.2-soa ___________________________________________________________________ Name: svn:ignore - target .settings clipboard.txt profiles.xml + target .settings settings.xml Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-11-12 12:48:12 UTC (rev 6819) +++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-11-12 22:32:13 UTC (rev 6820) @@ -50,15 +50,16 @@ # Set up Maven export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -cp -u ci/profiles.redhat.qa.xml profiles.xml +# Prevent override of an existing settings.xml file, allowing for local runs +cp -u ci/settings-qa.xml settings.xml # Determine jBPM version -mvn -s /dev/null -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt +mvn -V -s settings.xml -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt JBPM_VERSION=`grep '^3\.' $WORKSPACE/version.txt` # Build jBPM -mvn -s /dev/null -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ - -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install +mvn -U -s settings.xml -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION \ + -Dcontainer=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install if [ $? -ne 0 ]; then echo "ERROR: failed to build distro" exit 1 @@ -76,8 +77,8 @@ exit 1 fi -# Install proprietary JDBC drivers -mvn -s /dev/null -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve +# Fetch proprietary JDBC drivers +mvn -s settings.xml -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve # DB2 driver if [ "$DATABASE" = "db2" ]; then @@ -145,7 +146,7 @@ fi # Run enterprise test suite -mvn -f enterprise/pom.xml -s /dev/null --fail-at-end -Djboss.bind.address=$MYTESTIP_1 \ +mvn -f enterprise/pom.xml -s settings.xml -Djboss.bind.address=$MYTESTIP_1 \ -Dsurefire.jvm.args="-Xms64m -Xmx256m" integration-test | tee $WORKSPACE/tests.log # Stop JBoss AS Deleted: jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml 2010-11-12 12:48:12 UTC (rev 6819) +++ jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml 2010-11-12 22:32:13 UTC (rev 6820) @@ -1,65 +0,0 @@ -<?xml version="1.0"?> -<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> - <profiles> - <profile> - <id>qa-local</id> - - <properties> - <jdbc.db2.server>localhost</jdbc.db2.server> - <jdbc.db2.port>50000</jdbc.db2.port> - <jdbc.db2.database>jbpm3</jdbc.db2.database> - <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> - <jdbc.db2.username>jbpm3</jdbc.db2.username> - <jdbc.db2.password>jbpm3</jdbc.db2.password> - <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> - - <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> - <jdbc.mssql.port>3918</jdbc.mssql.port> - <jdbc.mssql.database>jbpm</jdbc.mssql.database> - <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> - <jdbc.mssql.username>jbpm</jdbc.mssql.username> - <jdbc.mssql.password>jbpm</jdbc.mssql.password> - <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> - - <jdbc.mysql.server>localhost</jdbc.mysql.server> - <jdbc.mysql.port>3306</jdbc.mysql.port> - <jdbc.mysql.database>jbpm3</jdbc.mysql.database> - <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> - <jdbc.mysql.username>jbpm3</jdbc.mysql.username> - <jdbc.mysql.password>jbpm3</jdbc.mysql.password> - <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> - - <jdbc.oracle.server>localhost</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>XE</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpm3</jdbc.oracle.username> - <jdbc.oracle.password>jbpm3</jdbc.oracle.password> - <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> - - <jdbc.postgresql.server>localhost</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> - <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> - <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> - - <jdbc.sybase.server>localhost</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpm3</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> - <jdbc.sybase.username>jbpm3</jdbc.sybase.username> - <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>qa-local</activeProfile> - </activeProfiles> -</profilesXml> Deleted: jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml 2010-11-12 12:48:12 UTC (rev 6819) +++ jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml 2010-11-12 22:32:13 UTC (rev 6820) @@ -1,65 +0,0 @@ -<?xml version="1.0"?> -<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> - <profiles> - <profile> - <id>qa-redhat</id> - - <properties> - <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server> - <jdbc.db2.port>50000</jdbc.db2.port> - <jdbc.db2.database>jbossqa</jdbc.db2.database> - <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> - <jdbc.db2.username>jbpm3</jdbc.db2.username> - <jdbc.db2.password>jbpm3</jdbc.db2.password> - <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> - - <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> - <jdbc.mssql.port>3918</jdbc.mssql.port> - <jdbc.mssql.database>jbpm</jdbc.mssql.database> - <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> - <jdbc.mssql.username>jbpm</jdbc.mssql.username> - <jdbc.mssql.password>jbpm</jdbc.mssql.password> - <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> - - <jdbc.mysql.server>vmg02.mw.lab.eng.bos.redhat.com</jdbc.mysql.server> - <jdbc.mysql.port>3306</jdbc.mysql.port> - <jdbc.mysql.database>jbpm3</jdbc.mysql.database> - <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> - <jdbc.mysql.username>jbpm3</jdbc.mysql.username> - <jdbc.mysql.password>jbpm3</jdbc.mysql.password> - <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> - - <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>qadb01</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpm3</jdbc.oracle.username> - <jdbc.oracle.password>jbpm3</jdbc.oracle.password> - <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> - - <jdbc.postgresql.server>vmg01.mw.lab.eng.bos.redhat.com</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> - <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> - <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> - - <jdbc.sybase.server>vmg07.mw.lab.eng.bos.redhat.com</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpm3</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> - <jdbc.sybase.username>jbpm3xa</jdbc.sybase.username> - <jdbc.sybase.password>jbpm3xa</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>qa-redhat</activeProfile> - </activeProfiles> -</profilesXml> Copied: jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml (from rev 6811, jbpm3/branches/jbpm-3.2-soa/ci/profiles.local.qa.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/ci/settings-local.xml 2010-11-12 22:32:13 UTC (rev 6820) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <profiles> + <profile> + <id>jbpm3-local</id> + + <properties> + <jdbc.db2.server>localhost</jdbc.db2.server> + <jdbc.db2.port>50000</jdbc.db2.port> + <jdbc.db2.database>jbpm3</jdbc.db2.database> + <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> + <jdbc.db2.username>jbpm3</jdbc.db2.username> + <jdbc.db2.password>jbpm3</jdbc.db2.password> + <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> + + <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> + <jdbc.mssql.port>3918</jdbc.mssql.port> + <jdbc.mssql.database>jbpm</jdbc.mssql.database> + <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> + <jdbc.mssql.username>jbpm</jdbc.mssql.username> + <jdbc.mssql.password>jbpm</jdbc.mssql.password> + <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> + + <jdbc.mysql.server>localhost</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpm3</jdbc.mysql.database> + <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> + <jdbc.mysql.username>jbpm3</jdbc.mysql.username> + <jdbc.mysql.password>jbpm3</jdbc.mysql.password> + <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> + + <jdbc.oracle.server>localhost</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>XE</jdbc.oracle.database> + <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> + <jdbc.oracle.username>jbpm3</jdbc.oracle.username> + <jdbc.oracle.password>jbpm3</jdbc.oracle.password> + <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> + + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> + <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> + <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> + + <jdbc.sybase.server>localhost</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpm3</jdbc.sybase.database> + <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> + <jdbc.sybase.username>jbpm3</jdbc.sybase.username> + <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password> + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + + <jboss405.home>$USER_HOME/jboss-4.0.5.GA</jboss405.home> + <jboss423.home>$USER_HOME/jboss-4.2.3.GA</jboss423.home> + <jboss501.home>$USER_HOME/jboss-5.0.1.GA</jboss501.home> + <jboss510.home>$USER_HOME/jboss-5.1.0.GA</jboss510.home> + <jboss.server>all</jboss.server> + + <tomcat.home>$USER_HOME/apache-tomcat-6.0.29</tomcat.home> + <jbpm.home>$USER_HOME/jbpm-${project.version}</jbpm.home> + </properties> + </profile> + </profiles> + + <activeProfiles> + <activeProfile>jbpm3-local</activeProfile> + </activeProfiles> +</settings> Copied: jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml (from rev 6811, jbpm3/branches/jbpm-3.2-soa/ci/profiles.redhat.qa.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/ci/settings-qa.xml 2010-11-12 22:32:13 UTC (rev 6820) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <profiles> + <profile> + <id>jbpm3-qa</id> + + <properties> + <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server> + <jdbc.db2.port>50000</jdbc.db2.port> + <jdbc.db2.database>jbossqa</jdbc.db2.database> + <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> + <jdbc.db2.username>jbpm3</jdbc.db2.username> + <jdbc.db2.password>jbpm3</jdbc.db2.password> + <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> + + <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> + <jdbc.mssql.port>3918</jdbc.mssql.port> + <jdbc.mssql.database>jbpm</jdbc.mssql.database> + <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> + <jdbc.mssql.username>jbpm</jdbc.mssql.username> + <jdbc.mssql.password>jbpm</jdbc.mssql.password> + <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> + + <jdbc.mysql.server>vmg02.mw.lab.eng.bos.redhat.com</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpm3</jdbc.mysql.database> + <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> + <jdbc.mysql.username>jbpm3</jdbc.mysql.username> + <jdbc.mysql.password>jbpm3</jdbc.mysql.password> + <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> + + <jdbc.oracle.server>dev68.qa.atl2.redhat.com</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>qadb01</jdbc.oracle.database> + <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> + <jdbc.oracle.username>jbpm3</jdbc.oracle.username> + <jdbc.oracle.password>jbpm3</jdbc.oracle.password> + <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> + + <jdbc.postgresql.server>vmg01.mw.lab.eng.bos.redhat.com</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> + <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> + <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> + + <jdbc.sybase.server>vmg07.mw.lab.eng.bos.redhat.com</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpm3</jdbc.sybase.database> + <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> + <jdbc.sybase.username>jbpm3xa</jdbc.sybase.username> + <jdbc.sybase.password>jbpm3xa</jdbc.sybase.password> + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + </properties> + </profile> + </profiles> + + <activeProfiles> + <activeProfile>jbpm3-qa</activeProfile> + </activeProfiles> +</settings> Modified: jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-11-12 12:48:12 UTC (rev 6819) +++ jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-11-12 22:32:13 UTC (rev 6820) @@ -22,16 +22,10 @@ # Set up Maven export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m" -cp -u ci/profiles.redhat.qa.xml profiles.xml +# Prevent override of an existing settings.xml file, allowing for local runs +cp -u ci/settings-qa.xml settings.xml -# Build jBPM -mvn -s /dev/null -Pdistro clean install -if [ $? -ne 0 ]; then - echo "ERROR: failed to build distro" - exit 1 -fi - # Run standalone test suite export JAVA_HOME=$ORIG_JAVA_HOME -mvn -s /dev/null --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ +mvn -V -U -s settings.xml -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ -Dmaven.test.failure.ignore=true test Deleted: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2010-11-12 12:48:12 UTC (rev 6819) +++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2010-11-12 22:32:13 UTC (rev 6820) @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> - <profiles> -  - <profile> - <id>dev-local</id> - - <properties> - <jdbc.db2.server>localhost</jdbc.db2.server> - <jdbc.db2.port>50000</jdbc.db2.port> - <jdbc.db2.database>jbpm3</jdbc.db2.database> - <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url> - <jdbc.db2.username>jbpm3</jdbc.db2.username> - <jdbc.db2.password>jbpm3</jdbc.db2.password> - <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver> - - <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> - <jdbc.mssql.port>3918</jdbc.mssql.port> - <jdbc.mssql.database>jbpm</jdbc.mssql.database> - <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> - <jdbc.mssql.username>jbpm</jdbc.mssql.username> - <jdbc.mssql.password>jbpm</jdbc.mssql.password> - <jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver> - - <jdbc.mysql.server>localhost</jdbc.mysql.server> - <jdbc.mysql.port>3306</jdbc.mysql.port> - <jdbc.mysql.database>jbpm3</jdbc.mysql.database> - <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> - <jdbc.mysql.username>jbpm3</jdbc.mysql.username> - <jdbc.mysql.password>jbpm3</jdbc.mysql.password> - <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver> - - <jdbc.oracle.server>localhost</jdbc.oracle.server> - <jdbc.oracle.port>1521</jdbc.oracle.port> - <jdbc.oracle.database>XE</jdbc.oracle.database> - <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> - <jdbc.oracle.username>jbpm3</jdbc.oracle.username> - <jdbc.oracle.password>jbpm3</jdbc.oracle.password> - <jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver> - - <jdbc.postgresql.server>localhost</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpm3</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpm3</jdbc.postgresql.username> - <jdbc.postgresql.password>jbpm3</jdbc.postgresql.password> - <jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver> - - <jdbc.sybase.server>localhost</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpm3</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> - <jdbc.sybase.username>jbpm3</jdbc.sybase.username> - <jdbc.sybase.password>jbpm3jbpm3</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - - <jboss405.home>$USER_HOME/jboss-4.0.5.GA</jboss405.home> - <jboss423.home>$USER_HOME/jboss-4.2.3.GA</jboss423.home> - <jboss501.home>$USER_HOME/jboss-5.0.1.GA</jboss501.home> - <jboss510.home>$USER_HOME/jboss-5.1.0.GA</jboss510.home> - <jboss.server>all</jboss.server> - - <tomcat.home>$USER_HOME/apache-tomcat-6.0.29</tomcat.home> - <jbpm.home>$USER_HOME/jbpm-${project.version}</jbpm.home> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>dev-local</activeProfile> - </activeProfiles> -</profilesXml>

13 years, 7 months

1
0
0 / 0

JBoss JBPM SVN: r6819 - jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-11-12 07:48:12 -0500 (Fri, 12 Nov 2010) New Revision: 6819 Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml Log: JBPM-2959 install backport-util-concurrent.jar to jboss as for successful deployment Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml 2010-11-12 11:30:06 UTC (rev 6818) +++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml 2010-11-12 12:48:12 UTC (rev 6819) @@ -229,6 +229,7 @@ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"> <include name="jbpm-jpdl.jar" /> <include name="jbpm-identity.jar" /> + <include name="backport-util-concurrent.jar" /> </fileset> <file src="@{resourcesDirectory}/service/jboss-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/META-INF" />

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits November 2010