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

source/java/org/alfresco/repo/node/db/NodeDaoService.java

@@ -87,8 +87,11 @@ public interface NodeDaoService
     public NodeRef.Status getNodeRefStatus(NodeRef nodeRef);
     
     /**
+     * Create a new node.  Note that allowing the <b>uuid</b> to be assigned by passing in a <tt>null</tt>
+     * is more efficient.
+     * 
      * @param storeRef the store to which the node must belong
-     * @param uuid the node store-unique identifier
+     * @param uuid the node store-unique identifier, or <tt>null</tt> to assign a GUID
      * @param nodeTypeQName the type of the node
      * @return Returns a new node Id of the given type and attached to the store
      * @throws InvalidTypeException if the node type is invalid or if the node type
@@ -394,19 +397,49 @@ public interface NodeDaoService
             NodePropertyHandler handler);
     
     /**
-     * Iterate over all nodes that have a given creator
+     * Interface used to iterate over object array results
+     */
+    public interface ObjectArrayQueryCallback
+    {
+        boolean handle(Object[] array);
+    }
+    
+    /**
+     * Iterate over all content nodes to get owner/creator and content url (in order to extract content size)
      * 
      * @param storeRef                          the store to search in
-     * @param userName                          the user to match
      * @param handler                           the callback to use while iterating over the URLs
-     * @return Returns the values for the given owner
+     * @return Returns the values for the given owner, creator and content url
      */
     @DirtySessionAnnotation(markDirty=true)
-    public void getNodesWithCreatorAndStore(
+    public void getContentUrlsForStore(
             StoreRef storeRef,
-            String userName,
-            NodeRefQueryCallback resultsCallback);
-            
+            ObjectArrayQueryCallback resultsCallback);
+    
+    /**
+     * Iterate over all person nodes to get users without a calculated usage
+     * 
+     * @param storeRef                          the store to search in
+     * @param handler                           the callback to use while iterating over the people
+     * @return Returns the values for username and person node uuid (excluding System)
+     */
+    @DirtySessionAnnotation(markDirty=true)
+    public void getUsersWithoutUsage(
+            StoreRef storeRef,
+            ObjectArrayQueryCallback resultsCallback);
+    
+    /**
+     * Iterate over all person nodes to get users with a calculated usage
+     * 
+     * @param storeRef                          the store to search in
+     * @param handler                           the callback to use while iterating over the people
+     * @return Returns the values for the username and person node uuid (excluding System)
+     */
+    @DirtySessionAnnotation(markDirty=true)
+    public void getUsersWithUsage(
+            StoreRef storeRef,
+            ObjectArrayQueryCallback resultsCallback);
+       
     /**
      * Iterate over all property values for the given type definition.  This will also dig out values that
      * were persisted as type <b>d:any</b>.