diff --git a/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml b/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml index c937ac0c1a267ec0a18d49e22077531fbf768f44..2d3765a5705018729b35bdaa9c8b1f27d0625b43 100644 --- a/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml +++ b/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml @@ -20,7 +20,5 @@ <bean id="imageHelperServiceProvider_java" class="org.olat.core.util.image.spi.ImageHelperImpl" /> - <bean id="imageHelperServiceProvider_magick" class="org.olat.core.util.image.spi.ImageMagickHelper"> - <property name="magickPath" value="${thumbnail.magick.path}"/> - </bean> + <bean id="imageHelperServiceProvider_magick" class="org.olat.core.util.image.spi.ImageMagickHelper" /> </beans> diff --git a/src/main/java/org/olat/core/util/image/spi/ImageMagickHelper.java b/src/main/java/org/olat/core/util/image/spi/ImageMagickHelper.java index d7a325f647a74c11e7ccd946f93d0eb71d90781b..c481e7642bb29d48429aeba904f61e62eb9b8cf0 100644 --- a/src/main/java/org/olat/core/util/image/spi/ImageMagickHelper.java +++ b/src/main/java/org/olat/core/util/image/spi/ImageMagickHelper.java @@ -47,19 +47,9 @@ import org.olat.core.util.vfs.VFSLeaf; */ public class ImageMagickHelper extends BasicManager implements ImageHelperSPI { - private String magickPath; - public ImageMagickHelper() { // } - - /** - * [used by Spring] - * @param magickPath - */ - public void setMagickPath(String magickPath) { - this.magickPath = magickPath; - } @Override public Size thumbnailPDF(VFSLeaf pdfFile, VFSLeaf thumbnailFile, int maxWidth, int maxHeight) { @@ -258,9 +248,7 @@ public class ImageMagickHelper extends BasicManager implements ImageHelperSPI { } ProcessBuilder builder = new ProcessBuilder(cmd); - builder.environment().put("PATH", magickPath); process = builder.start(); - size = executeProcess(thumbnailFile, process); doneSignal.countDown(); } catch (IOException e) { diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties index 9b253962547f386e134f3d7e7c0743e385727d2f..7042eec0fe22107124aff2ed685a204d9fb41df8 100644 --- a/src/main/resources/serviceconfig/olat.properties +++ b/src/main/resources/serviceconfig/olat.properties @@ -313,11 +313,9 @@ webdav.links.enabled=true ######################################################################## thumbnail.provider=java # java is a pure java implementation (which use PDFBox too), magick use ImageMagick and -# GhostScript +# GhostScript. For the magick one, you must add the path to convert and gs command line +# in your PATH environnment variable. thumbnail.provider.values=java,magick -thumbnail.magick.path=/usr/local/bin/ -# path to ImageMagick and GhostScript executable ("convert") and GhostScript executable ("gs") -thumbnail.provider.values=/usr/local/bin/ ######################################################################## # Shared resources - used only to generate sample configurations