From f8b88e624f654b9b557b072a557891230de0818c Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Wed, 3 Sep 2014 11:57:51 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 78392: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 75693: ACE-2149 Remove AVM/WCM - first round, based on the following Sparta commits 08f1ff556cf3e8eb370e433b69b634026c848af1: SlimRepo: comment-out AVM schema bootstrap and wcm-services-context - plus associated bootstrap/startup fallout - note: disabling/removing WCM/AVM will be a work-in-progress due to tight code coupling :-( cdb78eeae53522cc2d78feb94be49d11648fa582; SlimRepo: comment-out AVM schema bootstrap and wcm-services-context - follow-on to fix "regenerate_renditions" fallout error (in Alfresco Explorer web client) 33337ad4239df91b9a8dc7a00be43e55ffef5bef: SlimRepo: remove WCM/AVM - round 1 (wip) - removal of some of the AVM code and tests (including core impl such as AVMServiceImpl, AVMRepository, AVMSyncServiceImpl, underlying DAOs etc) - fix Spring config (major impact) and any obvious compile-time fallout - ensured repo starts and ran (some of the) repo unit tests - also check basic Explorer access 47e50847bbbbdda5fd64a27c212dfbdd625cbfdb: Jenkins build/test repo - minor: disable/remove repo tests - disabled unused tests, removed remaining AVM* tests git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/action/evaluator/RegenerateRenditionsEvaluator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/java/org/alfresco/web/action/evaluator/RegenerateRenditionsEvaluator.java b/source/java/org/alfresco/web/action/evaluator/RegenerateRenditionsEvaluator.java index 0282911305..067fccebad 100644 --- a/source/java/org/alfresco/web/action/evaluator/RegenerateRenditionsEvaluator.java +++ b/source/java/org/alfresco/web/action/evaluator/RegenerateRenditionsEvaluator.java @@ -55,6 +55,10 @@ public class RegenerateRenditionsEvaluator extends BaseActionEvaluator */ public boolean evaluate(final Node node) { + // Sparta: disable/remove WCM/AVM + return false; + + /* // is the authenticated user permitted to execute the regenerate renditions action // against at least one web project boolean isUserAllowed = false; @@ -103,5 +107,6 @@ public class RegenerateRenditionsEvaluator extends BaseActionEvaluator } return (node.hasAspect(WCMAppModel.ASPECT_RENDERING_ENGINE_TEMPLATE) || isWebFormsPath) && isUserAllowed; + */ } }