From b4e45ef15cbfb334c6650858786acbcddd14a9c0 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 21:01:45 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57510: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57392: MNT-9805: Transformation server showing user as System - Fix build failure - Needed to modify the name of the dummy target mimetype in the test, as the code changed in 4.2 as a result of ALF-2875 to check it matched "image*" git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/rendition/RenditionServicePermissionsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java b/source/test-java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java index 793463fbe7..041ae3aa0f 100644 --- a/source/test-java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java +++ b/source/test-java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java @@ -465,7 +465,7 @@ public class RenditionServicePermissionsTest */ private static class MockUserCheckingContentTransformer implements ContentTransformer { - public static final String SUPPORTED_TARGET_MIMETYPE = "dummy/dummy"; + public static final String SUPPORTED_TARGET_MIMETYPE = "image/dummy"; public static final String TEST_TARGET_CONTENT = "transformed text"; private String expectedUsername;