diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index cb8d8683..6907373b 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -1,6 +1,5 @@ -# Image provides a container in which to run alfresco-pdf-renderer transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run alfresco-pdf-renderer transformations for Alfresco Content Services. -# The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # 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. FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea diff --git a/alfresco-docker-alfresco-pdf-renderer/LICENSES.md b/alfresco-docker-alfresco-pdf-renderer/LICENSES.md index 61ec4d48..8dd5b427 100644 --- a/alfresco-docker-alfresco-pdf-renderer/LICENSES.md +++ b/alfresco-docker-alfresco-pdf-renderer/LICENSES.md @@ -1,6 +1,4 @@ ### Licenses -* The code in the alfresco-docker-alfresco-pdf-renderer project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * The alfresco-pdf-renderer transformer uses the PDFium library from Google Inc. See [https://pdfium.googlesource.com/pdfium/+/master/LICENSE](https://pdfium.googlesource.com/pdfium/+/master/LICENSE) or the [pdfium.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/zip/src/main/resources/licenses/3rd-party/pdfium.txt) file placed in the root directory of the docker image. diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java index 3e7870d9..6c6988e0 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java +++ b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java @@ -30,7 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.springframework.http.HttpStatus.OK; import java.io.File; @@ -85,7 +85,7 @@ public class AlfrescoPdfRendererController extends AbstractTransformerController public AlfrescoPdfRendererController() { logger.info("-----------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(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("-----------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 28cb8787..4bafc88e 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -1,6 +1,5 @@ -# Image provides a container in which to run ImageMagick transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run ImageMagick transformations for Alfresco Content Services. -# The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea diff --git a/alfresco-docker-imagemagick/LICENSES.md b/alfresco-docker-imagemagick/LICENSES.md index a6d2cbee..c8506825 100644 --- a/alfresco-docker-imagemagick/LICENSES.md +++ b/alfresco-docker-imagemagick/LICENSES.md @@ -1,7 +1,5 @@ ### Licenses -* The code in the alfresco-docker-imagemagick project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * ImageMagick is from ImageMagick Studio LLC. See the license at [http://www.imagemagick.org/script/license.php](http://www.imagemagick.org/script/license.php) or the [ImageMagick-license.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/zip/src/main/resources/licenses/3rd-party/ImageMagick-license.txt) file placed in the root directory of the docker image. diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java index a78ab15b..a6042f31 100644 --- a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java +++ b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java @@ -30,7 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.alfresco.transformer.util.Util.stringToInteger; import static org.springframework.http.HttpStatus.OK; @@ -88,7 +88,7 @@ public class ImageMagickController extends AbstractTransformerController public ImageMagickController() { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(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("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index ba2f5d5b..9cd8b9ee 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -1,6 +1,5 @@ -# Image provides a container in which to run LibreOffice transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run LibreOffice transformations for Alfresco Content Services. -# The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea diff --git a/alfresco-docker-libreoffice/LICENSES.md b/alfresco-docker-libreoffice/LICENSES.md index 6675172b..3afa9da0 100644 --- a/alfresco-docker-libreoffice/LICENSES.md +++ b/alfresco-docker-libreoffice/LICENSES.md @@ -1,7 +1,5 @@ ### Licenses -* The code in the alfresco-docker-libreoffice project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * This transformer uses LibreOffice from The Document Foundation. See the license at [https://www.libreoffice.org/download/license/](https://www.libreoffice.org/download/license/) or the [libreoffice.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/zip/src/main/resources/licenses/3rd-party/libreoffice.txt) diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java index 6614f63e..cad84b4b 100644 --- a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java +++ b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java @@ -30,7 +30,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.springframework.http.HttpStatus.OK; import java.io.File; @@ -86,7 +86,7 @@ public class LibreOfficeController extends AbstractTransformerController public LibreOfficeController() { logger.info("-------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(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("-------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index ec2a51c0..83149f76 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -1,6 +1,5 @@ -# Image provides a container in which to run Tika transformations for Alfresco Enterprise Content Services. +# Image provides a container in which to run Tika transformations for Alfresco Content Services. -# The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-f410546b40ea diff --git a/alfresco-docker-tika/LICENSES.md b/alfresco-docker-tika/LICENSES.md index dfdb7c47..ad2c6210 100644 --- a/alfresco-docker-tika/LICENSES.md +++ b/alfresco-docker-tika/LICENSES.md @@ -1,7 +1,5 @@ ### Licenses -* The code in the alfresco-docker-imagemagick project is only intended to be use with the Alfresco Enterprise - Content Repository which is covered by [https://www.alfresco.com/legal/agreements](https://www.alfresco.com/legal/agreements) and [https://www.alfresco.com/terms-use](https://www.alfresco.com/terms-use) * Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0 or the [Apache 2.0.txt](https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt) file placed in the root directory of the docker image. diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java index 3822400f..32e0528f 100644 --- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java +++ b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java @@ -37,7 +37,7 @@ import static org.alfresco.transformer.fs.FileManager.createAttachment; import static org.alfresco.transformer.fs.FileManager.createSourceFile; import static org.alfresco.transformer.fs.FileManager.createTargetFile; import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; +import static org.alfresco.transformer.logging.StandardMessages.LICENCE; import static org.alfresco.transformer.util.Util.stringToBoolean; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.OK; @@ -96,7 +96,7 @@ public class TikaController extends AbstractTransformerController public TikaController() { logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); - Arrays.stream(ENTERPRISE_LICENCE.split("\\n")).forEach(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("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); } diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java index 74e05a33..226fb08d 100644 --- a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java +++ b/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java @@ -26,9 +26,26 @@ */ package org.alfresco.transformer; -import org.alfresco.transformer.transformers.SelectingTransformer; +import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transformer.fs.FileManager.createAttachment; +import static org.alfresco.transformer.fs.FileManager.createSourceFile; +import static org.alfresco.transformer.fs.FileManager.createTargetFile; +import static org.alfresco.transformer.fs.FileManager.createTargetFileName; +import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.SOURCE_ENCODING; +import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.TARGET_ENCODING; +import static org.springframework.http.HttpStatus.OK; +import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.probes.ProbeTestTransform; +import org.alfresco.transformer.transformers.SelectingTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -39,24 +56,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.SOURCE_ENCODING; -import static org.alfresco.transformer.transformers.HtmlParserContentTransformer.TARGET_ENCODING; -import static org.alfresco.transformer.fs.FileManager.createAttachment; -import static org.alfresco.transformer.fs.FileManager.createSourceFile; -import static org.alfresco.transformer.fs.FileManager.createTargetFile; -import static org.alfresco.transformer.fs.FileManager.createTargetFileName; -import static org.alfresco.transformer.logging.StandardMessages.ENTERPRISE_LICENCE; -import static org.springframework.http.HttpStatus.OK; -import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; - @Controller public class MiscController extends AbstractTransformerController { diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java index f24fbed7..2334827d 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java @@ -28,10 +28,7 @@ package org.alfresco.transformer.logging; public interface StandardMessages { - String ENTERPRISE_LICENCE = - "This image is only intended to be used with the Alfresco Enterprise Content Repository which is covered by\n"+ - "https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use\n" + - "\n" + + String LICENCE = "License rights for this program may be obtained from Alfresco Software, Ltd. pursuant to a written agreement\n" + "and any use of this program without such an agreement is prohibited.\n" + "\n" ; diff --git a/pom.xml b/pom.xml index 8a5f8a61..d45e46be 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ 2.1.0-EA4-SNAPSHOT pom + 1.8 latest