Merged V3.0 to HEAD

12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
   12085: ETHREEOH-565: Failure to generate flash preview for PPT file
   12086: ETHREEOH-903 	 Sites drop-down Favorites UI improvements
          ETHREEOH-904 	 My Sites dashlet Favorites UI improvements
          ETHREEOH-547 	 User who is not a site manager can delete sites: my sites dashlet and sites page
   12093: ETHREEOH-861, ETHREEOH-928
   12094: Remove __MACOSX folder that has appeared in Share webapp
   12096: Removed spurious files from YUI 2.6.0 distribution
   12100: ETHREEOH-929   Tightening up transport adapters field (should never be shown for ASR)
   12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
   12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
   12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
   12115: Added unit test to check for cm:folder-derived type support
   12116: Removed unused, old patch-related query
   12117: Merged V2.2 to V3.0
      11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
   12118: Fixed compilation error after merge
   12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
   12122: UserUsage does nothing if system is READ-ONLY.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 17:10:36 +00:00
parent 9f42bfac4c
commit ab4bdfc013
38 changed files with 2011 additions and 948 deletions

View File

@@ -26,6 +26,8 @@ package org.alfresco.repo.domain;
import java.io.Serializable;
import org.alfresco.service.namespace.QName;
/**
* The interface against which permission references are persisted in hibernate.
*
@@ -33,6 +35,14 @@ import java.io.Serializable;
*/
public interface DbPermission extends Serializable
{
/**
* Convenience method to get the type QName of the permission
*
* @param qnameDAO helper DAO
* @return the permission's type QName
*/
public QName getTypeQName(QNameDAO qnameDAO);
/**
* @return Returns the automatically assigned ID
*/
@@ -46,12 +56,12 @@ public interface DbPermission extends Serializable
/**
* @return Returns the qualified name of this permission
*/
public QNameEntity getTypeQName();
public Long getTypeQNameId();
/**
* @param qname the entity representing the qname for this instance
* @param typeQNameId the ID of the QName for this instance
*/
public void setTypeQName(QNameEntity typeQNameEntity);
public void setTypeQNameId(Long typeQNameId);
/**
* @return Returns the permission name
@@ -64,7 +74,7 @@ public interface DbPermission extends Serializable
public void setName(String name);
/**
* @return Returns a key combining the {@link #getTypeQname() type}
* @return Returns a key combining the {@link #getTypeQnameId() type}
* and {@link #getName() name}
*/
public DbPermissionKey getKey();