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/DbAuthority.java

@@ -25,7 +25,6 @@
 package org.alfresco.repo.domain;
 
 import java.io.Serializable;
-import java.util.Set;
 
 /** 
  * The interface against which recipients of permission are persisted
@@ -33,30 +32,25 @@ import java.util.Set;
  */
 public interface DbAuthority extends Serializable 
 {
+    /**
+     * Get the object id
+     * @return
+     */
+    public Long getId();
+    
     /**
      * @return  Returns the version number for optimistic locking
      */
     public Long getVersion();
     
     /**
-     * @return Returns the recipient
+     * @return Returns the authority
      */
-    public String getRecipient();
+    public String getAuthority();
     
     /**
-     * @param recipient the authority recipient
+     * @param the authority
      */
-    public void setRecipient(String recipient);
-    
-    /**
-     * @return Returns the external keys associated with this authority
-     */
-    public Set<String> getExternalKeys();
-    
-    /**
-     * Delete the access control entries related to this authority
-     * 
-     * @return Returns the number of entries deleted
-     */
-    public int deleteEntries();
+    public void setAuthority(String authority);
+   
 }