inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge V1.4 to HEAD

Browse Source 
- Ignored Enterprise-specific changes
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 .
   svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-09-21 23:35:51 +00:00
parent 89f39cd176
commit d2bce74f0b
103 changed files with 3569 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/service/ServiceRegistry.java
View File

@@ -35,6 +35,7 @@ import org.alfresco.service.cmr.search.CategoryService;
import org.alfresco.service.cmr.search.SearchService;
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.version.VersionService;
import org.alfresco.service.cmr.view.ExporterService;
@@ -86,6 +87,7 @@ public interface ServiceRegistry
static final QName SCRIPT_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "ScriptService");
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");
/**
* Get the list of services provided by the Repository
@@ -271,4 +273,11 @@ public interface ServiceRegistry
*/
@NotAuditable
AuditService getAuditService();
/**
* Get the ownable service (or null if one is not provided)
* @return
*/
@NotAuditable
OwnableService getOwnableService();
}

24
source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
View File

@@ -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
*/
@Auditable(parameters = {"workflowId"})
public WorkflowInstance getWorkflowById(String workflowId);
/**
* Gets all Paths for the specified Workflow instance
@@ -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);
}