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/repo/domain/DbAccessControlEntry.java

@@ -24,6 +24,9 @@
  */
 package org.alfresco.repo.domain;
 
+import org.alfresco.repo.security.permissions.ACEType;
+import org.alfresco.repo.security.permissions.AccessControlEntry;
+
 
 
 /**
@@ -44,16 +47,6 @@ public interface DbAccessControlEntry
      */
     public Long getVersion();
     
-    /**
-     * @return Returns the containing access control list
-     */
-    public DbAccessControlList getAccessControlList();
-    
-    /**
-     * @param acl the accession control list to which entry belongs
-     */
-    public void setAccessControlList(DbAccessControlList acl);
-    
     /**
      * @return Returns the permission to which this entry applies
      */
@@ -86,6 +79,30 @@ public interface DbAccessControlEntry
      */
     public void setAllowed(boolean allowed);
     
+    /**
+     * Get the ACE type
+     * @return
+     */
+    public ACEType getAceType();
+    
+    /**
+     * Set the ACEType
+     * @param type
+     */
+    public void setAceType(ACEType type);
+    
+    /**
+     * Get the ACE context - may be null and may well mostly be null
+     * @return
+     */
+    public DbAccessControlEntryContext getContext();
+    
+    /**
+     * Set the ACE context
+     * @param context
+     */
+    public void setContext(DbAccessControlEntryContext context);
+    
     /**
      * Helper method to delete the instance and make sure that all
      * inverse associations are properly maintained.