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/lock/LockService.java

@@ -219,6 +219,18 @@ public interface LockService
    @Auditable(key = Auditable.Key.ARG_0, parameters = {"nodeRef"})
    public LockStatus getLockStatus(NodeRef nodeRef);
    
+   
+   /**
+    * Gets the lock status for the node reference relative to the current user.
+    * 
+    * @see LockService#getLockStatus(NodeRef, NodeRef)
+    * 
+    * @param nodeRef    the node reference
+    * @return           the lock status
+    */
+   @Auditable(key = Auditable.Key.ARG_0, parameters = {"nodeRef", "userName"})
+   public LockStatus getLockStatus(NodeRef nodeRef, String userName);
+   
    /**
     * Gets the lock type for the node indicated.  
     * <p>

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

@@ -34,8 +34,7 @@ package org.alfresco.service.cmr.security;
  * <li>GROUP - an authority that identifies a group
  * <li>OWNER - the special authority that applies to the owner of a node
  * <li>EVERYONE - the special authority that is interpreted as everyone
- * <li>GUEST - the special authority that applies to a GUEST (An unknown,
- * unauthenticated user)
+ * <li>GUEST - the special authority that applies to a GUEST (An unknown, unauthenticated user)
  * </ol>
  * 
  * @author Andy Hind
@@ -63,6 +62,11 @@ public enum AuthorityType
         {
             return "";
         }
+
+        public int getOrderPosition()
+        {
+            return 0;
+        }
     },
 
     EVERYONE
@@ -86,6 +90,11 @@ public enum AuthorityType
         {
             return "";
         }
+
+        public int getOrderPosition()
+        {
+            return 1;
+        }
     },
     OWNER
     {
@@ -108,6 +117,11 @@ public enum AuthorityType
         {
             return "";
         }
+
+        public int getOrderPosition()
+        {
+            return 2;
+        }
     },
     GUEST
     {
@@ -130,6 +144,11 @@ public enum AuthorityType
         {
             return "";
         }
+
+        public int getOrderPosition()
+        {
+            return 3;
+        }
     },
     GROUP
     {
@@ -152,6 +171,11 @@ public enum AuthorityType
         {
             return PermissionService.GROUP_PREFIX;
         }
+
+        public int getOrderPosition()
+        {
+            return 4;
+        }
     },
     ROLE
     {
@@ -175,6 +199,11 @@ public enum AuthorityType
         {
             return PermissionService.ROLE_PREFIX;
         }
+
+        public int getOrderPosition()
+        {
+            return 5;
+        }
     },
     USER
     {
@@ -197,6 +226,11 @@ public enum AuthorityType
         {
             return "";
         }
+
+        public int getOrderPosition()
+        {
+            return 6;
+        }
     };
 
     public abstract boolean isFixedString();
@@ -207,6 +241,8 @@ public enum AuthorityType
 
     public abstract String getPrefixString();
 
+    public abstract int getOrderPosition();
+
     public boolean equals(String authority)
     {
         return equals(getAuthorityType(authority));

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.service.cmr.security;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.service.namespace.QName;
+
+public class PermissionContext 
+{
+    private QName type;
+    
+    private HashSet<QName> aspects = new HashSet<QName>();
+    
+    private Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+    
+    private Map<String, Set<String>> dynamicAuthorityAssignment = new HashMap<String, Set<String>>();
+    
+    private Map<String, Object> additionalContext = new HashMap<String, Object>();
+    
+    public PermissionContext(QName type)
+    {
+        this.type = type;
+    }
+
+    public HashSet<QName> getAspects()
+    {
+        return aspects;
+    }
+
+    public Map<String, Set<String>> getDynamicAuthorityAssignment()
+    {
+        return dynamicAuthorityAssignment;
+    }
+
+    public void addDynamicAuthorityAssignment(String user, String dynamicAuthority)
+    {
+        Set<String> dynamicAuthorities = dynamicAuthorityAssignment.get(user);
+        if(dynamicAuthorities == null)
+        {
+            dynamicAuthorities = new HashSet<String>();
+            dynamicAuthorityAssignment.put(user, dynamicAuthorities);
+        }
+        dynamicAuthorities.add(dynamicAuthority);
+    }
+    
+    public Map<String, Object> getAdditionalContext()
+    {
+        return additionalContext;
+    }
+
+    public Map<QName, Serializable> getProperties()
+    {
+        return properties;
+    }
+
+    public QName getType()
+    {
+        return type;
+    }
+    
+    
+    
+}

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" })