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

source/java/org/alfresco/service/cmr/security/PermissionService.java

@@ -234,7 +234,7 @@ public interface PermissionService
      * @return
      */
     @Auditable(parameters = { "aclID", "context", "permission" })
-    public AccessStatus hasPermission(Long aclID, Map<String, Object> context, String permission);
+    public AccessStatus hasPermission(Long aclID, PermissionContext context, String permission);
 
     /**
      * Delete all the permission assigned to the node
@@ -306,6 +306,7 @@ public interface PermissionService
      * Get all permissions set for the current user.
      *
      * @return - A map of noderefs to permissions set
+     * @deprecated
      */
     @Auditable
     public Map<NodeRef, Set<AccessPermission>> getAllSetPermissionsForCurrentUser();
@@ -315,6 +316,7 @@ public interface PermissionService
      *
      * @param authority
      * @return - A map of noderefs to permissions set
+     * @deprecated
      */
     @Auditable(parameters = { "authority" })
     public Map<NodeRef, Set<AccessPermission>> getAllSetPermissionsForAuthority(String authority);
@@ -331,6 +333,7 @@ public interface PermissionService
      * @param includeContainingPermissions -
      *            true; do an exact match: false; search for any permission that woudl imply the one given
      * @return - the set of nodes where the user is assigned the permission
+     * @deprecated
      */
     @Auditable(parameters = { "permission", "allow", "includeContainingAuthorities", "includeContainingPermissions" })
     public Set<NodeRef> findNodesByAssignedPermissionForCurrentUser(String permission, boolean allow, boolean includeContainingAuthorities,
@@ -348,6 +351,7 @@ public interface PermissionService
      * @param exactPermissionMatch -
      *            true; do an exact match: false; search for any permission that woudl imply the one given
      * @return - the set of nodes where the user is assigned the permission
+     * @deprecated
      */
     @Auditable(parameters = { "authority", "permission", "allow", "includeContainingAuthorities",
             "exactPermissionMatch" })