5:39 a.m.
Author: alex.guizar(a)jboss.com
Date: 2009-03-13 06:38:59 -0400 (Fri, 13 Mar 2009)
New Revision: 4237
Removed:
jbpm3/trunk/modules/distribution/.classpath
jbpm3/trunk/modules/userguide/.classpath
Modified:
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java
jbpm3/trunk/modules/distribution/.project
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java
jbpm3/trunk/modules/userguide/.project
jbpm3/trunk/modules/userguide/src/main/docbook/en/master.xml
jbpm3/trunk/pom.xml
Log:
svn merge -r 4206:4224 https://svn.jboss.org/repos/jbpm/jbpm3/branches/jbpm-3.2.6.SP
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/core/pom.xml 2009-03-13 10:38:59 UTC (rev 4237)
@@ -79,22 +79,11 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -107,11 +96,6 @@
<artifactId>jaxen</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Remove this static dependency -->
<dependency>
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java 2009-03-13
09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java 2009-03-13
10:38:59 UTC (rev 4237)
@@ -25,12 +25,10 @@
protected void setUp() throws Exception {
super.setUp();
processDefinition =
ProcessDefinition.parseXmlResource("org/jbpm/jbpm1755/parallelprocess.xml");
- startJobExecutor();
}
@Override
protected void tearDown() throws Exception {
- stopJobExecutor();
graphSession.deleteProcessDefinition(processDefinition.getId());
EventCallback.clear();
super.tearDown();
@@ -65,9 +63,11 @@
commitAndCloseSession();
try {
+ startJobExecutor();
EventCallback.waitForEvent(PROCESS_INSTANCE_COUNT, Event.EVENTTYPE_PROCESS_END);
}
finally {
+ stopJobExecutor();
beginSessionTransaction();
}
Deleted: jbpm3/trunk/modules/distribution/.classpath
===================================================================
--- jbpm3/trunk/modules/distribution/.classpath 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/distribution/.classpath 2009-03-13 10:38:59 UTC (rev 4237)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src"
output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Modified: jbpm3/trunk/modules/distribution/.project
===================================================================
--- jbpm3/trunk/modules/distribution/.project 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/distribution/.project 2009-03-13 10:38:59 UTC (rev 4237)
@@ -6,18 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/distribution/pom.xml 2009-03-13 10:38:59 UTC (rev 4237)
@@ -154,14 +154,6 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2009-03-13 10:38:59 UTC (rev 4237)
@@ -233,6 +233,8 @@
<excludes>
<!-- [JBPM-1708] Enterprise EjbSchedulerTest fails -->
<exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
+ <!-- [JBPM-1952] StaleObjectStateException with multiple JobExecutors
-->
+
<exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -260,6 +262,8 @@
<excludes>
<!-- [JBPM-1708] Enterprise EjbSchedulerTest fails -->
<exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
+ <!-- [JBPM-1952] StaleObjectStateException with multiple JobExecutors
-->
+
<exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -283,6 +287,12 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- [JBPM-1952] StaleObjectStateException with multiple JobExecutors
-->
+
<exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -306,7 +316,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- [JBPM-1952] SOSE in async fork fails -->
+ <!-- [JBPM-1952] StaleObjectStateException with multiple JobExecutors
-->
<exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
</excludes>
</configuration>
Modified:
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java
===================================================================
---
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2009-03-13
09:41:42 UTC (rev 4236)
+++
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2009-03-13
10:38:59 UTC (rev 4237)
@@ -32,7 +32,6 @@
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.EventCallback;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.graph.exe.Token;
import org.jbpm.scheduler.ejbtimer.EntitySchedulerService;
/**
@@ -121,6 +120,9 @@
+ " </start-state>"
+ " <state name='a'>"
+ " <timer duedate='1 second' repeat='1 second'
/>"
+ + " <transition to='b' />"
+ + " </state>"
+ + " <state name='b'>"
+ " <transition to='end' />"
+ " </state>"
+ " <end-state name='end' />"
@@ -135,16 +137,18 @@
assertEquals("a", getProcessInstanceState(processInstanceId));
// cancel timer
long rootTokenId = processInstance.getRootToken().getId();
- cancelTimer("a", rootTokenId);
+ signalToken(rootTokenId);
// no more expirations
try {
- EventCallback.waitForEvent(Event.EVENTTYPE_TIMER, 2000);
+ EventCallback.waitForEvent(Event.EVENTTYPE_TIMER, 1000);
+ System.out.println("canceled timer fired again, probably due to race
condition");
+ EventCallback.waitForEvent(Event.EVENTTYPE_TIMER, 1000);
fail("expected timeout exception");
}
catch (org.jbpm.JbpmException e) {
// timeout exception was expected
}
-
+ // proceed to end state
signalToken(rootTokenId);
assertTrue("expected process instance " + processInstanceId + " to
have ended",
hasProcessInstanceEnded(processInstanceId));
@@ -162,23 +166,23 @@
+ " <transition to='a' />"
+ " </start-state>"
+ " <state name='a'>"
- + " <timer duedate='500 milliseconds'
transition='timeout' />"
+ + " <timer duedate='1 second' transition='timeout'
/>"
+ " <transition name='timeout' to='b' />"
+ " </state>"
+ " <state name='b'>"
- + " <timer duedate='500 milliseconds'
transition='timeout' />"
+ + " <timer duedate='1 second' transition='timeout'
/>"
+ " <transition name='timeout' to='c' />"
+ " </state>"
+ " <state name='c'>"
- + " <timer duedate='500 milliseconds'
transition='timeout' />"
+ + " <timer duedate='1 second' transition='timeout'
/>"
+ " <transition name='timeout' to='d' />"
+ " </state>"
+ " <state name='d'>"
- + " <timer duedate='500 milliseconds'
transition='timeout' />"
+ + " <timer duedate='1 second' transition='timeout'
/>"
+ " <transition name='timeout' to='e' />"
+ " </state>"
+ " <state name='e'>"
- + " <timer duedate='500 milliseconds'
transition='timeout' />"
+ + " <timer duedate='1 second' transition='timeout'
/>"
+ " <transition name='timeout' to='end' />"
+ " </state>"
+ " <end-state name='end' />"
@@ -209,7 +213,7 @@
+ " <transition name='e' to='e' />"
+ " </fork>"
+ " <state name='a'>"
- + " <timer duedate='0.5 seconds' transition='timeout'
/>"
+ + " <timer duedate='0 seconds' transition='timeout'
/>"
+ " <transition name='timeout' to='j' />"
+ " </state>"
+ " <state name='b'>"
@@ -217,15 +221,15 @@
+ " <transition name='timeout' to='j' />"
+ " </state>"
+ " <state name='c'>"
- + " <timer duedate='1.5 seconds' transition='timeout'
/>"
+ + " <timer duedate='2 seconds' transition='timeout'
/>"
+ " <transition name='timeout' to='j' />"
+ " </state>"
+ " <state name='d'>"
- + " <timer duedate='2 seconds' transition='timeout'
/>"
+ + " <timer duedate='3 seconds' transition='timeout'
/>"
+ " <transition name='timeout' to='j' />"
+ " </state>"
+ " <state name='e'>"
- + " <timer duedate='2.5 second' transition='timeout'
/>"
+ + " <timer duedate='4 seconds' transition='timeout'
/>"
+ " <transition name='timeout' to='j' />"
+ " </state>"
+ " <join name='j' async='exclusive'
lock='UPGRADE'>"
@@ -244,23 +248,12 @@
private static final long serialVersionUID = 1L;
public Object execute(JbpmContext jbpmContext) throws Exception {
- return jbpmContext.loadProcessInstance(processInstanceId)
+ return jbpmContext
+ .loadProcessInstance(processInstanceId)
.getRootToken()
.getNode()
.getName();
}
});
}
-
- private void cancelTimer(final String timerName, final long tokenId) throws
RemoteException {
- commandService.execute(new Command() {
- private static final long serialVersionUID = 1L;
-
- public Object execute(JbpmContext jbpmContext) throws Exception {
- Token token = jbpmContext.loadToken(tokenId);
- jbpmContext.getServices().getSchedulerService().deleteTimersByName(timerName,
token);
- return null;
- }
- });
- }
}
Deleted: jbpm3/trunk/modules/userguide/.classpath
===================================================================
--- jbpm3/trunk/modules/userguide/.classpath 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/userguide/.classpath 2009-03-13 10:38:59 UTC (rev 4237)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Modified: jbpm3/trunk/modules/userguide/.project
===================================================================
--- jbpm3/trunk/modules/userguide/.project 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/modules/userguide/.project 2009-03-13 10:38:59 UTC (rev 4237)
@@ -6,18 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: jbpm3/trunk/modules/userguide/src/main/docbook/en/master.xml
===================================================================
--- jbpm3/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-03-13 09:41:42 UTC
(rev 4236)
+++ jbpm3/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-03-13 10:38:59 UTC
(rev 4237)
@@ -21,7 +21,7 @@
<!ENTITY security SYSTEM "modules/security.xml">
<!ENTITY tdd SYSTEM "modules/tdd.xml">
<!ENTITY pluggable SYSTEM "modules/pluggable.xml">
-<!ENTITY version "3.2.6.GA">
+<!ENTITY version "3.2.7-SNAPSHOT">
]>
<book lang="en">
<bookinfo>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2009-03-13 09:41:42 UTC (rev 4236)
+++ jbpm3/trunk/pom.xml 2009-03-13 10:38:59 UTC (rev 4237)
@@ -73,7 +73,7 @@
<javax.jaxb.version>2.1</javax.jaxb.version>
<jaxen.version>1.1.1</jaxen.version>
<jbpm.designer.version>3.1.7</jbpm.designer.version>
- <jbpm.jsf-console.version>3.2.6.SP1</jbpm.jsf-console.version>
+ <jbpm.jsf-console.version>3.2.6.SP2</jbpm.jsf-console.version>
<jboss.client.version>4.2.2.GA</jboss.client.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>