Merged BRANCHES/V3.2 to HEAD:

18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
   19091: Fix Part 1 ALF-726: v3.1.x Content Cleaner Job needs to be ported to v3.2
   19159: Fixed ALF-726: Migrate pre-3.2 content URLs to new format and pick up tag existing orphaned content
   19169: Fix fallout from 19159 for ALF-726: Migrate pre-3.2 content URLs to new format and pick up tag existing orphaned content
   19262: ALF-726 Multithreading for content URL conversion



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-03-12 19:11:12 +00:00
parent a2c2e215a8
commit fdc8f6f331
33 changed files with 2589 additions and 1175 deletions

View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
@@ -14,33 +14,34 @@
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.domain.contentdata;
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.domain.contentdata;
import java.util.List;
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.cmr.repository.ContentData;
import org.springframework.extensions.surf.util.Pair;
import org.springframework.dao.ConcurrencyFailureException;
/**
* DAO services for <b>alf_content_data</b> table
*
* @author Derek Hulley
* @since 3.2
*/
public interface ContentDataDAO
{
/**
* Create a new ContentData instance.
*
* @param contentData the ContentData details
* @return the ContentData pair (id, ContentData) (never null)
*/
Pair<Long, ContentData> createContentData(ContentData contentData);
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.cmr.repository.ContentData;
import org.springframework.extensions.surf.util.Pair;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.dao.DataIntegrityViolationException;
/**
* DAO services for <b>alf_content_data</b> table
*
* @author Derek Hulley
* @since 3.2
*/
public interface ContentDataDAO
{
/**
* Create a new ContentData instance.
*
* @param contentData the ContentData details
* @return the ContentData pair (id, ContentData) (never null)
*/
Pair<Long, ContentData> createContentData(ContentData contentData);
/**
* Update a content data instance
@@ -49,46 +50,55 @@ public interface ContentDataDAO
* @param contentData the new data
*/
void updateContentData(Long id, ContentData contentData);
/**
* @param id the unique ID of the entity
* @return the ContentData pair (id, ContentData) or <tt>null</tt> if it doesn't exist
* @throws AlfrescoRuntimeException if the ID provided is invalid
*/
Pair<Long, ContentData> getContentData(Long id);
/**
* Delete an instance of content.
* @param id the unique ID of the entity
* @throws ConcurrencyFailureException if the ID does not exist
*/
void deleteContentData(Long id);
/**
* Deletes all <b>alf_content_data</b> rows that are referenced by the given node
*
* @param nodeId the node ID
* @param qnameIds the content properties to target
*/
void deleteContentDataForNode(Long nodeId, Set<Long> qnameIds);
/**
* Interface for callbacks during content URL enumeration
*
* @author Derek Hulley
* @since 3.2
*/
public static interface ContentUrlHandler
{
/**
* Creates an immediately-orphaned content URL, if possible
*
* @param contentUrl the URL to create if it doesn't exist
* @return Returns the ID-URL pair
* @throws DataIntegrityViolationException if the URL already exists
*/
Pair<Long, String> createContentUrlOrphaned(String contentUrl);
/**
* @param id the unique ID of the entity
* @return the ContentData pair (id, ContentData) or <tt>null</tt> if it doesn't exist
* @throws AlfrescoRuntimeException if the ID provided is invalid
*/
Pair<Long, ContentData> getContentData(Long id);
/**
* Delete an instance of content.
* @param id the unique ID of the entity
* @throws ConcurrencyFailureException if the ID does not exist
*/
void deleteContentData(Long id);
/**
* Deletes all <b>alf_content_data</b> rows that are referenced by the given node
*
* @param nodeId the node ID
* @param qnameIds the content properties to target
*/
void deleteContentDataForNode(Long nodeId, Set<Long> qnameIds);
/**
* Interface for callbacks during content URL enumeration
*
* @author Derek Hulley
* @since 3.2
*/
public static interface ContentUrlHandler
{
void handle(Long id, String contentUrl, Long orphanTime);
}
/**
}
/**
* 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
*/
*/
void getContentUrlsOrphaned(ContentUrlHandler contentUrlHandler, long maxOrphanTime);
/**
@@ -104,4 +114,4 @@ public interface ContentDataDAO
* Delete a batch of content URL entities.
*/
int deleteContentUrls(List<Long> ids);
}
}