Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


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

source/java/org/alfresco/service/cmr/workflow/LazyActivitiWorkflowTask.java

@@ -205,7 +205,7 @@ public class LazyActivitiWorkflowTask extends WorkflowTask
 			} 
 			else if(WorkflowModel.PROP_TASK_ID.equals(key)) 
 			{
-				return id;
+				return getId();
 			} 
 			else
 			{
@@ -248,6 +248,18 @@ public class LazyActivitiWorkflowTask extends WorkflowTask
 			return ensureProperties().values();
 		}
 		
+		private String getId()
+		{
+			if(task != null)
+			{
+				return task.getId();
+			}
+			else
+			{
+				return historicTask.getExecutionId();
+			}
+		}
+		
 		private Date getDueDate()
 		{
 			if(task != null)

source/java/org/alfresco/service/cmr/workflow/WorkflowService.java

@@ -634,6 +634,15 @@ public interface WorkflowService
     @Auditable(parameters = {"packageItem", "active"})
     public List<NodeRef> getPackageContents(String taskId);
     
+     /**
+     * Get a list of node refs to all the package contents.
+     * 
+     * @param packageRef the nodeRef to the package
+     * @return A list of nodeRefs the package is referring to
+     */
+    @Auditable(parameters = {"packageRef"})
+    public List<NodeRef> getPackageContents(NodeRef packageRef);
+    
     /**
      * @return true, if all workflows (in workflowDeployers) have a copy deployed per tenant and workflows
      * can be deployed in tenant. False when workflows are shared system-wide, regardless of the tenant context.