diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/Application.java index 3a77f21f..a88bc40c 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/Application.java @@ -30,6 +30,11 @@ import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import java.util.Arrays; +import org.alfresco.transformer.executors.ImageMagickCommandExecutor; +import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; +import org.alfresco.transformer.executors.PdfRendererCommandExecutor; +import org.alfresco.transformer.executors.TikaJavaExecutor; +import org.alfresco.transformer.transformers.SelectingTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -69,9 +74,11 @@ public class Application { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); - logger.info("The transformers in this project use libraries from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\\\ 2.0.txt"); - logger.info("Additional libraries used:"); - logger.info("* htmlparser http://htmlparser.sourceforge.net/license.html"); + logger.info(ImageMagickCommandExecutor.LICENCE); + logger.info(LibreOfficeJavaExecutor.LICENCE); + logger.info(TikaJavaExecutor.LICENCE); + logger.info(PdfRendererCommandExecutor.LICENCE); + Arrays.stream(SelectingTransformer.LICENCE.split("\\n")).forEach(logger::info); logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); logger.info("Starting application components... Done"); diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/Application.java index f2e907f0..d32b15c7 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/Application.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -30,6 +30,7 @@ import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import java.util.Arrays; +import org.alfresco.transformer.executors.ImageMagickCommandExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -69,7 +70,7 @@ public class Application { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); - logger.info("This transformer uses ImageMagick from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt"); + logger.info(ImageMagickCommandExecutor.LICENCE); logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); logger.info("Starting application components... Done"); diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java index 1cade3a0..3808380b 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -39,6 +39,8 @@ public class ImageMagickCommandExecutor extends AbstractCommandExecutor private static final String DYN = ROOT + "/lib"; private static final String EXE = "/usr/bin/convert"; + public static final String LICENCE = "This transformer uses ImageMagick from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt"; + @Override protected RuntimeExec createTransformCommand() { diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/Application.java index f189f571..556138f7 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/Application.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -30,6 +30,7 @@ import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import java.util.Arrays; +import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -69,7 +70,7 @@ public class Application { logger.info("-------------------------------------------------------------------------------------------------------------------------------------------------------"); Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); - logger.info("This transformer uses LibreOffice from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt"); + logger.info(LibreOfficeJavaExecutor.LICENCE); logger.info("-------------------------------------------------------------------------------------------------------------------------------------------------------"); logger.info("Starting application components... Done"); diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java index 345f8d10..bd5b534b 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -55,6 +55,8 @@ public class LibreOfficeJavaExecutor implements JavaExecutor private static final int JODCONVERTER_TRANSFORMATION_ERROR_CODE = 3088; private static final String OFFICE_HOME = "/opt/libreoffice6.3"; + public static final String LICENCE = "This transformer uses LibreOffice from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt"; + private JodConverter jodconverter; public LibreOfficeJavaExecutor() diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/Application.java index 7fb96120..71bc0352 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/Application.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,6 +26,7 @@ */ package org.alfresco.transformer; +import org.alfresco.transformer.transformers.SelectingTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -40,6 +41,10 @@ import org.springframework.context.event.EventListener; import io.micrometer.core.instrument.MeterRegistry; +import java.util.Arrays; + +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; + @SpringBootApplication @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class}) public class Application @@ -64,9 +69,7 @@ public class Application public void startup() { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); - logger.info("The transformers in this project use libraries from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\\\ 2.0.txt"); - logger.info("Additional libraries used:"); - logger.info("* htmlparser http://htmlparser.sourceforge.net/license.html"); + Arrays.stream(SelectingTransformer.LICENCE.split("\\n")).forEach(logger::info); logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); logger.info("Starting application components... Done"); diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java index 3b42bd16..3123a619 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -50,6 +50,11 @@ public class SelectingTransformer { private static final Logger logger = LoggerFactory.getLogger(SelectingTransformer.class); + public static final String LICENCE = + "This transformer uses libraries from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\\\ 2.0.txt\\n" + + "Additional libraries used:\n" + + "* htmlparser http://htmlparser.sourceforge.net/license.html"; + private final Map transformers = ImmutableMap .builder() .put("appleIWorks", new AppleIWorksContentTransformer()) diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/Application.java index 46b49c08..0d8bfe50 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/Application.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -30,6 +30,7 @@ import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import java.util.Arrays; +import org.alfresco.transformer.executors.PdfRendererCommandExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -69,7 +70,7 @@ public class Application { logger.info("-----------------------------------------------------------------------------------------------------------------------------------------------------------"); Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); - logger.info("alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt"); + logger.info(PdfRendererCommandExecutor.LICENCE); logger.info("-----------------------------------------------------------------------------------------------------------------------------------------------------------"); logger.info("Starting application components... Done"); diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java index d2b33f67..72c8cd63 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -35,6 +35,8 @@ import java.util.Map; */ public class PdfRendererCommandExecutor extends AbstractCommandExecutor { + public static final String LICENCE = "This transformer uses alfresco-pdf-renderer which uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt"; + private static final String EXE = "/usr/bin/alfresco-pdf-renderer"; @Override diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/Application.java index 731f46c1..2051e167 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/Application.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -30,6 +30,7 @@ import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import java.util.Arrays; +import org.alfresco.transformer.executors.TikaJavaExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -69,7 +70,7 @@ public class Application { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); Arrays.stream(LICENCE.split("\\n")).forEach(logger::info); - logger.info("Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\ 2.0.txt"); + logger.info(TikaJavaExecutor.LICENCE); logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); logger.info("Starting application components... Done"); diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java index 1c92da78..0e8bd867 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -45,6 +45,8 @@ import org.xml.sax.SAXException; */ public class TikaJavaExecutor implements JavaExecutor { + public static final String LICENCE = "This transformer uses Tika from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\ 2.0.txt"; + private final Tika tika; public TikaJavaExecutor()