Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57480: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57290: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57279: Fix for MNT-9801.
         I have very slightly refactored the configuration of thumbnails. Rather than inject system.thumbnail.generate into both CreateThumbnail- and UpdateThumbnailActionExecuter, I am now injecting it into the ThumbnailService centrally. I left the old injector methods for backwards compatibility, but deprecated them.
         Now all requests to create a thumbnail via the ScriptNode API pre-check that thumbnail generation is enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61822 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java

@@ -91,6 +91,9 @@ public class ThumbnailServiceImpl implements ThumbnailService,
     /** Thumbnail registry */
     private ThumbnailRegistry thumbnailRegistry;
     
+    /** Flag to enable/disable the generation of all thumbnails. */
+    private boolean thumbnailsEnabled;
+    
     /** Rendition service */
     private RenditionService renditionService;
     
@@ -148,6 +151,10 @@ public class ThumbnailServiceImpl implements ThumbnailService,
         this.thumbnailRegistry = thumbnailRegistry;
     }
     
+    @Override public void setThumbnailsEnabled(boolean thumbnailsEnabled) { this.thumbnailsEnabled = thumbnailsEnabled; }
+    
+    @Override public boolean getThumbnailsEnabled() { return this.thumbnailsEnabled; }
+    
     /**
      * Set the policy component to listen for various events
      * @since 3.5.0