Merged V3.2 to HEAD

17574: Merged in DEV work for ContentStoreCleaner: ETHREEOH-2813
      17432: Build up for fix of ETHREEOH-2813: ContentStoreCleaner doesn't scale
      17546: ContentStoreCleaner fixes and further tests
      17524: Unit tests and bulk queries for orphaned content
      17506: W.I.P. for content cleaner for V3.2: ETHREEOH-2813
   17575: Missed check-in (other DB create scripts look OK)
   17577: Re-activated 'contentStoreCleanerTrigger'
          - Added system property: system.content.orphanCleanup.cronExpression=0 0 4 * * ?
          - Other useful properties:
              system.content.eagerOrphanCleanup=false
              system.content.orphanProtectDays=14
   17578: Fixed MT test and sample contexts after recent content cleaner changes
   17579: Fixed DB2 unique index creation for content URLs
   17580: First pass at fix for ETHREEOH-3454: Port enterprise upgrade scripts for ContentStoreCleaner changes
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17574-17575,17577-17580


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-19 15:26:46 +00:00
parent a650eb2a1c
commit f89af49875
37 changed files with 1033 additions and 1031 deletions

View File

@@ -24,6 +24,7 @@
*/
package org.alfresco.repo.domain.contentdata;
import java.util.List;
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
@@ -46,6 +47,14 @@ public interface ContentDataDAO
* @return the ContentData pair (id, ContentData) (never null)
*/
Pair<Long, ContentData> createContentData(ContentData contentData);
/**
* Update a content data instance
*
* @param id the unique ID of the entity
* @param contentData the new data
*/
void updateContentData(Long id, ContentData contentData);
/**
* @param id the unique ID of the entity
@@ -77,13 +86,28 @@ public interface ContentDataDAO
*/
public static interface ContentUrlHandler
{
void handle(String contentUrl);
void handle(Long id, String contentUrl, Long orphanTime);
}
/**
* Enumerate all available content URLs
* Enumerate all available content URLs that were orphaned on or before the given time
*
* @param contentUrlHandler
* @param contentUrlHandler the callback object to process the rows
* @param maxOrphanTime the maximum orphan time
*/
void getAllContentUrls(ContentUrlHandler contentUrlHandler);
void getContentUrlsOrphaned(ContentUrlHandler contentUrlHandler, long maxOrphanTime);
/**
* Enumerate all available content URLs that were orphaned on or before the given time
*
* @param contentUrlHandler the callback object to process the rows
* @param maxOrphanTime the maximum orphan time
* @param maxResults the maximum number of results (1 or greater)
*/
void getContentUrlsOrphaned(ContentUrlHandler contentUrlHandler, long maxOrphanTime, int maxResults);
/**
* Delete a batch of content URL entities.
*/
int deleteContentUrls(List<Long> ids);
}