Collection
+ * by applying the same values as present on a potentially permission-checked source. If the
+ * existing checked source is NOT permission-checked, then the collection will not be
+ * decorated.
+ *
+ * @param the type of the Collection
+ * @param collection the Collection to proxy
+ * @param checkedSource a collection that might implement {@link PermissionCheckedCollection}
+ * @return a Collection of the same type but including the
+ * {@link PermissionCheckedCollection} interface
+ */
+ public static final Collection create(
+ Collection collection, Collection checkedSource)
+ {
+ if (checkedSource instanceof PermissionCheckedCollection)
+ {
+ PermissionCheckedCollection source = (PermissionCheckedCollection) checkedSource;
+ return create(collection, source.isCutOff(), source.sizeUnchecked(), source.sizeOriginal());
+ }
+ else
+ {
+ return collection;
+ }
+ }
/**
* Helper method to create a {@link PermissionCheckedCollection} from an existing Collection
*
diff --git a/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java b/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java
index eb495d0591..88f1fc0294 100644
--- a/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java
+++ b/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthority.java
@@ -18,26 +18,24 @@
*/
package org.alfresco.repo.security.permissions.dynamic;
-import java.io.Serializable;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.security.permissions.DynamicAuthority;
import org.alfresco.repo.security.permissions.PermissionReference;
import org.alfresco.repo.security.permissions.impl.ModelDAO;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.LockStatus;
import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
-import org.alfresco.util.PropertyCheck;
/**
* LockOwnerDynamicAuthority
@@ -46,7 +44,7 @@ public class LockOwnerDynamicAuthority extends AbstractLifecycleBean implements
{
private LockService lockService;
- private NodeService nodeService;
+ private CheckOutCheckInService checkOutCheckInService;
private ModelDAO modelDAO;
@@ -64,22 +62,10 @@ public class LockOwnerDynamicAuthority extends AbstractLifecycleBean implements
{
return true;
}
- if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY))
+ NodeRef original = checkOutCheckInService.getCheckedOut(nodeRef);
+ if (original != null)
{
- NodeRef original = null;
- Serializable reference = nodeService.getProperty(nodeRef, ContentModel.PROP_COPY_REFERENCE);
- if (reference != null)
- {
- original = DefaultTypeConverter.INSTANCE.convert(NodeRef.class, reference);
- }
- if (original != null && nodeService.exists(original))
- {
- return (lockService.getLockStatus(original, userName) == LockStatus.LOCK_OWNER);
- }
- else
- {
- return false;
- }
+ return (lockService.getLockStatus(original, userName) == LockStatus.LOCK_OWNER);
}
else
{
@@ -99,8 +85,11 @@ public class LockOwnerDynamicAuthority extends AbstractLifecycleBean implements
@Override
protected void onBootstrap(ApplicationEvent event)
{
+ ApplicationContext ctx = super.getApplicationContext();
+ checkOutCheckInService = (CheckOutCheckInService) ctx.getBean("checkOutCheckInService");
+
PropertyCheck.mandatory(this, "lockService", lockService);
- PropertyCheck.mandatory(this, "nodeService", nodeService);
+ PropertyCheck.mandatory(this, "checkOutCheckInService", checkOutCheckInService);
PropertyCheck.mandatory(this, "modelDAO", modelDAO);
// Build the permission set
@@ -126,7 +115,6 @@ public class LockOwnerDynamicAuthority extends AbstractLifecycleBean implements
/**
* Set the lock service
- * @param lockService
*/
public void setLockService(LockService lockService)
{
@@ -134,17 +122,17 @@ public class LockOwnerDynamicAuthority extends AbstractLifecycleBean implements
}
/**
- * Set the node service
- * @param nodeService
+ * Service to get the check-in details. This is not used for Spring configuration
+ * because it requires a permission-wrapped public service that in turn depends on
+ * this component.
*/
- public void setNodeService(NodeService nodeService)
+ public void setCheckOutCheckInService(CheckOutCheckInService checkOutCheckInService)
{
- this.nodeService = nodeService;
+ this.checkOutCheckInService = checkOutCheckInService;
}
-
+
/**
* Set the permissions model dao
- * @param modelDAO
*/
public void setModelDAO(ModelDAO modelDAO)
{
@@ -153,14 +141,12 @@ public class LockOwnerDynamicAuthority extends AbstractLifecycleBean implements
/**
* Set the permissions for which this dynamic authority is required
- * @param requiredFor
*/
public void setRequiredFor(List
* The user must have sufficient permissions to remove the lock (ie: be the
* owner of the lock or have admin rights) otherwise an exception will be raised.
diff --git a/source/java/org/alfresco/service/cmr/repository/CopyService.java b/source/java/org/alfresco/service/cmr/repository/CopyService.java
index 27ad0dedd7..92cd2f5a5e 100644
--- a/source/java/org/alfresco/service/cmr/repository/CopyService.java
+++ b/source/java/org/alfresco/service/cmr/repository/CopyService.java
@@ -19,10 +19,10 @@
package org.alfresco.service.cmr.repository;
import java.util.List;
-import java.util.Set;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.permissions.PermissionCheckValue;
import org.alfresco.service.Auditable;
import org.alfresco.service.namespace.QName;
@@ -160,6 +160,16 @@ public interface CopyService
@Auditable(parameters = {"sourceNodeRef", "destinationNodeRef"})
public void copy(NodeRef sourceNodeRef, NodeRef destinationNodeRef);
+ /**
+ * Get the original for a given copied node
+ *
+ * @param copiedNodeRef the copied node reference
+ * @return the original node reference or null if it isn't a
+ * copy or the original has been deleted
+ */
+ @Auditable(parameters = {"nodeRef"})
+ public NodeRef getOriginal(NodeRef copiedNodeRef);
+
/**
* Gets all the copies of a given node that have been made using this service.
*
@@ -176,19 +186,15 @@ public interface CopyService
* @author Derek Hulley
* @since 4.0
*/
- public class CopyInfo
+ public class CopyInfo implements PermissionCheckValue
{
private final NodeRef nodeRef;
private final String name;
- private final NodeRef parentNodeRef;
- private final String parentName;
- public CopyInfo(NodeRef nodeRef, String name, NodeRef parentNodeRef, String parentName)
+ public CopyInfo(NodeRef nodeRef, String name)
{
this.nodeRef = nodeRef;
this.name = name;
- this.parentNodeRef = parentNodeRef;
- this.parentName = parentName;
}
/**
@@ -206,22 +212,6 @@ public interface CopyService
{
return name;
}
-
- /**
- * @return the parent of the node copy
- */
- public NodeRef getParentNodeRef()
- {
- return parentNodeRef;
- }
-
- /**
- * @return the name of the parent of the node copy
- */
- public String getParentName()
- {
- return parentName;
- }
}
/**
@@ -231,7 +221,7 @@ public interface CopyService
* @param pagingRequest page request details
* @return the page(s) of nodes that were copied from the given node
*/
- @Auditable(parameters = {"nodeRef"})
+ @Auditable(parameters = {"originalNodeRef"})
public PagingResults