[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Thu Dec 14 08:08:57 EST 2006
User: gavin
Date: 06/12/14 08:08:57
Modified: src/main/org/jboss/seam/core BusinessProcess.java
ManagedJbpmContext.java PooledTask.java
PooledTaskInstanceList.java ProcessInstance.java
TaskInstance.java TaskInstanceList.java
TaskInstanceListForType.java
Log:
use new jBPM APIs
also eliminate jbpmContext.getSession().clear(), which may break stuff
Revision Changes Path
1.14 +1 -12 jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BusinessProcess.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- BusinessProcess.java 24 Nov 2006 23:15:17 -0000 1.13
+++ BusinessProcess.java 14 Dec 2006 13:08:57 -0000 1.14
@@ -14,8 +14,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
-import org.jbpm.JbpmContext;
-import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.taskmgmt.exe.TaskInstance;
@@ -104,16 +102,7 @@
*/
public void createProcess(String processDefinitionName)
{
- JbpmContext jbpmContext = ManagedJbpmContext.instance();
-
- ProcessDefinition pd = jbpmContext.getGraphSession().findLatestProcessDefinition(processDefinitionName);
- if ( pd == null )
- {
- throw new IllegalArgumentException( "Unknown process definition: " + processDefinitionName );
- }
-
- ProcessInstance process = pd.createProcessInstance();
- jbpmContext.save(process);
+ ProcessInstance process = ManagedJbpmContext.instance().newProcessInstanceForUpdate(processDefinitionName);
setProcessId( process.getId() );
// need to set process variables before the signal
Contexts.getBusinessProcessContext().flush();
1.21 +4 -5 jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedJbpmContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ManagedJbpmContext.java 24 Nov 2006 23:15:17 -0000 1.20
+++ ManagedJbpmContext.java 14 Dec 2006 13:08:57 -0000 1.21
@@ -36,7 +36,7 @@
* Manages a reference to a JbpmSession.
*
* @author <a href="mailto:steve at hibernate.org">Steve Ebersole </a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.jbpmContext")
@@ -91,9 +91,9 @@
{
jbpmContext.save(processInstance);
}
- log.debug( "flushing business process context" );
Contexts.getBusinessProcessContext().flush();
jbpmContext.getSession().flush();
+ log.debug( "done flushing seam managed jBPM context" );
}
public void afterCompletion(int status) {
@@ -104,9 +104,8 @@
public void destroy()
{
log.debug( "destroying seam managed jBPM context" );
- //jbpmContext.setRollbackOnly(); //TODO: this currently has no effect (bug in jBPM)
- jbpmContext.getSession().clear(); //WORKAROUND for jBPM bug, prevent flushing of session!
jbpmContext.close();
+ log.debug( "done destroying seam managed jBPM context" );
}
public static JbpmContext instance()
1.15 +1 -3 jboss-seam/src/main/org/jboss/seam/core/PooledTask.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PooledTask.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PooledTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- PooledTask.java 24 Nov 2006 23:15:17 -0000 1.14
+++ PooledTask.java 14 Dec 2006 13:08:57 -0000 1.15
@@ -87,9 +87,7 @@
.get("taskId");
return taskId==null ?
null :
- ManagedJbpmContext.instance()
- .getTaskMgmtSession()
- .loadTaskInstance( Long.parseLong(taskId) );
+ ManagedJbpmContext.instance().getTaskInstanceForUpdate( Long.parseLong(taskId) );
}
}
1.8 +2 -8 jboss-seam/src/main/org/jboss/seam/core/PooledTaskInstanceList.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PooledTaskInstanceList.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PooledTaskInstanceList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PooledTaskInstanceList.java 24 Nov 2006 23:15:17 -0000 1.7
+++ PooledTaskInstanceList.java 14 Dec 2006 13:08:57 -0000 1.8
@@ -4,7 +4,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
@@ -30,13 +29,8 @@
@Transactional
public List<TaskInstance> getPooledTaskInstanceList()
{
- List<TaskInstance> pooledTaskInstanceList = new ArrayList<TaskInstance>();
- Set<String> actorIds = Actor.instance().getGroupActorIds();
- for (String actorId: actorIds )
- {
- pooledTaskInstanceList.addAll( ManagedJbpmContext.instance().getTaskMgmtSession().findPooledTaskInstances(actorId) );
- }
- return pooledTaskInstanceList;
+ return ManagedJbpmContext.instance()
+ .getGroupTaskList( new ArrayList( Actor.instance().getGroupActorIds() ) );
}
}
1.19 +2 -2 jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProcessInstance.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ProcessInstance.java 24 Nov 2006 23:15:17 -0000 1.18
+++ ProcessInstance.java 14 Dec 2006 13:08:57 -0000 1.19
@@ -24,7 +24,7 @@
* jBPM ProcessInstance.
*
* @author Gavin King
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
@Scope(ScopeType.APPLICATION)
@Name("org.jboss.seam.core.processInstance")
@@ -49,7 +49,7 @@
{
//TODO: do we need to cache this??
//TODO: use getProcessInstance(), which returns null!
- return ManagedJbpmContext.instance().getGraphSession().loadProcessInstance(processId);
+ return ManagedJbpmContext.instance().getProcessInstanceForUpdate(processId);
}
else
{
1.18 +2 -2 jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskInstance.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- TaskInstance.java 24 Nov 2006 23:15:17 -0000 1.17
+++ TaskInstance.java 14 Dec 2006 13:08:57 -0000 1.18
@@ -24,7 +24,7 @@
* jBPM TaskInstance.
*
* @author Gavin King
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
@Scope(ScopeType.APPLICATION)
@Name("org.jboss.seam.core.taskInstance")
@@ -49,7 +49,7 @@
{
//TODO: do we need to cache this??
//TODO: use getTaskInstance(), which returns null!
- return ManagedJbpmContext.instance().getTaskMgmtSession().loadTaskInstance(taskId);
+ return ManagedJbpmContext.instance().getTaskInstanceForUpdate(taskId);
}
else
{
1.14 +1 -4 jboss-seam/src/main/org/jboss/seam/core/TaskInstanceList.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskInstanceList.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstanceList.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- TaskInstanceList.java 1 Dec 2006 11:34:05 -0000 1.13
+++ TaskInstanceList.java 14 Dec 2006 13:08:57 -0000 1.14
@@ -3,7 +3,6 @@
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-import java.util.ArrayList;
import java.util.List;
import org.jboss.seam.annotations.Install;
@@ -38,9 +37,7 @@
{
if ( actorId == null ) return null;
- List<TaskInstance> list = new ArrayList<TaskInstance>();
- list.addAll( ManagedJbpmContext.instance().getTaskMgmtSession().findTaskInstances(actorId) );
- return list;
+ return ManagedJbpmContext.instance().getTaskList(actorId);
}
}
1.13 +1 -1 jboss-seam/src/main/org/jboss/seam/core/TaskInstanceListForType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskInstanceListForType.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstanceListForType.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TaskInstanceListForType.java 24 Nov 2006 23:15:17 -0000 1.12
+++ TaskInstanceListForType.java 14 Dec 2006 13:08:57 -0000 1.13
@@ -40,7 +40,7 @@
if ( actorId == null ) return null;
Map<String, List<TaskInstance>> map = new HashMap<String, List<TaskInstance>>();
- List<TaskInstance> taskInstances = ManagedJbpmContext.instance().getTaskMgmtSession().findTaskInstances(actorId);
+ List<TaskInstance> taskInstances = ManagedJbpmContext.instance().getTaskList(actorId);
for ( TaskInstance task: taskInstances )
{
String name = task.getName();
More information about the jboss-cvs-commits
mailing list