mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.2 to HEAD
7575: Permission changes for AVM. 7577: Incorporated most of the feedback provided by Kevin C earlier today 7578: Removed directory not removed by patch 7579: EmailServer bug fixes AR-1902: Double posts when emailing to a document AR-1904: Attachments via email should be allowed on forum posts AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments 7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -33,9 +33,12 @@ import org.alfresco.repo.security.permissions.NodePermissionEntry;
|
||||
import org.alfresco.repo.security.permissions.PermissionEntry;
|
||||
import org.alfresco.repo.security.permissions.PermissionReference;
|
||||
import org.alfresco.repo.security.permissions.PermissionServiceSPI;
|
||||
import org.alfresco.repo.security.permissions.impl.PermissionReferenceImpl;
|
||||
import org.alfresco.repo.security.permissions.impl.SimpleNodePermissionEntry;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.security.AccessPermission;
|
||||
import org.alfresco.service.cmr.security.AccessStatus;
|
||||
import org.alfresco.service.cmr.security.PermissionContext;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
|
||||
|
||||
@@ -76,7 +79,7 @@ public class PermissionServiceNOOPImpl
|
||||
*/
|
||||
public Set<AccessPermission> getPermissions(NodeRef nodeRef)
|
||||
{
|
||||
return null;
|
||||
return Collections.<AccessPermission>emptySet();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
@@ -84,7 +87,7 @@ public class PermissionServiceNOOPImpl
|
||||
*/
|
||||
public Set<AccessPermission> getAllSetPermissions(NodeRef nodeRef)
|
||||
{
|
||||
return null;
|
||||
return Collections.<AccessPermission>emptySet();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
@@ -179,48 +182,48 @@ public class PermissionServiceNOOPImpl
|
||||
|
||||
public PermissionReference getAllPermissionReference()
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return getPermissionReference(ALL_PERMISSIONS);
|
||||
}
|
||||
|
||||
public String getPermission(PermissionReference permissionReference)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return permissionReference.toString();
|
||||
}
|
||||
|
||||
public PermissionReference getPermissionReference(QName qname, String permissionName)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return new PermissionReferenceImpl(qname, permissionName);
|
||||
}
|
||||
|
||||
public PermissionReference getPermissionReference(String permissionName)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return new PermissionReferenceImpl(QName.createQName("uri", "local"), permissionName);
|
||||
}
|
||||
|
||||
public NodePermissionEntry getSetPermissions(NodeRef nodeRef)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return new SimpleNodePermissionEntry(nodeRef, true, Collections.<PermissionEntry>emptySet());
|
||||
}
|
||||
|
||||
public Set<PermissionReference> getSettablePermissionReferences(NodeRef nodeRef)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return Collections.<PermissionReference>emptySet();
|
||||
}
|
||||
|
||||
public Set<PermissionReference> getSettablePermissionReferences(QName type)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return Collections.<PermissionReference>emptySet();
|
||||
}
|
||||
|
||||
public AccessStatus hasPermission(NodeRef nodeRef, PermissionReference perm)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
return AccessStatus.ALLOWED;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.cmr.security.PermissionService#hasPermission(java.lang.Long, java.lang.String, java.lang.String)
|
||||
*/
|
||||
public AccessStatus hasPermission(Long aclID, Map<String, Object> context,
|
||||
public AccessStatus hasPermission(Long aclID, PermissionContext context,
|
||||
String permission)
|
||||
{
|
||||
return AccessStatus.ALLOWED;
|
||||
@@ -228,12 +231,12 @@ public class PermissionServiceNOOPImpl
|
||||
|
||||
public void setPermission(NodePermissionEntry nodePermissionEntry)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
|
||||
}
|
||||
|
||||
public void setPermission(PermissionEntry permissionEntry)
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
|
||||
}
|
||||
|
||||
public Map<NodeRef, Set<AccessPermission>> getAllSetPermissionsForCurrentUser()
|
||||
|
Reference in New Issue
Block a user