Renamed "work item" to "task"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -585,13 +585,6 @@ checkout_warn=Note: You will lose any changes already made to this document.
 local_copy_location=Local copy location
 locate_content_upload=Locate and upload your document to the repository.
 
-# Edit Workflow messages
-modify_workflow_props=Modify Properties of Simple Workflow
-name_approve_step=Name for approve step
-name_reject_step=Name for reject step
-select_reject_step=Do you want to provide a reject step?
-choose_copy_move_location=Choose whether you want to move or copy the content and also the location.
-
 # System Information and admin page messages
 system_info=System Information
 current_user=Current User
@@ -929,6 +922,11 @@ email_space_users=Email Space users
 email_space_users_desc=Send an email to the users and groups assigned to this space.
 
 # Workflow messages
+modify_workflow_props=Modify Properties of Simple Workflow
+name_approve_step=Name for approve step
+name_reject_step=Name for reject step
+select_reject_step=Do you want to provide a reject step?
+choose_copy_move_location=Choose whether you want to move or copy the content and also the location.
 start_workflow=Start Workflow
 start_workflow_wizard=Start New Workflow Wizard
 start_workflow_desc=This wizard helps you start a workflow for an item in the repository.
@@ -943,19 +941,19 @@ start_workflow_finish_instruction=To start the workflow press Finish. To review
 start_workflow_no_metadata=There is no metadata to collect for this particular workflow.
 users_and_roles=Users and their Roles
 resources=Resources
-manage_workitem=Manage WorkItem
+manage_task=Manage Task
-manage_workitem_title=Manage WorkItem
+manage_task_title=Manage Task
-manage_workitem_desc=This dialog allows the work item to be managed
+manage_task_desc=This dialog allows the task to be managed.
-workitem_properties=Work Item Properties
+task_properties=Task Properties
 id=Id
 status=Status
 completed=Completed
 source=Source
 priority=Priority
-my_workitems_todo_title=My Work Items To Do
+my_tasks_todo_title=My Tasks To Do
-my_workitems_todo_desc=List of your workflow items still to complete
+my_tasks_todo_desc=List of your tasks still to complete
-my_workitems_completed_title=My Completed Work Items
+my_tasks_completed_title=My Completed Tasks
-my_workitems_completed_desc=List of your completed workflow items
+my_tasks_completed_desc=List of your completed tasks
 due_date=Due Date
 completed_on=Completed on
 outcome=Outcome
@@ -964,10 +962,10 @@ cancel_workflow=Cancel Workflow
 cancel_workflow_info=To cancel this workflow, click OK.
 cancel_workflow_confirm=Are you sure you want to cancel the \"{0}\" workflow?
 error_cancel_workflow=Unable to cancel the workflow due to system error:
-reassign_workitem_title=Reassign Work Item
+reassign_task_title=Reassign Task
-reassign_workitem_desc=This dialog allows you to reassign a work item.
+reassign_task_desc=This dialog allows you to reassign a task.
-reassign_select_user=Select the user to assign the work item to, then press OK.
+reassign_select_user=Select the user to assign the task to, then press OK.
-error_reassign_workitem=Unable to reassign the work item due to system error:
+error_reassign_task=Unable to reassign the task due to system error:
 part_of_workflow=Part of Workflow
 initiated_by=Initiated by
 start_date=Start date

config/alfresco/web-client-config-workflow.xml

@@ -43,7 +43,7 @@
    <config evaluator="node-type" condition="wf:submitAdhocTask">
       <property-sheet>
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
-         <show-property name="wf:adhocDescription" ignore-if-missing="false" />
+         <show-property name="wf:adhocDescription" ignore-if-missing="false" component-generator="TextAreaGenerator" />
          <show-property name="wf:adhocPriority" ignore-if-missing="false" />
          <show-property name="wf:adhocDueDate" ignore-if-missing="false" />
          <show-property name="wf:notifyMe" />
@@ -56,7 +56,7 @@
       <property-sheet>
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" ignore-if-missing="false" />
-         <show-property name="wf:adhocDescription" ignore-if-missing="false" />
+         <show-property name="wf:adhocDescription" ignore-if-missing="false" component-generator="TextAreaGenerator" />
          <show-property name="bpm:status" ignore-if-missing="false" />
          <show-property name="bpm:dueDate" ignore-if-missing="false" />
          <show-property name="bpm:priority" ignore-if-missing="false" />
@@ -67,7 +67,7 @@
       <property-sheet>
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" ignore-if-missing="false" />
-         <show-property name="wf:adhocDescription" ignore-if-missing="false" />
+         <show-property name="wf:adhocDescription" ignore-if-missing="false" component-generator="TextAreaGenerator" />
          <show-property name="bpm:dueDate" ignore-if-missing="false" />
          <show-property name="bpm:priority" ignore-if-missing="false" />
       </property-sheet>
@@ -89,13 +89,13 @@
             </params>
          </action>
          
-         <action id="reassign_workflow">
+         <action id="reassign_task">
             <label-id>reassign</label-id>
-            <image>/images/icons/reassign_workflow_item.gif</image>
+            <image>/images/icons/reassign_task.gif</image>
-            <action>dialog:reassignWorkItem</action>
+            <action>dialog:reassignTask</action>
             <action-listener>#{DialogManager.setupParameters}</action-listener>
             <params>
-               <param name="workitem-id">#{actionContext.id}</param>
+               <param name="task-id">#{actionContext.id}</param>
             </params>
          </action>
          
@@ -134,7 +134,7 @@
          </action-group>
          
          <action-group id="dashlet_todo_actions">
-            <action idref="reassign_workflow" />
+            <action idref="reassign_task" />
          </action-group>
          
          <action-group id="dashlet_completed_actions">
@@ -201,17 +201,17 @@
    
    <config>
       <dialogs>
-         <dialog name="manageWorkItem" page="/jsp/workflow/manage-workitem-dialog.jsp"
+         <dialog name="manageTask" page="/jsp/workflow/manage-task-dialog.jsp"
-                 managed-bean="ManageWorkItemDialog" icon="/images/icons/manage_workflow_item_large.gif" 
+                 managed-bean="ManageTaskDialog" icon="/images/icons/manage_workflow_task_large.gif" 
-                 title-id="manage_workitem_title" description-id="manage_workitem_desc" />
+                 title-id="manage_task_title" description-id="manage_task_desc" />
                  
          <dialog name="cancelWorkflow" page="/jsp/workflow/cancel-workflow-dialog.jsp"
                  managed-bean="CancelWorkflowDialog" icon="/images/icons/cancel_workflow_large.gif" 
                  title-id="cancel_workflow" description-id="cancel_workflow_info" />
                  
-         <dialog name="reassignWorkItem" page="/jsp/workflow/reassign-workitem-dialog.jsp"
+         <dialog name="reassignTask" page="/jsp/workflow/reassign-task-dialog.jsp"
-                 managed-bean="ReassignWorkItemDialog" icon="/images/icons/reassign_workflow_item_large.gif" 
+                 managed-bean="ReassignTaskDialog" icon="/images/icons/reassign_workflow_task_large.gif" 
-                 title-id="reassign_workitem_title" description-id="reassign_workitem_desc" />
+                 title-id="reassign_task_title" description-id="reassign_task_desc" />
       </dialogs>
    </config>
    

config/alfresco/web-client-config.xml

@@ -189,10 +189,10 @@
             <dashlet id="getting-started" label-id="dashlet_gettingstarted_label"
                   description-id="dashlet_gettingstarted_desc"
                   jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" />
-            <dashlet id="workitems-todo" label-id="my_workitems_todo_title" description-id="my_workitems_todo_desc"
+            <dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
-                  jsp="/jsp/workflow/workitems-todo-dashlet.jsp" allow-narrow="false" />
+                  jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
-            <dashlet id="workitems-completed" label-id="my_workitems_completed_title" description-id="my_workitems_completed_desc"
+            <dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
-                  jsp="/jsp/workflow/workitems-completed-dashlet.jsp" allow-narrow="false" />
+                  jsp="/jsp/workflow/tasks-completed-dashlet.jsp" allow-narrow="false" />
             <!-- TEMP! -->
             <dashlet id="my-docs-template" label="My Documents"
                   description="My Documents Template Page"

source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java

@@ -39,20 +39,20 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Bean implementation for the "Manage WorkItem" dialog.
+ * Bean implementation for the "Manage Task" dialog.
  * 
  * @author gavinc
  */
-public class ManageWorkItemDialog extends BaseDialogBean
+public class ManageTaskDialog extends BaseDialogBean
 {
    protected WorkflowService workflowService;
-   protected Node workItemNode;
+   protected Node taskNode;
-   protected WorkflowTask workItem;
+   protected WorkflowTask task;
    protected WorkflowInstance workflowInstance;
    protected WorkflowTransition[] transitions;
    protected NodeRef workflowPackage;
    protected List<Node> resources;
-   protected WorkItemCompleteResolver completeResolver = new WorkItemCompleteResolver();
+   protected TaskCompleteResolver completeResolver = new TaskCompleteResolver();
    protected UIRichList packageItemsRichList;
    protected List<String> packageItemsToAdd;
    protected List<String> packageItemsToRemove;
@@ -62,7 +62,7 @@ public class ManageWorkItemDialog extends BaseDialogBean
    protected static final String ID_PREFIX = "transition_";
    protected static final String CLIENT_ID_PREFIX = "dialog:" + ID_PREFIX;
    
-   private static final Log logger = LogFactory.getLog(ManageWorkItemDialog.class);
+   private static final Log logger = LogFactory.getLog(ManageTaskDialog.class);
 
    // ------------------------------------------------------------------------------
    // Dialog implementation
@@ -73,8 +73,8 @@ public class ManageWorkItemDialog extends BaseDialogBean
       super.init(parameters);
       
       // reset variables
-      this.workItem = null;
+      this.task = null;
-      this.workItemNode = null;
+      this.taskNode = null;
       this.workflowInstance = null;
       this.transitions = null;
       this.workflowPackage = null;
@@ -90,20 +90,20 @@ public class ManageWorkItemDialog extends BaseDialogBean
       
       // get the task details
       String taskId = this.parameters.get("id");
-      this.workItem = this.workflowService.getTaskById(taskId);
+      this.task = this.workflowService.getTaskById(taskId);
       
-      if (this.workItem != null)
+      if (this.task != null)
       {
-         // setup a transient node to represent the work item we're managing
+         // setup a transient node to represent the task we're managing
-         WorkflowTaskDefinition taskDef = this.workItem.definition;
+         WorkflowTaskDefinition taskDef = this.task.definition;
-         this.workItemNode = new TransientNode(taskDef.metadata.getName(),
+         this.taskNode = new TransientNode(taskDef.metadata.getName(),
-                  "task_" + System.currentTimeMillis(), this.workItem.properties);
+                  "task_" + System.currentTimeMillis(), this.task.properties);
          
-         // get access to the workflow instance for the work item
+         // get access to the workflow instance for the task
-         this.workflowInstance = this.workItem.path.instance;
+         this.workflowInstance = this.task.path.instance;
          
          // setup the workflow package for the task
-         Serializable obj = this.workItem.properties.get(WorkflowModel.ASSOC_PACKAGE);
+         Serializable obj = this.task.properties.get(WorkflowModel.ASSOC_PACKAGE);
          // TODO: remove this workaroud where JBPM may return a String and not the NodeRef
          if (obj instanceof NodeRef)
          {
@@ -115,8 +115,8 @@ public class ManageWorkItemDialog extends BaseDialogBean
          }
          
          if (logger.isDebugEnabled())
-            logger.debug("Found workflow package for work item '" + 
+            logger.debug("Found workflow package for task '" + 
-                  this.workItem.id + "': " + this.workflowPackage );
+                  this.task.id + "': " + this.workflowPackage );
       }
    }
    
@@ -125,10 +125,10 @@ public class ManageWorkItemDialog extends BaseDialogBean
          throws Exception
    {
       if (logger.isDebugEnabled())
-         logger.debug("Saving task: " + this.workItem.id);
+         logger.debug("Saving task: " + this.task.id);
       
       // prepare the edited parameters for saving
-      Map<QName, Serializable> params = WorkflowBean.prepareWorkItemParams(this.workItemNode);
+      Map<QName, Serializable> params = WorkflowBean.prepareTaskParams(this.taskNode);
       
       // remove any items the user selected to remove 
       if (this.workflowPackage != null && this.packageItemsToRemove != null && 
@@ -155,7 +155,7 @@ public class ManageWorkItemDialog extends BaseDialogBean
       }
       
       // update the task with the updated parameters
-      this.workflowService.updateTask(this.workItem.id, params, null, null);
+      this.workflowService.updateTask(this.task.id, params, null, null);
       
       return outcome;
    }
@@ -165,11 +165,11 @@ public class ManageWorkItemDialog extends BaseDialogBean
    {
       List<DialogButtonConfig> buttons = null;
 
-      if (this.workItem != null)
+      if (this.task != null)
       {
-         // get the transitions available from this work item and 
+         // get the transitions available from this task and 
          // show them in the dialog as additional buttons
-         this.transitions = this.workItem.path.node.transitions;
+         this.transitions = this.task.path.node.transitions;
 
          if (this.transitions != null)
          {
@@ -207,7 +207,7 @@ public class ManageWorkItemDialog extends BaseDialogBean
       String outcome = getDefaultFinishOutcome();
       
       if (logger.isDebugEnabled())
-         logger.debug("Transitioning work item: " + this.workItemNode.getId());
+         logger.debug("Transitioning task: " + this.taskNode.getId());
       
       // to find out which transition button was pressed we need
       // to look for the button's id in the request parameters,
@@ -237,19 +237,19 @@ public class ManageWorkItemDialog extends BaseDialogBean
             tx.begin();
             
             // prepare the edited parameters for saving
-            Map<QName, Serializable> params = WorkflowBean.prepareWorkItemParams(this.workItemNode);
+            Map<QName, Serializable> params = WorkflowBean.prepareTaskParams(this.taskNode);
       
             // update the task with the updated parameters
-            this.workflowService.updateTask(this.workItem.id, params, null, null);
+            this.workflowService.updateTask(this.task.id, params, null, null);
          
             // signal the selected transition to the workflow task
-            this.workflowService.endTask(this.workItem.id, selectedTransition);
+            this.workflowService.endTask(this.task.id, selectedTransition);
             
             // commit the changes
             tx.commit();
             
             if (logger.isDebugEnabled())
-               logger.debug("Ended work item with transition: " + selectedTransition);
+               logger.debug("Ended task with transition: " + selectedTransition);
          }
          catch (Throwable e)
          {
@@ -428,13 +428,13 @@ public class ManageWorkItemDialog extends BaseDialogBean
    }
    
    /**
-    * Returns the Node representing the work item
+    * Returns the Node representing the task
     * 
     * @return The node
     */
-   public Node getWorkItemNode()
+   public Node getTaskNode()
    {
-      return this.workItemNode;
+      return this.taskNode;
    }
    
    /**
@@ -454,7 +454,7 @@ public class ManageWorkItemDialog extends BaseDialogBean
     */
    public String getPackageActionGroup()
    {
-      return (String)this.workItem.properties.get(
+      return (String)this.task.properties.get(
             WorkflowModel.PROP_PACKAGE_ACTION_GROUP);
    }
    
@@ -465,12 +465,12 @@ public class ManageWorkItemDialog extends BaseDialogBean
     */
    public String getPackageItemActionGroup()
    {
-      return (String)this.workItem.properties.get(
+      return (String)this.task.properties.get(
             WorkflowModel.PROP_PACKAGE_ITEM_ACTION_GROUP);
    }
    
    /**
-    * Returns a list of resources associated with this work item
+    * Returns a list of resources associated with this task
     * i.e. the children of the workflow package
     * 
     * @return The list of nodes
@@ -568,7 +568,7 @@ public class ManageWorkItemDialog extends BaseDialogBean
       }
       else if (logger.isDebugEnabled())
       {
-         logger.debug("Failed to find workflow package for work item: " + this.workItem.id);
+         logger.debug("Failed to find workflow package for task: " + this.task.id);
       }
       
       return this.resources;
@@ -610,13 +610,13 @@ public class ManageWorkItemDialog extends BaseDialogBean
    /**
     * Property resolver to determine if the given node has been flagged as complete
     */
-   protected class WorkItemCompleteResolver implements NodePropertyResolver
+   protected class TaskCompleteResolver implements NodePropertyResolver
    {
       public Object get(Node node)
       {
          String result = Application.getMessage(FacesContext.getCurrentInstance(), "no");
          
-         List<NodeRef> completedItems = (List<NodeRef>)workItem.properties.get(
+         List<NodeRef> completedItems = (List<NodeRef>)task.properties.get(
                WorkflowModel.PROP_COMPLETED_ITEMS);
          
          if (completedItems != null && completedItems.size() > 0 && 

source/java/org/alfresco/web/bean/workflow/ReassignTaskDialog.java

@@ -29,18 +29,18 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Bean implementation for the "Reassign Work Item" dialog
+ * Bean implementation for the "Reassign Task" dialog
  * 
  * @author gavinc
  */
-public class ReassignWorkItemDialog extends BaseDialogBean
+public class ReassignTaskDialog extends BaseDialogBean
 {
-   protected String workItemId;
+   protected String taskId;
    
    protected WorkflowService workflowService;
    protected PersonService personService;
    
-   private static final Log logger = LogFactory.getLog(ReassignWorkItemDialog.class);   
+   private static final Log logger = LogFactory.getLog(ReassignTaskDialog.class);   
 
    // ------------------------------------------------------------------------------
    // Dialog implementation
@@ -50,10 +50,10 @@ public class ReassignWorkItemDialog extends BaseDialogBean
    {
       super.init(parameters);
       
-      this.workItemId = this.parameters.get("workitem-id");
+      this.taskId = this.parameters.get("task-id");
-      if (this.workItemId == null || this.workItemId.length() == 0)
+      if (this.taskId == null || this.taskId.length() == 0)
       {
-         throw new IllegalArgumentException("Reassign workitem dialog called without task id");
+         throw new IllegalArgumentException("Reassign task dialog called without task id");
       }
    }
    
@@ -62,7 +62,7 @@ public class ReassignWorkItemDialog extends BaseDialogBean
          throws Exception
    {
       if (logger.isDebugEnabled())
-         logger.debug("Reassigning work item with id: " + this.workItemId);
+         logger.debug("Reassigning task with id: " + this.taskId);
       
       UIComponent picker = context.getViewRoot().findComponent("dialog:dialog-body:user-picker");
       
@@ -76,7 +76,7 @@ public class ReassignWorkItemDialog extends BaseDialogBean
             String userName = user[0];
             Map<QName, Serializable> params = new HashMap<QName, Serializable>(1);
             params.put(ContentModel.PROP_OWNER, userName);
-            this.workflowService.updateTask(this.workItemId, params, null, null);
+            this.workflowService.updateTask(this.taskId, params, null, null);
          }
          else
          {
@@ -91,7 +91,7 @@ public class ReassignWorkItemDialog extends BaseDialogBean
       }
       
       if (logger.isDebugEnabled())
-         logger.debug("Reassigning work item with id: " + this.workItemId);
+         logger.debug("Reassigning task with id: " + this.taskId);
       
       return outcome;
    }
@@ -99,7 +99,7 @@ public class ReassignWorkItemDialog extends BaseDialogBean
    @Override
    protected String getErrorMessageId()
    {
-      return "error_reassign_workitem";
+      return "error_reassign_task";
    }
    
    // ------------------------------------------------------------------------------

source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java

@@ -115,7 +115,7 @@ public class StartWorkflowWizard extends BaseWizardBean
          logger.debug("Starting workflow: " + this.selectedWorkflow);
       
       // prepare the parameters from the current state of the property sheet
-      Map<QName, Serializable> params = WorkflowBean.prepareWorkItemParams(this.startTaskNode);
+      Map<QName, Serializable> params = WorkflowBean.prepareTaskParams(this.startTaskNode);
       
       // create a workflow package for the attached items and add them
       if (this.packageItemsToAdd.size() > 0)
@@ -472,7 +472,7 @@ public class StartWorkflowWizard extends BaseWizardBean
    }
 
    /**
-    * Returns a list of resources associated with this work item
+    * Returns a list of resources associated with this task
     * i.e. the children of the workflow package
     * 
     * @return The list of nodes

source/java/org/alfresco/web/bean/workflow/WorkflowBean.java

@@ -39,8 +39,8 @@ public class WorkflowBean
 {
    protected NodeService nodeService;
    protected WorkflowService workflowService;
-   protected List<Node> workItems;
+   protected List<Node> tasks;
-   protected List<Node> completedWorkItems;
+   protected List<Node> completedTasks;
    
    private static final Log logger = LogFactory.getLog(WorkflowBean.class);
    
@@ -48,12 +48,12 @@ public class WorkflowBean
    // Bean Getters and Setters
    
    /**
-    * Returns a list of nodes representing the to do work items the 
+    * Returns a list of nodes representing the to do tasks the 
     * current user has.
     * 
-    * @return List of to do work items
+    * @return List of to do tasks
     */
-   public List<Node> getWorkItemsToDo()
+   public List<Node> getTasksToDo()
    {
       // get the current username
       FacesContext context = FacesContext.getCurrentInstance();
@@ -71,14 +71,14 @@ public class WorkflowBean
                userName, WorkflowTaskState.IN_PROGRESS);
          
          // create a list of transient nodes to represent
-         this.workItems = new ArrayList<Node>(tasks.size());
+         this.tasks = new ArrayList<Node>(tasks.size());
          for (WorkflowTask task : tasks)
          {
-            Node node = createWorkItem(task);
+            Node node = createTask(task);
-            this.workItems.add(node);
+            this.tasks.add(node);
             
             if (logger.isDebugEnabled())
-               logger.debug("Added to do work item: " + node);
+               logger.debug("Added to do task: " + node);
          }
          
          // commit the changes
@@ -88,19 +88,19 @@ public class WorkflowBean
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
-         Utils.addErrorMessage("Failed to get to do work items: " + e.toString(), e);
+         Utils.addErrorMessage("Failed to get to do tasks: " + e.toString(), e);
       }
       
-      return this.workItems;
+      return this.tasks;
    }
    
    /**
-    * Returns a list of nodes representing the completed work items the 
+    * Returns a list of nodes representing the completed tasks the 
     * current user has.
     * 
-    * @return List of completed work items
+    * @return List of completed tasks
     */
-   public List<Node> getWorkItemsCompleted()
+   public List<Node> getTasksCompleted()
    {
       // get the current username
       FacesContext context = FacesContext.getCurrentInstance();
@@ -118,14 +118,14 @@ public class WorkflowBean
                userName, WorkflowTaskState.COMPLETED);
          
          // create a list of transient nodes to represent
-         this.completedWorkItems = new ArrayList<Node>(tasks.size());
+         this.completedTasks = new ArrayList<Node>(tasks.size());
          for (WorkflowTask task : tasks)
          {
-            Node node = createWorkItem(task);
+            Node node = createTask(task);
-            this.completedWorkItems.add(node);
+            this.completedTasks.add(node);
             
             if (logger.isDebugEnabled())
-               logger.debug("Added completed work item: " + node);
+               logger.debug("Added completed task: " + node);
          }
          
          // commit the changes
@@ -135,10 +135,10 @@ public class WorkflowBean
       {
          // rollback the transaction
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
-         Utils.addErrorMessage("Failed to get completed work items: " + e.toString(), e);
+         Utils.addErrorMessage("Failed to get completed tasks: " + e.toString(), e);
       }
       
-      return this.completedWorkItems;
+      return this.completedTasks;
    }
    
    /**
@@ -164,7 +164,7 @@ public class WorkflowBean
    // ------------------------------------------------------------------------------
    // Helper methods
 
-   public static Map<QName, Serializable> prepareWorkItemParams(Node node)
+   public static Map<QName, Serializable> prepareTaskParams(Node node)
    {
       Map<QName, Serializable> params = new HashMap<QName, Serializable>();
       
@@ -211,7 +211,7 @@ public class WorkflowBean
     * 
     * @param task The task to create a representation of
     */
-   protected TransientMapNode createWorkItem(WorkflowTask task)
+   protected TransientMapNode createTask(WorkflowTask task)
    {
       // get the type of the task
       WorkflowTaskDefinition taskDef = task.definition;

source/web/WEB-INF/faces-config-beans.xml

@@ -1704,10 +1704,10 @@
    
    <managed-bean>
       <description>
-         The bean that backs up the Manage WorkItem Dialog
+         The bean that backs up the Manage Task Dialog
       </description>
-      <managed-bean-name>ManageWorkItemDialog</managed-bean-name>
+      <managed-bean-name>ManageTaskDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.workflow.ManageWorkItemDialog</managed-bean-class>
+      <managed-bean-class>org.alfresco.web.bean.workflow.ManageTaskDialog</managed-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
       <managed-property>
          <property-name>nodeService</property-name>
@@ -1824,10 +1824,10 @@
    
    <managed-bean>
       <description>
-         The bean that backs up the Reassign Work Item Dialog
+         The bean that backs up the Reassign Task Dialog
       </description>
-      <managed-bean-name>ReassignWorkItemDialog</managed-bean-name>
+      <managed-bean-name>ReassignTaskDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.workflow.ReassignWorkItemDialog</managed-bean-class>
+      <managed-bean-class>org.alfresco.web.bean.workflow.ReassignTaskDialog</managed-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
       <managed-property>
          <property-name>nodeService</property-name>

source/web/jsp/workflow/manage-task-dialog.jsp

@@ -19,11 +19,11 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<a:panel id="props-panel" label="#{msg.workitem_properties}" 
+<a:panel id="props-panel" label="#{msg.task_properties}" 
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
    
-   <r:propertySheetGrid id="work-item-props" value="#{DialogManager.bean.workItemNode}" 
+   <r:propertySheetGrid id="task-props" value="#{DialogManager.bean.taskNode}"
-                       var="workItemProps" columns="1" externalConfig="true" />
+                       var="taskProps" columns="1" externalConfig="true" />
 </a:panel>
 
 <h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" />
@@ -108,7 +108,7 @@
    </a:richList>
 
    <h:panelGrid columns="1" styleClass="paddingRow">
-      <r:actions context="#{DialogManager.bean.workItemNode}" value="#{DialogManager.bean.packageActionGroup}" />
+      <r:actions context="#{DialogManager.bean.taskNode}" value="#{DialogManager.bean.packageActionGroup}" />
    </h:panelGrid>
    
    <h:panelGrid columns="1" rendered="#{DialogManager.bean.itemBeingAdded}" styleClass="selector" style="margin-top: 6px;">

source/web/jsp/workflow/tasks-completed-dashlet.jsp

@@ -3,7 +3,7 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<a:richList id="completed-work-items-list" viewMode="details" value="#{WorkflowBean.workItemsCompleted}" var="r"
+<a:richList id="tasks-completed-list" viewMode="details" value="#{WorkflowBean.tasksCompleted}" var="r"
             styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
             altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
             initialSortColumn="name" initialSortDescending="true">
@@ -14,7 +14,7 @@
          <a:sortLink label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
       </f:facet>
       <f:facet name="small-icon">
-         <h:graphicImage url="/images/icons/completed_workflow_item.gif" />
+         <h:graphicImage url="/images/icons/completed_workflow_task.gif" />
       </f:facet>
       <h:outputText value="#{r.name}" />
    </a:column>
@@ -64,5 +64,3 @@
    
    <a:dataPager styleClass="pager" />
 </a:richList>
-
-<h:message for="completed-work-items-list" styleClass="statusMessage" />

source/web/jsp/workflow/tasks-todo-dashlet.jsp

@@ -3,7 +3,7 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<a:richList id="work-items-list" viewMode="details" value="#{WorkflowBean.workItemsToDo}" var="r"
+<a:richList id="tasks-todo-list" viewMode="details" value="#{WorkflowBean.tasksToDo}" var="r"
             styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
             altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
             initialSortColumn="name" initialSortDescending="true">
@@ -15,14 +15,14 @@
       </f:facet>
       <f:facet name="small-icon">
          <h:panelGroup>
-            <a:actionLink value="#{r.name}" image="/images/icons/workflow_item.gif" showLink="false"
+            <a:actionLink value="#{r.name}" image="/images/icons/workflow_task.gif" showLink="false"
-                          actionListener="#{DialogManager.setupParameters}" action="dialog:manageWorkItem">
+                          actionListener="#{DialogManager.setupParameters}" action="dialog:manageTask">
                <f:param name="id" value="#{r.id}" />
             </a:actionLink>
          </h:panelGroup>
       </f:facet>
       <a:actionLink value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
-                    action="dialog:manageWorkItem">
+                    action="dialog:manageTask">
          <f:param name="id" value="#{r.id}" />
       </a:actionLink>
    </a:column>
@@ -80,5 +80,3 @@
    
    <a:dataPager styleClass="pager" />
 </a:richList>
-
-<h:message for="work-items-list" styleClass="statusMessage" />