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

16
source/java/org/alfresco/repo/avm/AVMRepository.java
View File

@@ -32,9 +32,9 @@ import java.util.SortedMap;
import org.alfresco.model.WCMModel;
import org.alfresco.repo.avm.util.AVMUtil;
import org.alfresco.repo.content.ContentStore;
import org.alfresco.repo.domain.DbAccessControlList;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.domain.avm.AVMStoreEntity;
import org.alfresco.repo.domain.permissions.Acl;
import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.security.permissions.ACLCopyMode;
import org.alfresco.repo.security.permissions.AccessDeniedException;
@@ -1024,7 +1024,7 @@ public class AVMRepository
{
AVMNode node = fAVMNodeDAO.getByID(vr.getRoot().getId());
root.setIsRoot(false);
node.setIsRoot(false);
fAVMNodeDAO.update(node);
fVersionLayeredNodeEntryDAO.delete(vr);
@@ -2758,7 +2758,7 @@ public class AVMRepository
* @param acl
* The ACL to set.
*/
public void setACL(String path, DbAccessControlList acl)
public void setACL(String path, Acl acl)
{
fLookupCount.set(1);
try
@@ -2787,7 +2787,7 @@ public class AVMRepository
* The path to the node.
* @return The ACL.
*/
public DbAccessControlList getACL(int version, String path)
public Acl getACL(int version, String path)
{
fLookupCount.set(1);
try
@@ -3233,7 +3233,7 @@ public class AVMRepository
*/
public boolean can(AVMStore store, AVMNode node, String permission, boolean isDirectlyContained)
{
DbAccessControlList acl = node.getAcl();
Acl acl = node.getAcl();
QName type;
if (node.getType() == AVMNodeType.PLAIN_DIRECTORY)
@@ -3335,7 +3335,7 @@ public class AVMRepository
}
if (store != null)
{
DbAccessControlList storeAcl = store.getStoreAcl();
Acl storeAcl = store.getStoreAcl();
if (storeAcl != null)
{
Long storeAclID = storeAcl.getId();
@@ -3407,7 +3407,7 @@ public class AVMRepository
* @param storeName
* @param acl
*/
public void setStoreAcl(String storeName, DbAccessControlList acl)
public void setStoreAcl(String storeName, Acl acl)
{
AVMStore store = getAVMStoreByName(storeName);
if (store == null)
@@ -3425,7 +3425,7 @@ public class AVMRepository
* @param storeName
* @return
*/
public DbAccessControlList getStoreAcl(String storeName)
public Acl getStoreAcl(String storeName)
{
AVMStore store = getAVMStoreByName(storeName);
if (store == null)