Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3925 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3965 .


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

source/java/org/alfresco/service/ServiceRegistry.java

@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.OwnableService;
 import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.cmr.version.VersionService;
 import org.alfresco.service.cmr.view.ExporterService;
 import org.alfresco.service.cmr.view.ImporterService;
@@ -88,6 +89,7 @@ public interface ServiceRegistry
     static final QName WORKFLOW_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "WorkflowService");
     static final QName AUDIT_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AuditService");
     static final QName OWNABLE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "OwnableService");
+    static final QName PERSON_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "PersonService");
     
     /**
      * Get the list of services provided by the Repository
@@ -280,4 +282,11 @@ public interface ServiceRegistry
      */
     @NotAuditable
     OwnableService getOwnableService();
+    
+    /**
+     * Get the person service (or null if one is not provided)
+     * @return
+     */
+    @NotAuditable
+    PersonService getPersonService();
 }

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);
@@ -153,7 +153,7 @@ public interface WorkflowService
      * Gets a specific workflow instances
      *
      * @param workflowId  the id of the workflow to retrieve
-     * @return  the workflow instance 
+     * @return  the workflow instance (or null if not found)
      */
     @Auditable(parameters = {"workflowId"})
     public WorkflowInstance getWorkflowById(String workflowId);
@@ -204,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);