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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:13:50 +00:00
parent 63678f2980
commit e94f8f8351
93 changed files with 62 additions and 4426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java
View File

@@ -105,10 +105,6 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
defaultZones.add(AuthorityService.ZONE_APP_DEFAULT);
defaultZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
Set<String> wcmZones = new HashSet<String>(2, 1.0f);
wcmZones.add(AuthorityService.ZONE_APP_WCM);
wcmZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
Set<String> shareZones = new HashSet<String>(2, 1.0f);
shareZones.add(AuthorityService.ZONE_APP_SHARE);
shareZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);

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

@@ -66,7 +66,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
* to the newer <b>alf_content_url</b> storage.
* <p/>
* The {@link ServiceRegistry} is used to record progress. The component picks up ranges of node IDs
* (DM and AVM) and records the progress. Since new nodes will not need converting, the converter
* (DM) and records the progress. Since new nodes will not need converting, the converter
* will stop once it hits the largest node ID that it found upon first initiation. Once completed,
* the content store reader will start to pick up orphaned content and schedule it for deletion.
* <p/>
@@ -85,12 +85,6 @@ public class ContentUrlConverterPatch extends AbstractPatch
NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "adm", "range-start-id");
private static final RegistryKey KEY_ADM_DONE = new RegistryKey(
NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "adm", "done");
private static final RegistryKey KEY_AVM_MAX_ID = new RegistryKey(
NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "avm", "max-id");
private static final RegistryKey KEY_AVM_RANGE_START_ID = new RegistryKey(
NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "avm", "range-start-id");
private static final RegistryKey KEY_AVM_DONE = new RegistryKey(
NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "avm", "done");
private static final RegistryKey KEY_STORE_DONE = new RegistryKey(
NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "store", "done");
@@ -313,16 +307,10 @@ public class ContentUrlConverterPatch extends AbstractPatch
logger.info(I18NUtil.getMessage("patch.convertContentUrls.adm.start"));
boolean admCompleted = applyADMLooping(running);
/* Sparta: remove WCM/AVM
logger.info(I18NUtil.getMessage("patch.convertContentUrls.avm.start"));
boolean avmCompleted = applyAVMLooping(running);
*/
boolean avmCompleted = true;
logger.info(I18NUtil.getMessage("patch.convertContentUrls.store.start", contentStore));
boolean urlLiftingCompleted = applyUrlLifting(running);
completed = admCompleted && avmCompleted && urlLiftingCompleted;
completed = admCompleted && urlLiftingCompleted;
}
catch (RuntimeException e)
{
@@ -469,106 +457,6 @@ public class ContentUrlConverterPatch extends AbstractPatch
return false;
}
/*
private boolean applyAVMLooping(final AtomicBoolean running)
{
RetryingTransactionCallback<Boolean> callback = new RetryingTransactionCallback<Boolean>()
{
public Boolean execute() throws Throwable
{
return applyAVM();
}
};
boolean done = false;
while (running.get())
{
done = transactionHelper.doInTransaction(callback, false, true);
if (done)
{
break;
}
}
return done;
}
*/
/**
* Do the AVM conversion work
*/
/*
private boolean applyAVM() throws Exception
{
Long maxId = (Long) registryService.getProperty(KEY_AVM_MAX_ID);
// Must we run at all?
Boolean done = (Boolean) registryService.getProperty(KEY_AVM_DONE);
if (done != null && done.booleanValue())
{
logger.info(I18NUtil.getMessage("patch.convertContentUrls.avm.done", maxId));
return true;
}
if (maxId == null)
{
maxId = patchDAO.getMaxAvmNodeID();
registryService.addProperty(KEY_AVM_MAX_ID, maxId);
}
Long startId = (Long) registryService.getProperty(KEY_AVM_RANGE_START_ID);
if (startId == null)
{
startId = 1L;
registryService.addProperty(KEY_AVM_RANGE_START_ID, startId);
}
Long endId = startId + (batchSize * (long) threadCount * 10L);
final List<Long> nodeIds = patchDAO.getAvmNodesWithOldContentProperties(startId, endId);
BatchProcessWorkerAdaptor<Long> batchProcessorWorker = new BatchProcessWorkerAdaptor<Long>()
{
public void process(Long nodeId) throws Throwable
{
// Convert it
PlainFileNode node = (PlainFileNode) AVMDAOs.Instance().fAVMNodeDAO.getByID(nodeId);
ContentData contentData = node.getContentData();
node.setContentData(contentData);
AVMDAOs.Instance().fAVMNodeDAO.update(node);
}
};
BatchProcessor<Long> batchProcessor = new BatchProcessor<Long>(
"ContentUrlConverter.AVM (" + maxId + ")",
transactionHelper,
nodeIds, threadCount, batchSize,
applicationEventPublisher, null, 1);
batchProcessor.process(batchProcessorWorker, true);
if (batchProcessor.getTotalErrors() > 0)
{
// Something went wrong. We don't advance the start range so that the patch re-execution will
// start at the start of the range that failed.
throw AlfrescoRuntimeException.create("patch.convertContentUrls.error", batchProcessor.getLastError());
}
// Advance
startId = endId;
// Have we
if (startId > maxId)
{
startId = maxId + 1;
// We're past the max ID that we're interested in
done = Boolean.TRUE;
registryService.addProperty(KEY_AVM_DONE, done);
logger.info(I18NUtil.getMessage("patch.convertContentUrls.avm.done", maxId));
return true;
}
// Progress
super.reportProgress(maxId, startId);
// Move the start ID on
registryService.addProperty(KEY_AVM_RANGE_START_ID, startId);
// More to do
return false;
}
*/
private boolean applyUrlLifting(final AtomicBoolean running) throws Exception
{
RetryingTransactionCallback<Boolean> callback = new RetryingTransactionCallback<Boolean>()
@@ -591,9 +479,8 @@ public class ContentUrlConverterPatch extends AbstractPatch
}
Boolean admDone = (Boolean) registryService.getProperty(KEY_ADM_DONE);
Boolean avmDone = (Boolean) registryService.getProperty(KEY_AVM_DONE);
if ((admDone == null || !admDone.booleanValue()) || (avmDone == null || !avmDone.booleanValue()))
if ((admDone == null || !admDone.booleanValue()))
{
logger.info(I18NUtil.getMessage("patch.convertContentUrls.store.pending"));
return false;