[jbpm-commits] JBoss JBPM SVN: r4196 - in jbpm4/branches/tbaeyens/modules: distro/.settings and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Mar 9 12:32:17 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-03-09 12:32:17 -0400 (Mon, 09 Mar 2009)
New Revision: 4196
Removed:
jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/execution/
Modified:
jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java
jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/TaskService.java
jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/deploy/ParseJpdlDeployer.java
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/Deployment.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -70,8 +70,8 @@
Deployment addDirectoryCanonical(String directory);
Deployment addDirectory(File directory);
Deployment addDirectoryCanonical(File directory);
- Deployment addObject(String name, Object object);
-
+ Deployment addProcessDefinition(ProcessDefinition processDefinition);
+
Deployment setFileType(String fileName, String fileType);
Deployment deploy();
Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/TaskService.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/TaskService.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -50,8 +50,9 @@
* Use {@link #saveTask(Task)} to persist the task. */
Task newTask(long parentTaskDbid);
- /** Saves the given task to persistent storage. */
- void saveTask(Task task);
+ /** Saves the given task to persistent storage.
+ * @return the taskDbid */
+ long saveTask(Task task);
/** Retrieves the task with the given identifier from persistent storage.
* If no task with the given identifier exists,
Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-09 16:32:17 UTC (rev 4196)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Sat Mar 07 09:22:34 CET 2009
+#Mon Mar 09 08:59:42 CET 2009
Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -80,9 +80,13 @@
.startActivity("end", new ObjectDescriptor(WaitState.class))
.endActivity()
.endProcess();
+
// deploy process
- environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(),
- processDefinition).deploy();
+ environment.get(ProcessService.class)
+ .createDeployment()
+ .addProcessDefinition(processDefinition)
+ .deploy();
+
processDefinitionId = processDefinition.getId();
}
Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -130,8 +130,11 @@
public void testHappyTimer() throws CreateException {
// deploy process
listenerDescriptor.setClassName(HappyListener.class.getName());
- environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(),
- processDefinition).deploy();
+ environment.get(ProcessService.class)
+ .createDeployment()
+ .addProcessDefinition(processDefinition)
+ .deploy();
+
// start execution
Execution execution = environment.get(ExecutionService.class).startProcessInstanceById(
processDefinition.getId());
@@ -172,8 +175,11 @@
public void testNoisyTimer() throws CreateException {
// deploy process
listenerDescriptor.setClassName(NoisyListener.class.getName());
- environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(),
- processDefinition).deploy();
+ environment.get(ProcessService.class)
+ .createDeployment()
+ .addProcessDefinition(processDefinition)
+ .deploy();
+
// start execution
ExecutionService executionService = environment.get(ExecutionService.class);
ExecutionImpl execution = (ExecutionImpl) executionService.startProcessInstanceById(processDefinition
@@ -222,8 +228,11 @@
public void testCyclicTimer() throws CreateException {
// deploy process
listenerDescriptor.setClassName(HappyListener.class.getName());
- environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(),
- processDefinition).deploy();
+ environment.get(ProcessService.class)
+ .createDeployment()
+ .addProcessDefinition(processDefinition)
+ .deploy();
+
// start execution
ExecutionImpl execution = (ExecutionImpl) environment.get(ExecutionService.class)
.startProcessInstanceById(processDefinition.getId());
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/deploy/ParseJpdlDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/deploy/ParseJpdlDeployer.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/deploy/ParseJpdlDeployer.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -21,6 +21,7 @@
*/
package org.jbpm.jpdl.internal.deploy;
+import org.jbpm.ProcessDefinition;
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.pvm.internal.deploy.Deployer;
import org.jbpm.pvm.internal.svc.DeploymentImpl;
@@ -46,9 +47,11 @@
// so that other subsequent deployers can just use the dom
// instead of reparsing the whole jpdl.xml file
deployment.addDocument(fileName, parse.getDocument());
- // add the parsed process definition to the objects
+
+ // add the parsed process definition to the processDefinitions
// this is where the save process deployer will find it
- deployment.addObject(fileName, parse.getDocumentObject());
+ ProcessDefinition processDefinition = (ProcessDefinition) parse.getDocumentObject();
+ deployment.addProcessDefinition(processDefinition);
}
}
}
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-09 16:32:17 UTC (rev 4196)
@@ -18,12 +18,6 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCDEF_"
- foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
-
<set name="historyActivityInstances"
cascade="all">
<key>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -21,11 +21,10 @@
*/
package org.jbpm.pvm.internal.cmd;
-import java.util.ArrayList;
import java.util.List;
-import org.jbpm.ProcessDefinition;
import org.jbpm.JbpmException;
+import org.jbpm.ProcessDefinition;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.pvm.internal.deploy.DeployerManager;
@@ -54,14 +53,6 @@
// and handle the deployment
deployerManager.deploy(deployment);
- List<ProcessDefinition> processDefinitions = new ArrayList<ProcessDefinition>();
- for (String objectName: deployment.getObjectNames()) {
- Object object = deployment.getObject(objectName);
- if (object instanceof ProcessDefinition) {
- processDefinitions.add((ProcessDefinition) object);
- }
- }
-
- return processDefinitions;
+ return deployment.getProcessDefinitions();
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/NewTaskCmd.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -21,10 +21,8 @@
*/
package org.jbpm.pvm.internal.cmd;
-import org.hibernate.Session;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.task.Task;
@@ -36,30 +34,14 @@
private static final long serialVersionUID = 1L;
protected Long parentTaskDbid;
- protected Long executionDbid;
- public NewTaskCmd(Long parentTaskDbid, Long executionDbid) {
+ public NewTaskCmd(Long parentTaskDbid) {
this.parentTaskDbid = parentTaskDbid;
- this.executionDbid = executionDbid;
}
public Task execute(Environment environment) throws Exception {
- ExecutionImpl execution = null;
-
TaskImpl task = TaskImpl.create();
-
- if (executionDbid!=null) {
- Session session = environment.get(Session.class);
- execution = (ExecutionImpl) session.load(ExecutionImpl.class, executionDbid);
- task.setExecution(execution);
- }
-
- if (parentTaskDbid!=null) {
- Session session = environment.get(Session.class);
- TaskImpl parentTask = (TaskImpl) session.load(TaskImpl.class, parentTaskDbid);
- parentTask.addSubTask(task);
- }
-
+ task.setParentTaskDbid(parentTaskDbid);
return task;
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SaveTaskCmd.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -29,7 +29,7 @@
/**
* @author Alejandro Guizar
*/
-public class SaveTaskCmd implements Command<Void> {
+public class SaveTaskCmd implements Command<Long> {
private static final long serialVersionUID = 1L;
@@ -39,11 +39,13 @@
this.task = task;
}
- public Void execute(Environment environment) throws Exception {
+ public Long execute(Environment environment) throws Exception {
TaskDbSession taskDbSession = environment.get(TaskDbSession.class);
+
+
taskDbSession.saveTask(task);
- return null;
+ return task.getDbid();
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/CheckProcessDeployer.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -22,6 +22,7 @@
package org.jbpm.pvm.internal.deploy;
import java.io.Serializable;
+import java.util.List;
import org.jbpm.ProcessDefinition;
import org.jbpm.client.ClientProcessDefinition;
@@ -56,15 +57,12 @@
return;
}
- for (String processSourceName : deployment.getObjectNames()) {
- Object object = deployment.getObject(processSourceName);
- if (object instanceof ProcessDefinition) {
- checkProcessDefinition(processSourceName, (ProcessDefinitionImpl)object, deployment, pvmDbSession);
- }
+ for (ProcessDefinition processDefinition : deployment.getProcessDefinitions()) {
+ checkProcessDefinition(processDefinition, deployment, pvmDbSession);
}
}
- public void checkProcessDefinition(String processSourceName, ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
+ public void checkProcessDefinition(ProcessDefinition processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
if ( (processDefinition.getName()==null)
|| ("".equals(processDefinition.getName()))
) {
@@ -72,12 +70,12 @@
return;
}
- checkKey(processSourceName, processDefinition, deployment, pvmDbSession);
- checkVersion(processSourceName, processDefinition, deployment, pvmDbSession);
- checkId(processSourceName, processDefinition, deployment, pvmDbSession);
+ checkKey((ProcessDefinitionImpl)processDefinition, deployment, pvmDbSession);
+ checkVersion((ProcessDefinitionImpl)processDefinition, deployment, pvmDbSession);
+ checkId((ProcessDefinitionImpl)processDefinition, deployment, pvmDbSession);
}
- protected void checkKey(String processSourceName, ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
+ protected void checkKey(ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
String name = processDefinition.getName();
String key = processDefinition.getKey();
if ( (key==null)
@@ -93,18 +91,18 @@
if ( (existingKey!=null)
&& (!existingKey.equals(key))
) {
- deployment.addProblem("invalid key '"+key+"' in process "+processSourceName+". Existing process has name '"+name+"' and key '"+existingKey+"'");
+ deployment.addProblem("invalid key '"+key+"' in process "+processDefinition.getName()+". Existing process has name '"+name+"' and key '"+existingKey+"'");
}
String existingName = pvmDbSession.findProcessDefinitionNameByKey(key);
if ( (existingName!=null)
&& (!existingName.equals(name))
) {
- deployment.addProblem("invalid name '"+name+"' in process "+processSourceName+". Existing process has name '"+existingName+"' and key '"+key+"'");
+ deployment.addProblem("invalid name '"+name+"' in process "+processDefinition.getName()+". Existing process has name '"+existingName+"' and key '"+key+"'");
}
}
- protected void checkVersion(String processSourceName, ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
+ protected void checkVersion(ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
int version = processDefinition.getVersion();
String key = processDefinition.getKey();
if ( (version==ProcessDefinitionImpl.UNASSIGNED_VERSION)
@@ -128,7 +126,7 @@
}
}
- protected void checkId(String processSourceName, ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
+ protected void checkId(ProcessDefinitionImpl processDefinition, DeploymentImpl deployment, PvmDbSession pvmDbSession) {
String id = processDefinition.getId();
if (id==null) {
id = processDefinition.getKey()+":"+processDefinition.getVersion();
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/SaveDeployer.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -23,8 +23,8 @@
import java.io.InputStream;
import java.io.Serializable;
+import java.util.List;
-import org.jbpm.ProcessDefinition;
import org.jbpm.env.Environment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
@@ -52,24 +52,17 @@
return;
}
- ProcessDefinitionImpl lastProcessDefinition = null;
-
boolean deployedProcess = false;
- for (String objectName : deployment.getObjectNames()) {
- Object object = deployment.getObject(objectName);
- if (object instanceof ProcessDefinition) {
- deployedProcess = true;
- lastProcessDefinition = (ProcessDefinitionImpl) object;
-
- log.debug("saving process definition "+object);
- pvmDbSession.save(object);
- }
- }
-
- if (lastProcessDefinition!=null) {
+
+ List<ProcessDefinitionImpl> processDefinitions = (List)deployment.getProcessDefinitions();
+
+ for (ProcessDefinitionImpl processDefinition : processDefinitions) {
+ log.debug("saving process definition "+processDefinition);
+ deployedProcess = true;
+ pvmDbSession.save(processDefinition);
for (String fileName : deployment.getFileNames()) {
InputStream inputStream = deployment.getFile(fileName);
- lastProcessDefinition.addAttachment(fileName, inputStream);
+ processDefinition.addAttachment(fileName, inputStream);
}
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -41,6 +41,12 @@
public void saveTask(Task task) {
TaskImpl taskImpl = (TaskImpl) task;
+ if (taskImpl.getParentTaskDbid()!=null) {
+ TaskImpl parentTask = (TaskImpl) session.load(TaskImpl.class, taskImpl.getParentTaskDbid());
+ parentTask.addSubTask(taskImpl);
+ taskImpl.setParentTaskDbid(null);
+ }
+
if (! taskImpl.isPersisted()) {
Serializable dbid = session.save(taskImpl);
if (taskImpl.getId() == null) {
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.history.model;
+import java.io.Serializable;
import java.util.Date;
import org.jbpm.history.HistoryActivityInstance;
@@ -32,8 +33,10 @@
*
* @author Tom Baeyens
*/
-public class HistoryActivityInstanceImpl implements HistoryActivityInstance {
+public class HistoryActivityInstanceImpl implements HistoryActivityInstance, Serializable {
+ private static final long serialVersionUID = 1L;
+
protected long dbid;
protected int dbversion;
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.history.model;
+import java.io.Serializable;
import java.util.Date;
import java.util.Set;
@@ -33,7 +34,7 @@
/**
* @author Tom Baeyens
*/
-public class HistoryProcessInstanceImpl implements HistoryProcessInstance {
+public class HistoryProcessInstanceImpl implements HistoryProcessInstance, Serializable {
protected long dbid;
protected int dbversion;
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -41,6 +41,7 @@
import org.jbpm.ProcessDefinition;
import org.jbpm.env.Environment;
import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.stream.ByteArrayStreamInput;
import org.jbpm.pvm.internal.stream.FileStreamInput;
import org.jbpm.pvm.internal.stream.InputStreamInput;
@@ -81,40 +82,14 @@
protected Map<String, Document> fileDocuments = new HashMap<String, Document>();
/** maps file names to file types */
protected Map<String, String> fileTypes = new HashMap<String,String>();
+ /** process definitions */
+ protected List<ProcessDefinition> processDefinitions = new ArrayList<ProcessDefinition>();
- /** generic pool of objects.
- * 1) users can supply objects directly to a deployment like
- * e.g. ProcessDefinition's created by a factory
- * 2) deployers can create objects as a result from processing the files
- * in those cases the object names are typically identical to the file
- * names
- * 3) the save deployer will store all objects in the db.
- */
- protected Map<String, Object> objects;
-
- /* maps object names to object types */
- protected Map<String, Object> objectTypes;
-
- // TODO REMOVE
- protected ProcessDefinition processDefinition;
-
public DeploymentImpl(ProcessServiceImpl processServiceImpl) {
this.processServiceImpl = processServiceImpl;
this.problems = new ArrayList<ProblemImpl>();
}
- // TODO REMOVE
- public DeploymentImpl() {
- this.problems = new ArrayList<ProblemImpl>();
- }
-
- // TODO REMOVE replace with addObject
- public DeploymentImpl(ProcessDefinition processDefinition) {
- this.problems = new ArrayList<ProblemImpl>();
- setProcessDefinition(processDefinition);
- }
-
-
public Deployment addResource(String resource) {
addStreamSource(resource, new ResourceStreamInput(resource));
return this;
@@ -260,20 +235,6 @@
return files.keySet();
}
- public Object getObject(String name) {
- if (objects==null) {
- return null;
- }
- return objects.get(name);
- }
-
- public Set<String> getObjectNames() {
- if (objects==null) {
- return Collections.EMPTY_SET;
- }
- return objects.keySet();
- }
-
public Document getDocument(String name) {
if ( (fileDocuments!=null)
&& (fileDocuments.containsKey(name))
@@ -293,14 +254,6 @@
return null;
}
- public ProcessDefinition getProcessDefinition() {
- return processDefinition;
- }
-
- public void setProcessDefinition(ProcessDefinition processDefinition) {
- this.processDefinition = processDefinition;
- }
-
public String getName() {
return name;
}
@@ -309,32 +262,17 @@
return this;
}
- public Deployment addObject(String name, Object object) {
- if (objects==null) {
- objects = new HashMap<String, Object>();
- }
- objects.put(name, object);
+ public Deployment addProcessDefinition(ProcessDefinition processDefinition) {
+ processDefinitions.add(processDefinition);
return this;
}
public Deployment deploy() {
- processServiceImpl.deploy(this);
+ processDefinitions.addAll(processServiceImpl.deploy(this));
return this;
}
public List<ProcessDefinition> getProcessDefinitions() {
- List<ProcessDefinition> processDefinitions = null;
- if (objects!=null) {
- processDefinitions = new ArrayList<ProcessDefinition>();
- for (Object object: objects.values()) {
- if (object instanceof ProcessDefinition) {
- processDefinitions.add((ProcessDefinition) object);
- }
- }
- } else {
- processDefinitions = Collections.EMPTY_LIST;
- }
-
return processDefinitions;
}
@@ -378,15 +316,6 @@
return this;
}
- public Deployment addObject(String name, Object object, String objectType) {
- addObject(name, objectType);
- if (objectTypes==null) {
- objectTypes = new HashMap<String, Object>();
- }
- objectTypes.put(name, objectType);
- return this;
- }
-
public Deployment setFileType(String fileName, String fileType) {
if (fileTypes==null) {
fileTypes = new HashMap<String, String>();
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -88,11 +88,6 @@
return commandService.execute(new DeployCmd((DeploymentImpl)deployment));
}
- public List<ProcessDefinition> deploy(OpenProcessDefinition processDefinition) {
- DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition);
- return commandService.execute(new DeployCmd(deploymentImpl));
- }
-
public CommandService getCommandService() {
return commandService;
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -81,6 +81,9 @@
protected TaskImpl superTask;
protected Set<TaskImpl> subTasks;
+ protected Long executionDbid;
+ protected Long parentTaskDbid;
+
protected TaskImpl() {
}
@@ -379,4 +382,16 @@
public Integer getProgress() {
return progress;
}
+ public Long getExecutionDbid() {
+ return executionDbid;
+ }
+ public void setExecutionDbid(Long executionDbid) {
+ this.executionDbid = executionDbid;
+ }
+ public Long getParentTaskDbid() {
+ return parentTaskDbid;
+ }
+ public void setParentTaskDbid(Long parentTaskDbid) {
+ this.parentTaskDbid = parentTaskDbid;
+ }
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskServiceImpl.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -67,15 +67,15 @@
}
public Task newTask() {
- return commandService.execute(new NewTaskCmd(null, null));
+ return commandService.execute(new NewTaskCmd(null));
}
public Task getTask(long taskDbid) {
return commandService.execute(new GetTaskCmd(taskDbid));
}
- public void saveTask(Task task) {
- commandService.execute(new SaveTaskCmd((TaskImpl) task));
+ public long saveTask(Task task) {
+ return commandService.execute(new SaveTaskCmd((TaskImpl) task));
}
public void deleteTask(long taskDbid) {
@@ -135,7 +135,7 @@
}
public Task newTask(long parentTaskDbid) {
- return commandService.execute(new NewTaskCmd(parentTaskDbid, null));
+ return commandService.execute(new NewTaskCmd(parentTaskDbid));
}
public Comment addTaskComment(long taskDbid, String message) {
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-09 16:32:17 UTC (rev 4196)
@@ -18,12 +18,6 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
- <many-to-one name="processDefinition"
- class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
- column="PROCDEF_"
- foreign-key="FK_HISTPI_PROCDEF"
- index="IDX_HISTPI_PROCDEF" />
-
<set name="historyActivityInstances"
cascade="all">
<key>
Modified: jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -171,13 +171,15 @@
return null;
}
- public void saveAndRegisterTask(Task task) {
- taskService.saveTask(task);
+ public long saveAndRegisterTask(Task task) {
+ long taskDbid = taskService.saveTask(task);
if (registeredTaskIds == null) {
registeredTaskIds = new ArrayList<Long>();
}
- registeredTaskIds.add(task.getDbid());
+ registeredTaskIds.add(taskDbid);
+
+ return taskDbid;
}
public HashSet<String> getActivityNames(String processInstanceId) {
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/SubTaskTest.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -41,8 +41,7 @@
Task task = taskService.newTask();
task.setName("clean da house");
- saveAndRegisterTask(task);
- long taskDbid = task.getDbid();
+ long taskDbid = saveAndRegisterTask(task);
// create 3 sub tasks:
// * clean da house
@@ -52,18 +51,15 @@
Task subTask = taskService.newTask(taskDbid);
subTask.setName("dishes");
- taskService.saveTask(subTask);
- long dishesTaskDbid = subTask.getDbid();
+ long dishesTaskDbid = taskService.saveTask(subTask);
subTask = taskService.newTask(taskDbid);
subTask.setName("laundry");
- taskService.saveTask(subTask);
- long laundryTaskDbid = subTask.getDbid();
+ long laundryTaskDbid = taskService.saveTask(subTask);
subTask = taskService.newTask(taskDbid);
subTask.setName("sweep floor");
- taskService.saveTask(subTask);
- long sweepFloorTaskDbid = subTask.getDbid();
+ long sweepFloorTaskDbid = taskService.saveTask(subTask);
// verify 3 sub tasks of clean da house
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCommentsTest.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -36,8 +36,7 @@
public void testComments() {
Task task = taskService.newTask();
task.setName("clean da house");
- taskService.saveTask(task);
- long taskDbid = task.getDbid();
+ long taskDbid = taskService.saveTask(task);
// what a party yesterday
// - what! you had a party while i was out ?!
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-03-09 16:32:17 UTC (rev 4196)
@@ -41,8 +41,7 @@
public void testSaveTask() {
Task task = taskService.newTask();
- saveAndRegisterTask(task);
- long taskDbid = task.getDbid();
+ long taskDbid = saveAndRegisterTask(task);
// task was made persistent
task = taskService.getTask(taskDbid);
assertNotNull("expected non-null task", task);
@@ -60,8 +59,7 @@
public void testDeleteTask() {
Task task = taskService.newTask();
- taskService.saveTask(task);
- long taskDbid = task.getDbid();
+ long taskDbid = taskService.saveTask(task);
// task was made persistent
assertNotNull("expected non-null task", taskService.getTask(taskDbid));
Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-09 00:08:33 UTC (rev 4195)
+++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-09 16:32:17 UTC (rev 4196)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Thu Mar 05 09:01:39 CET 2009
+#Mon Mar 09 09:00:28 CET 2009
More information about the jbpm-commits
mailing list