Heinous merge from HEAD. Seems to basically work. Be on guard however.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/repository/CopyService.java

@@ -39,6 +39,10 @@ public interface CopyService
      * If the new node resides in a different workspace the new node will
      * have the same id.  
      * <p>
+     * <b>NOTE:</b> It is up to the client code to set the name of the newly created node.
+     *              Use the {@link NodeService node service} and catch the
+     *              {@link DuplicateChildNodeNameException}
+     * <p>
      * If the new node resides in the same workspace then
      * the new node will have the Copy aspect applied to it which will 
      * reference the original node.     

source/java/org/alfresco/service/cmr/repository/NodeRef.java

@@ -36,6 +36,15 @@ public final class NodeRef implements EntityRef, Serializable
     private final StoreRef storeRef;
     private final String id;
 
+    /**
+     * @see #NodeRef(StoreRef, String)
+     * @see StoreRef#StoreRef(String, String)
+     */
+    public NodeRef(String protocol, String identifier, String id)
+    {
+        this(new StoreRef(protocol, identifier), id);
+    }
+    
     /**
      * Construct a Node Reference from a Store Reference and Node Id
      * 

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

@@ -33,17 +33,26 @@ public class WorkflowInstance
     /** Workflow Instance unique id */
     public String id;
 
+    /** Workflow Instance description */
+    public String description;
+
     /** Is this Workflow instance still "in-flight" or has it completed? */
     public boolean active;
 
     /** Initiator (cm:person) - null if System initiated */
     public NodeRef initiator;
-
+    
     /** Workflow Start Date */
     public Date startDate;
     
     /** Workflow End Date */
     public Date endDate;
+
+    /** Workflow Package */
+    public NodeRef workflowPackage;
+    
+    /** Workflow Context */
+    public NodeRef context;
     
     /** Workflow Definition */
     public WorkflowDefinition definition;

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

@@ -100,7 +100,7 @@ public interface WorkflowService
      * Gets a Workflow Definition by unique Id
      * 
      * @param workflowDefinitionId  the workflow definition id
-     * @return  the deployed workflow definition
+     * @return  the deployed workflow definition (or null if not found)
      */
     @Auditable(parameters = {"workflowDefinitionId"})
     public WorkflowDefinition getDefinitionById(String workflowDefinitionId);
@@ -109,7 +109,7 @@ public interface WorkflowService
      * Gets a Workflow Definition by unique name
      * 
      * @param workflowName  workflow name e.g. jbpm://review
-     * @return  the deployed workflow definition
+     * @return  the deployed workflow definition (or null if not found)
      */
     @Auditable(parameters = {"workflowName"})
     public WorkflowDefinition getDefinitionByName(String workflowName);
@@ -148,6 +148,15 @@ public interface WorkflowService
      */
     @Auditable(parameters = {"workflowDefinitionId"})
     public List<WorkflowInstance> getActiveWorkflows(String workflowDefinitionId);
+
+    /**
+     * Gets a specific workflow instances
+     *
+     * @param workflowId  the id of the workflow to retrieve
+     * @return  the workflow instance (or null if not found)
+     */
+    @Auditable(parameters = {"workflowId"})
+    public WorkflowInstance getWorkflowById(String workflowId);
     
     /**
      * Gets all Paths for the specified Workflow instance
@@ -195,7 +204,7 @@ public interface WorkflowService
      * Gets a Task by unique Id
      * 
      * @param taskId  the task id
-     * @return  the task
+     * @return  the task (or null, if not found)
      */
     @Auditable(parameters = {"taskId"})
     public WorkflowTask getTaskById(String taskId);
@@ -241,6 +250,11 @@ public interface WorkflowService
     @Auditable(parameters = {"taskId", "transitionId"})
     public WorkflowTask endTask(String taskId, String transitionId);
     
+    
+    //
+    // Package Management
+    //
+    
     /**
      * Create a Workflow Package (a container of content to route through the Workflow).
      * 
@@ -251,5 +265,15 @@ public interface WorkflowService
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"container"})
     public NodeRef createPackage(NodeRef container);
+
+    /**
+     * Gets the Workflows that act upon the specified Repository content.
+     *  
+     * @param packageItem  the repository content item to get workflows for
+     * @param active  true => active workflows only, false => completed workflows only
+     * @return  list of workflows which act upon the specified content
+     */
+    @Auditable(key = Auditable.Key.ARG_0, parameters = {"packageItem", "active"})
+    public List<WorkflowInstance> getWorkflowsForContent(NodeRef packageItem, boolean active);
     
 }