[jbpm-commits] JBoss JBPM SVN: r4672 - in jbpm4/trunk/modules: integration/console/src/main/java/org/jbpm/integration/console and 3 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-04-29 05:46:59 -0400 (Wed, 29 Apr 2009)
New Revision: 4672

Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
   jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
Log:
JBPM-2180 added task form

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java	2009-04-29 09:41:39 UTC (rev 4671)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java	2009-04-29 09:46:59 UTC (rev 4672)
@@ -23,7 +23,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.net.URL;
 
 /** runtime task.
  * 
@@ -50,7 +49,7 @@
   int getPriority();
   void setPriority(int priority);
 
-  URL getURL();
-  void setURL(URL url);
+  String getForm();
+  void setForm(String form);
 
 }
\ No newline at end of file

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-04-29 09:41:39 UTC (rev 4671)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-04-29 09:46:59 UTC (rev 4672)
@@ -150,7 +150,7 @@
     }
 
     // task form url
-    String url = t0.getURL()!=null ? t0.getURL().toExternalForm() : "";
+    String url = t0.getForm()!=null ? t0.getForm() : "";
     task.setUrl( url );
     
     return task;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java	2009-04-29 09:41:39 UTC (rev 4671)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/model/JpdlExecution.java	2009-04-29 09:46:59 UTC (rev 4672)
@@ -84,6 +84,7 @@
 
     task.setDescription(taskDefinition.getDescription());
     task.setPriority(taskDefinition.getPriority());
+    task.setForm(taskDefinition.getForm());
     
     SwimlaneDefinitionImpl swimlaneDefinition = taskDefinition.getSwimlaneDefinition();
     if (swimlaneDefinition!=null) {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-04-29 09:41:39 UTC (rev 4671)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-04-29 09:46:59 UTC (rev 4672)
@@ -21,13 +21,25 @@
  */
 package org.jbpm.pvm.internal.task;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import org.jbpm.api.Execution;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.env.Environment;
 import org.jbpm.api.model.Comment;
 import org.jbpm.api.session.TaskDbSession;
-import org.jbpm.api.task.*;
-import org.jbpm.internal.log.Log;
+import org.jbpm.api.task.Assignable;
+import org.jbpm.api.task.OpenTask;
+import org.jbpm.api.task.Participation;
+import org.jbpm.api.task.Swimlane;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.task.TaskHandler;
 import org.jbpm.pvm.internal.history.events.TaskCancel;
 import org.jbpm.pvm.internal.history.events.TaskComplete;
 import org.jbpm.pvm.internal.history.events.TaskStart;
@@ -39,10 +51,6 @@
 import org.jbpm.pvm.internal.util.Priority;
 import org.jbpm.pvm.internal.wire.WireContext;
 
-import java.io.Serializable;
-import java.net.URL;
-import java.util.*;
-
 /**
  * is one task instance that can be assigned to an actor (read: put in 
  * someones task list) and that can trigger the continuation of execution 
@@ -52,7 +60,7 @@
 
   private static final long serialVersionUID = 1L;
   
-  private static Log log = Log.getLog(TaskImpl.class.getName());
+  // private static Log log = Log.getLog(TaskImpl.class.getName());
   
   private static final TaskHandler DEFAULT_TASK_HANDLER = new TaskHandler(); 
   
@@ -61,9 +69,9 @@
   protected String description;
 
   protected String assignee;
-  protected String nomination;
   protected Set<ParticipationImpl> participations;
 
+  protected String form;
   protected Date create;
   protected Date dueDate;
   protected Integer progress;
@@ -89,8 +97,6 @@
   protected Long executionDbid;
   protected Long superTaskDbid;
 
-  private URL url;
-
   public TaskImpl() {
   }
   
@@ -481,14 +487,10 @@
   public void setSignalling(boolean isSignalling) {
     this.isSignalling = isSignalling;
   }
-
-  public URL getURL()
-  {
-    return this.url;
+  public String getForm() {
+    return form;
   }
-
-  public void setURL(URL url)
-  {
-    this.url=url;
+  public void setForm(String form) {
+    this.form = form;
   }
 }

Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml	2009-04-29 09:41:39 UTC (rev 4671)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml	2009-04-29 09:46:59 UTC (rev 4672)
@@ -77,6 +77,7 @@
     <property name="name" column="NAME_"/>
     <property name="description" column="DESCR_"/>
     <property name="assignee" column="ASSIGNEE_"/>
+    <property name="form" column="FORM_"/>
     
     <set name="participations" cascade="all-delete-orphan">
       <key column="TASK_" />