JBoss JBPM SVN: r5904 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: main/resources/org/jbpm/db and 2 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-02 20:18:46 -0500 (Wed, 02 Dec 2009)
New Revision: 5904
Added:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2608/
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2608/JBPM2608Test.java
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
Log:
JBPM-2608: JobSession.findJobsWithOverdueLockTime returns incorrect list of overdue jobs for LockMonitorThread
modify query to return jobs locked *before* the threshold and the calling code to pass a *timestamp*
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-12-02 23:17:00 UTC (rev 5903)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-12-03 01:18:46 UTC (rev 5904)
@@ -257,7 +257,7 @@
public List findJobsWithOverdueLockTime(Date threshold) {
try {
return session.getNamedQuery("JobSession.findJobsWithOverdueLockTime")
- .setDate("threshold", threshold)
+ .setTimestamp("threshold", threshold)
.list();
}
catch (HibernateException e) {
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2009-12-02 23:17:00 UTC (rev 5903)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2009-12-03 01:18:46 UTC (rev 5904)
@@ -385,7 +385,7 @@
<![CDATA[
select job
from org.jbpm.job.Job as job
- where job.lockTime > :threshold
+ where job.lockTime < :threshold
]]>
</query>
Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2608/JBPM2608Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2608/JBPM2608Test.java (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2608/JBPM2608Test.java 2009-12-03 01:18:46 UTC (rev 5904)
@@ -0,0 +1,93 @@
+/*
+ * 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.jbpm2608;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.job.Job;
+import org.jbpm.job.Timer;
+
+/**
+ * @author Alejandro Guizar
+ */
+public class JBPM2608Test extends AbstractDbTestCase {
+
+ private ProcessDefinition processDefinition;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ processDefinition = new ProcessDefinition(getName());
+ graphSession.saveProcessDefinition(processDefinition);
+ }
+
+ protected void tearDown() throws Exception {
+ graphSession.deleteProcessDefinition(processDefinition);
+ super.tearDown();
+ }
+
+ /**
+ * Test method for
+ * {@link org.jbpm.db.JobSession#findJobsWithOverdueLockTime(java.util.Date)}
+ * .
+ */
+ public void testFindJobsWithOverdueLockTime() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.HOUR, -1);
+ // databases such as mysql do not have millisecond precision
+ calendar.set(Calendar.MILLISECOND, 0);
+ Date oneHourAgo = calendar.getTime();
+
+ calendar.add(Calendar.SECOND, -1);
+ Date oneHourAgoMinusOneSec = calendar.getTime();
+
+ calendar.add(Calendar.SECOND, 2);
+ Date oneHourAgoPlusOneSec = calendar.getTime();
+
+ Timer timer = new Timer(processInstance.getRootToken());
+ timer.setLockTime(oneHourAgo);
+ jbpmContext.getServices().getSchedulerService().createTimer(timer);
+
+ newTransaction();
+ timer = jobSession.loadTimer(timer.getId());
+ assertEquals(oneHourAgo, timer.getLockTime());
+
+ List jobs = jobSession.findJobsWithOverdueLockTime(oneHourAgoMinusOneSec);
+ assert jobs.isEmpty() : jobs;
+
+ jobs = jobSession.findJobsWithOverdueLockTime(oneHourAgo);
+ assert jobs.isEmpty() : jobs;
+
+ jobs = jobSession.findJobsWithOverdueLockTime(oneHourAgoPlusOneSec);
+ assertEquals(1, jobs.size());
+
+ Job job = (Job) jobs.get(0);
+ assertSame(job, timer);
+ }
+
+}
16 years, 5 months
JBoss JBPM SVN: r5903 - in jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn: parser and 1 other directory.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-02 18:17:00 -0500 (Wed, 02 Dec 2009)
New Revision: 5903
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
Log:
Small adjustments to get the basic example running
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java 2009-12-02 22:10:20 UTC (rev 5902)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java 2009-12-02 23:17:00 UTC (rev 5903)
@@ -30,11 +30,11 @@
*/
public class BpmnDeployer extends ProcessDeployer {
- static BpmnParser bpmnParser = new BpmnParser();
- static final String bpmnExtension = ".bpmn.xml";
+ static final BpmnParser BPMN_PARSER = new BpmnParser();
+ static final String BPMN_EXTENSION = ".bpmn.xml";
public BpmnDeployer() {
- super(bpmnExtension, bpmnParser);
+ super(BPMN_EXTENSION, BPMN_PARSER);
}
}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-02 22:10:20 UTC (rev 5902)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-02 23:17:00 UTC (rev 5903)
@@ -64,19 +64,21 @@
static ObjectBinding objectBinding = new ObjectBinding();
public static final WireParser wireParser = WireParser.getInstance();
- // array elements are mutable, even when final
- // never make a static array public
static final String[] DEFAULT_ACTIVITIES_RESOURCES = { "jbpm.bpmn.flownodes.xml" };
static final String CATEGORY_ACTIVITY = "activity";
static BindingsParser bindingsParser = new BindingsParser();
public BpmnParser() {
- initialize();
- parseBindings();
+
+ initialize(); // initialises underlying SAX parser
+ parseBindings(); // initialises bindings
+
+ // Setting BPMN2 xsd schema
List<String> schemaResources = new ArrayList<String>();
schemaResources.add("BPMN20.xsd");
setSchemaResources(schemaResources);
+
}
public Object parseDocumentElement(Element documentElement, Parse parse) {
@@ -130,7 +132,7 @@
parseActivities(processElement, parse, processDefinition);
// bind activities to their destinations
- parseTransitions(processElement, parse, processDefinition);
+ parseSequenceFlows(processElement, parse, processDefinition);
} finally {
parse.contextStackPop();
@@ -160,7 +162,7 @@
}
}
} else {
- log.trace("skipping unavailable jpdl activities resource: " + activityResource);
+ log.trace("skipping unavailable activities resource: " + activityResource);
}
}
}
@@ -224,11 +226,11 @@
}
}
- public void parseTransitions(Element element, Parse parse, CompositeElementImpl compositeElement) {
+ public void parseSequenceFlows(Element element, Parse parse, CompositeElementImpl compositeElement) {
List<Element> transitionElements = XmlUtil.elements(element, "sequenceFlow");
for (Element transitionElement : transitionElements) {
String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse);
- String transitionId = XmlUtil.attribute(transitionElement, "id", true, parse);
+ String transitionId = XmlUtil.attribute(transitionElement, "id", false, parse); // id is not required
String sourceRef = XmlUtil.attribute(transitionElement, "sourceRef", true, parse);
String targetRef = XmlUtil.attribute(transitionElement, "targetRef", true, parse);
@@ -352,7 +354,7 @@
if (potentialOwner != null) {
String potentialOwnerRef = XmlUtil.attribute(potentialOwner, "resourceRef");
// set to fixed expression, more evaluation needed for real BPMN 2.0
- // taskDefinition.setCandidateGroupsExpression(processDefinition.getResource(potentialOwnerRef));
+ taskDefinition.setAssigneeExpression(processDefinition.getResource(potentialOwnerRef).getName());
}
return taskDefinition;
}
16 years, 5 months
JBoss JBPM SVN: r5902 - in jbpm4/trunk: modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms and 1 other directory.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-02 17:10:20 -0500 (Wed, 02 Dec 2009)
New Revision: 5902
Modified:
jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java
jbpm4/trunk/pom.xml
Log:
Fix for JBPM-2639: task with taskform+timer leads to NPE in console when clicking 'view' on task
Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java 2009-12-02 21:39:52 UTC (rev 5901)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskFormDispatcher.java 2009-12-02 22:10:20 UTC (rev 5902)
@@ -140,14 +140,15 @@
RepositoryService repoService = processEngine.getRepositoryService();
ExecutionService execService = processEngine.getExecutionService();
- ProcessInstance instance = execService.createProcessInstanceQuery()
- .processInstanceId(executionId)
- .uniqueResult();
+ Execution execution = execService.findExecutionById(executionId);
+
+ if (execution != null) {
+ ProcessDefinition definition = repoService.createProcessDefinitionQuery()
+ .processDefinitionId(execution.getProcessDefinitionId()).uniqueResult();
+ InputStream in = repoService.getResourceAsStream(definition.getDeploymentId(), PROCESSFORMS_CSS);
+ return in;
+ }
- ProcessDefinition definition = repoService.createProcessDefinitionQuery()
- .processDefinitionId(instance.getProcessDefinitionId()).uniqueResult();
-
- InputStream in = repoService.getResourceAsStream(definition.getDeploymentId(), PROCESSFORMS_CSS);
- return in;
+ return null;
}
}
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-12-02 21:39:52 UTC (rev 5901)
+++ jbpm4/trunk/pom.xml 2009-12-02 22:10:20 UTC (rev 5902)
@@ -52,7 +52,7 @@
<cactus.version>1.8.1</cactus.version>
<aspectjrt.version>1.5.3</aspectjrt.version>
<freemarker.version>2.3.15</freemarker.version>
- <gwt.console.version>1.2.0-SNAPSHOT</gwt.console.version>
+ <gwt.console.version>1.2.1</gwt.console.version>
<jbpm.gpd.version>4.2</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>
16 years, 5 months
JBoss JBPM SVN: r5901 - jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-02 16:39:52 -0500 (Wed, 02 Dec 2009)
New Revision: 5901
Modified:
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
Log:
Fix for NPE in task without executionId
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-12-01 23:46:46 UTC (rev 5900)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-12-02 21:39:52 UTC (rev 5901)
@@ -153,10 +153,17 @@
task.setCreateDate(jbpmTask.getCreateTime());
ExecutionService executionService = ProcessEngineUtil.retrieveProcessEngine().getExecutionService();
- Execution pi = executionService.findExecutionById(jbpmTask.getExecutionId()).getProcessInstance();
- task.setProcessInstanceId(pi.getId());
- task.setProcessId(pi.getProcessDefinitionId());
+ String executionId = jbpmTask.getExecutionId();
+ if (executionId != null) { // otherwise we're dealing with a standalone task
+ Execution execution = executionService.findExecutionById(executionId);
+ if (execution != null) {
+ Execution pi = execution.getProcessInstance();
+ task.setProcessInstanceId(pi.getId());
+ task.setProcessId(pi.getProcessDefinitionId());
+ }
+ }
+
// cast
//TaskImpl cast = ((TaskImpl) jbpmTask);
//task.setSignalling(cast.isSignalling()); // TODO: Still needed?
16 years, 5 months
JBoss JBPM SVN: r5900 - projects/instance-migration/trunk/jbpm-instance-migrator.
by do-not-reply＠jboss.org
Author: caleb.powell
Date: 2009-12-01 18:46:46 -0500 (Tue, 01 Dec 2009)
New Revision: 5900
Modified:
projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml
Log:
CP: Updated the pom with a source plugin.
Modified: projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml
===================================================================
--- projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml 2009-12-01 20:47:34 UTC (rev 5899)
+++ projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml 2009-12-01 23:46:46 UTC (rev 5900)
@@ -41,6 +41,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
16 years, 5 months
JBoss JBPM SVN: r5899 - projects/instance-migration/trunk/jbpm-instance-migrator.
by do-not-reply＠jboss.org
Author: caleb.powell
Date: 2009-12-01 15:47:34 -0500 (Tue, 01 Dec 2009)
New Revision: 5899
Modified:
projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml
Log:
CP: Updated the pom.
Modified: projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml
===================================================================
--- projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml 2009-11-28 08:04:18 UTC (rev 5898)
+++ projects/instance-migration/trunk/jbpm-instance-migrator/pom.xml 2009-12-01 20:47:34 UTC (rev 5899)
@@ -9,11 +9,20 @@
<name>JBoss Inc.</name>
</organization>
<version>0.1-SNAPSHOT</version>
- <description>The jbpm-instance-migration tool is used to migrate jbpm ProcessInstance's.</description>
+ <description>A tool used to migrate jbpm ProcessInstance's.</description>
<url></url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <developers>
+ <developer>
+ <name>Caleb Powell</name>
+ <email>caleb.powell(a)gmail.com</email>
+ </developer>
+ </developers>
+
<licenses>
<license>
<name>LGPL</name>
@@ -75,8 +84,7 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
- <repositories>
- </repositories>
+
<pluginRepositories>
<pluginRepository>
<id>nuiton</id>
16 years, 5 months