diff --git a/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java b/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java index 556fc01051..0bdd7284a0 100644 --- a/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java +++ b/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java @@ -17,16 +17,20 @@ package org.alfresco.repo.content.transform; import java.io.File; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.filestore.FileContentWriter; +import org.alfresco.repo.content.transform.ContentTransformerRegistry.TransformationKey; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.util.BaseAlfrescoTestCase; import org.alfresco.util.TempFileProvider; import org.alfresco.util.exec.RuntimeExec; +import org.apache.xml.security.transforms.TransformationException; /** * @see org.alfresco.repo.content.transform.RuntimeExecutableContentTransformer @@ -52,6 +56,11 @@ public class RuntimeExecutableContentTransformerTest extends BaseAlfrescoTestCas transformCommand.setErrorCodes("1, 2"); transformer.setTransformCommand(transformCommand); transformer.setMimetypeService(serviceRegistry.getMimetypeService()); + // set the explicit transformations + List explicitTranformations = new ArrayList(1); + explicitTranformations.add( + new TransformationKey(MimetypeMap.MIMETYPE_TEXT_PLAIN, MimetypeMap.MIMETYPE_XML)); + transformer.setExplicitTransformations(explicitTranformations); // initialise so that it doesn't score 0 transformer.register(); diff --git a/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformer.java b/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformer.java index e28139a6d6..852f9194b0 100644 --- a/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformer.java @@ -197,13 +197,6 @@ public abstract class AbstractImageMagickContentTransformer extends AbstractCont " target extension: " + targetExtension); } - // if the source mimetype is the same as the target's then just stream it - if (sourceMimetype.equals(targetMimetype)) - { - writer.putContent(reader.getContentInputStream()); - return; - } - // create required temp files File sourceFile = TempFileProvider.createTempFile( getClass().getSimpleName() + "_source_",