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

SAIL-388 - PermissionDAO: Remove redundant DbAccessControlList entity (and associated helper methods)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-07-08 13:55:14 +00:00
parent 2d024b3f88
commit 927575fcf2
27 changed files with 252 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
View File

@@ -27,11 +27,10 @@ import java.util.Set;
import java.util.TreeMap;
import org.alfresco.repo.avm.util.AVMUtil;
import org.alfresco.repo.domain.DbAccessControlList;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.domain.permissions.Acl;
import org.alfresco.repo.security.permissions.ACLCopyMode;
import org.alfresco.repo.security.permissions.ACLType;
import org.alfresco.repo.security.permissions.impl.AccessPermissionImpl;
import org.alfresco.service.cmr.avm.AVMBadArgumentException;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMNotFoundException;
@@ -661,7 +660,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
/*
* Get acl
*/
private DbAccessControlList getACL(String path)
private Acl getACL(String path)
{
Lookup lookup = AVMRepository.GetInstance().lookup(-1, path, false);
if (lookup != null)
@@ -680,8 +679,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
*/
private void setACL(String parentPath, String toCopyPath, String newPath)
{
DbAccessControlList parentAcl= getACL(parentPath);
DbAccessControlList acl = getACL(toCopyPath);
Acl parentAcl= getACL(parentPath);
Acl acl = getACL(toCopyPath);
Lookup lookup = AVMRepository.GetInstance().lookup(-1, newPath, false);
if (lookup != null)
@@ -1046,8 +1045,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
// compare ACLs
private int compareACLs(AVMNodeDescriptor srcDesc, AVMNodeDescriptor dstDesc)
{
DbAccessControlList srcAcl = getACL(srcDesc.getPath());
DbAccessControlList dstAcl = getACL(dstDesc.getPath());
Acl srcAcl = getACL(srcDesc.getPath());
Acl dstAcl = getACL(dstDesc.getPath());
if ((srcAcl == null) && (dstAcl == null))
{