Merged HEAD (5.1) to 5.1.N (5.1.1)

117489 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-11-14 13:37:20 +00:00
parent 508e2e52d8
commit 1ec4f05efc
84 changed files with 10125 additions and 58 deletions

View File

@@ -29,6 +29,8 @@ import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.node.SystemNodeUtils;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.workflow.traitextender.WorkflowPackageExtension;
import org.alfresco.repo.workflow.traitextender.WorkflowPackageTrait;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -38,6 +40,11 @@ import org.alfresco.service.cmr.workflow.WorkflowException;
import org.alfresco.service.cmr.workflow.WorkflowInstance;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.traitextender.AJProxyTrait;
import org.alfresco.traitextender.Extend;
import org.alfresco.traitextender.ExtendedTrait;
import org.alfresco.traitextender.Extensible;
import org.alfresco.traitextender.Trait;
import org.alfresco.util.GUID;
import org.springframework.extensions.surf.util.ParameterCheck;
@@ -47,7 +54,7 @@ import org.springframework.extensions.surf.util.ParameterCheck;
*
* @author davidc
*/
public class WorkflowPackageImpl implements WorkflowPackageComponent
public class WorkflowPackageImpl implements WorkflowPackageComponent,Extensible
{
private final static String PACKAGE_FOLDER = "packages";
private static final String ERR_PACKAGE_ALREADY_ASSOCIATED = "workflow.package.already.associated.error";
@@ -62,7 +69,13 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
private TenantService tenantService;
private MessageService messageService;
private BehaviourFilter policyBehaviourFilter;
private final ExtendedTrait<WorkflowPackageTrait> workflowPackageTrait;
public WorkflowPackageImpl()
{
workflowPackageTrait=new ExtendedTrait<WorkflowPackageTrait>(AJProxyTrait.create(this, WorkflowPackageTrait.class));
}
/**
* @param bootstrap the importer bootstrap for the store to place workflow
* items into
@@ -127,6 +140,7 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
/**
* {@inheritDoc}
*/
@Extend(traitAPI=WorkflowPackageTrait.class,extensionAPI=WorkflowPackageExtension.class)
public NodeRef createPackage(NodeRef container)
{
// create a container, if one is not specified
@@ -204,6 +218,7 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
/**
* {@inheritDoc}
*/
@Extend(traitAPI=WorkflowPackageTrait.class,extensionAPI=WorkflowPackageExtension.class)
public void deletePackage(NodeRef container)
{
if (container != null && nodeService.exists(container)
@@ -225,6 +240,7 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
/**
* {@inheritDoc}
*/
@Extend(traitAPI=WorkflowPackageTrait.class,extensionAPI=WorkflowPackageExtension.class)
public List<String> getWorkflowIdsForContent(NodeRef packageItem)
{
ParameterCheck.mandatory("packageItem", packageItem);
@@ -353,6 +369,7 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
/**
* {@inheritDoc}
*/
@Extend(traitAPI=WorkflowPackageTrait.class,extensionAPI=WorkflowPackageExtension.class)
public boolean setWorkflowForPackage(WorkflowInstance instance)
{
NodeRef packageNode = instance.getWorkflowPackage();
@@ -385,4 +402,10 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
return true;
}
@Override
public <T extends Trait> ExtendedTrait<T> getTrait(Class<? extends T> traitAPI)
{
return (ExtendedTrait<T>) workflowPackageTrait;
}
}

View File

@@ -0,0 +1,26 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see http://www.gnu.org/licenses/.
*/
package org.alfresco.repo.workflow.traitextender;
import org.alfresco.repo.workflow.WorkflowPackageComponent;
public interface WorkflowPackageExtension extends WorkflowPackageComponent
{
}

View File

@@ -0,0 +1,27 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see http://www.gnu.org/licenses/.
*/
package org.alfresco.repo.workflow.traitextender;
import org.alfresco.repo.workflow.WorkflowPackageComponent;
import org.alfresco.traitextender.Trait;
public interface WorkflowPackageTrait extends Trait, WorkflowPackageComponent
{
}