Merged DEV to HEAD:

54373: MNT-2641 : User can delete or move a working copy
   54469: Compilation fix for MNT-2641 test
   54470: Removed thousands of tabs
   54523: Fixed ALF-19843: Integrity checking does not enforce mandatory aspects on aspects
   54525: Pull IntegrityChecker properties into property file (ALF-19843)
   54527: Fixed Eclipse warning about potentially unclosed file
   54528: Prevent cm:workingcopy aspect from being removed directly (MNT-2641)
   54529: Nail down behaviour around cm:workingcopy


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-09-02 17:45:26 +00:00
parent 312dfc9ad3
commit 8fa8216fef
8 changed files with 1824 additions and 1386 deletions

View File

@@ -21,6 +21,7 @@ package org.alfresco.repo.coci;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
@@ -34,12 +35,13 @@ import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy, NodeServicePolicies.OnRemoveAspectPolicy
{
private PolicyComponent policyComponent;
private NodeService nodeService;
@@ -117,7 +119,12 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
NodeServicePolicies.BeforeDeleteNodePolicy.QNAME,
ContentModel.ASPECT_WORKING_COPY,
new JavaBehaviour(this, "beforeDeleteWorkingCopy"));
// register onBeforeDelete class behaviour for the checked-out aspect
// Watch for removal of the aspect and ensure that the cm:workingcopylink assoc is removed
this.policyComponent.bindClassBehaviour(
NodeServicePolicies.OnRemoveAspectPolicy.QNAME,
ContentModel.ASPECT_WORKING_COPY,
new JavaBehaviour(this, "onRemoveAspect"));
}
/**
@@ -143,6 +150,13 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
}
}
@Override
public void onRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
{
// This is simply not allowed.
throw new UnsupportedOperationException("Use CheckOutCheckInservice to manipulate working copies.");
}
/**
* @return Returns {@link WorkingCopyAspectCopyBehaviourCallback}
*/