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/DEV/HEAD-QA to HEAD:

Browse Source 
49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
        49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX:
             49111: - Revert of r47645
                    - Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD
                    - Relates to ALF-5051 and MNT-8599 / ALF-18726
        49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984
   49979: ALF-18726: Alfresco could not start with WCMQS applied
        - Updated RenditionServiceIntegrationTest with new imgpreview values


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ray Gauss
2013-05-13 13:44:30 +00:00
parent d2ca6021c2
commit 8364f184fc
3 changed files with 162 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
View File

@@ -1413,9 +1413,9 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
// 4. "imgpreview"
parameterValues.clear();
parameterValues.put(AbstractRenderingEngine.PARAM_MIME_TYPE, MimetypeMap.MIMETYPE_IMAGE_PNG);
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_WIDTH, 480);
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_HEIGHT, 480);
parameterValues.put(AbstractRenderingEngine.PARAM_MIME_TYPE, MimetypeMap.MIMETYPE_IMAGE_JPEG);
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_WIDTH, 960);
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_HEIGHT, 960);
parameterValues.put(ImageRenderingEngine.PARAM_MAINTAIN_ASPECT_RATIO, true);
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_TO_THUMBNAIL, true);
parameterValues.put(ImageRenderingEngine.PARAM_ALLOW_ENLARGEMENT, false);