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

@@ -41,16 +41,16 @@ public interface QNameDAO
{
/**
* @param id the unique ID of the entity
* @return the namespace entity (never null)
* @return the namespace pair (id, uri)
* @throws AlfrescoRuntimeException if the ID provided is invalid
*/
NamespaceEntity getNamespaceEntity(Long id);
Pair<Long, String> getNamespace(Long id);
/**
* @param namespaceUri the namespace URI to query for
* @return the namespace entity of null if it doesn't exist
* @return the namespace pair (id, uri) or <tt>null</tt> if it doesn't exist
*/
NamespaceEntity getNamespaceEntity(String namespaceUri);
Pair<Long, String> getNamespace(String namespaceUri);
/**
* Get an existing instance matching the URI or create one if necessary.
@@ -58,45 +58,38 @@ public interface QNameDAO
* be used in the context of read-only or query methods.
*
* @param namespaceUri the namespace URI to create
* @return the existing namespace entity if found or a new one
* @return the existing namespace pair (id, uri) or a new one
*/
NamespaceEntity getOrCreateNamespaceEntity(String namespaceUri);
Pair<Long, String> getOrCreateNamespace(String namespaceUri);
/**
* @param namespaceUri the namespace URI to create
* @return Returns the new instance
* @return the new namespace pair (id, uri)
*/
NamespaceEntity newNamespaceEntity(String namespaceUri);
Pair<Long, String> newNamespace(String namespaceUri);
/**
* Modifies an existing namespace URI. If the new URI already exists, then no
* new entity is created and a concurrency
* new entity is created.
*
* @param oldNamespaceUri the old namespace URI
* @param newNamespaceUri the new namespace URI
* @throws AlfrescoRuntimeException if the new namespace is in use
*/
void updateNamespaceEntity(String oldNamespaceUri, String newNamespaceUri);
void updateNamespace(String oldNamespaceUri, String newNamespaceUri);
/**
* @param id the unique ID of the entity
* @return the QName entity (never null)
* @return the QName pair (id, qname) (never null)
* @throws AlfrescoRuntimeException if the ID provided is invalid
*/
QNameEntity getQNameEntity(Long id);
/**
* @param id the unique ID of the entity
* @return the QName (never null)
* @throws AlfrescoRuntimeException if the ID provided is invalid
*/
QName getQName(Long id);
Pair<Long, QName> getQName(Long id);
/**
* @param qname the QName to query for
* @return the QName entity of null if it doesn't exist
* @return the QName pair (id, qname) or <tt>null</tt> if it doesn't exist
*/
QNameEntity getQNameEntity(QName qname);
Pair<Long, QName> getQName(QName qname);
/**
* Get an existing instance matching the QName or create one if necessary.
@@ -104,17 +97,15 @@ public interface QNameDAO
* be used in the context of read-only or query methods.
*
* @param qname the QName to query for
* @return an existing QName entity if found or a new one
* @return the QName pair (id, qname) or a new one
*/
QNameEntity getOrCreateQNameEntity(QName qname);
Pair<Long, QName> getOrCreateQNamePair(QName qname);
Pair<Long, QName> getOrCreateQName(QName qname);
/**
* @param qname the QName to create
* @return the new instance
* @return the new QName pair (id, qname)
*/
QNameEntity newQNameEntity(QName qname);
Pair<Long, QName> newQName(QName qname);
Set<QName> convertIdsToQNames(Set<Long> ids);