inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/V3.2 to HEAD:

Browse Source 
19714: Added dialect-driven bean factory, HierarchicalBeanLoader
   19715: Test resource for HierarchicalBeanLoader
   19716: Added ControlDAO with PostgreSQL-specific override
   19717: Fix ALF-726 for PostgreSQL


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-04-01 01:23:31 +00:00
parent f27434f2c6
commit 56bf21e4c5
7 changed files with 341 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java
View File

@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.admin.patch.impl;
import java.sql.Savepoint;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -34,6 +35,7 @@ import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorkerAdaptor;
import org.alfresco.repo.content.ContentStore;
import org.alfresco.repo.content.ContentStore.ContentUrlHandler;
import org.alfresco.repo.domain.contentdata.ContentDataDAO;
import org.alfresco.repo.domain.control.ControlDAO;
import org.alfresco.repo.domain.patch.PatchDAO;
import org.alfresco.repo.lock.JobLockService;
import org.alfresco.repo.lock.LockAcquisitionException;
@@ -106,6 +108,7 @@ public class ContentUrlConverterPatch extends AbstractPatch
private JobLockService jobLockService;
private NodeDaoService nodeDaoService;
private PatchDAO patchDAO;
private ControlDAO controlDAO;
private ContentStore contentStore;
private ContentDataDAO contentDataDAO;
private int threadCount;
@@ -156,6 +159,14 @@ public class ContentUrlConverterPatch extends AbstractPatch
this.patchDAO = patchDAO;
}
/**
* Component that provides low-level database-specific control to support the patch
*/
public void setControlDAO(ControlDAO controlDAO)
{
this.controlDAO = controlDAO;
}
/**
* Set the store containing the content URLs to lift for potential cleaning.
*
@@ -307,6 +318,13 @@ public class ContentUrlConverterPatch extends AbstractPatch
completed = admCompleted && avmCompleted && urlLiftingCompleted;
}
catch (RuntimeException e)
{
logger.error(
I18NUtil.getMessage("patch.convertContentUrls.error", e.getMessage()),
e);
return I18NUtil.getMessage("patch.convertContentUrls.error", e.getMessage());
}
finally
{
jobLockService.releaseLock(lockToken, LOCK);
@@ -606,14 +624,20 @@ public class ContentUrlConverterPatch extends AbstractPatch
return;
}
currentSize.setValue(currentSize.longValue() + reader.getSize());
// Create a savepoint
String savepointName = new Long(System.nanoTime()).toString();
Savepoint savepoint = controlDAO.createSavepoint(savepointName);
try
{
contentDataDAO.createContentUrlOrphaned(contentUrl);
controlDAO.releaseSavepoint(savepoint);
count.setValue(count.intValue()+1);
}
catch (DataIntegrityViolationException e)
{
// That's OK, the URL was already managed
controlDAO.rollbackToSavepoint(savepoint);
}
allCount++;
if (allCount % batchSize == 0)