diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transform/aio/AIOCustomConfig.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transform/aio/AIOCustomConfig.java index fa1afa48..8badf978 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transform/aio/AIOCustomConfig.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transform/aio/AIOCustomConfig.java @@ -26,10 +26,9 @@ */ package org.alfresco.transform.aio; -import org.alfresco.transform.aio.AIOTransformRegistry; import org.alfresco.transform.registry.TransformServiceRegistry; import org.alfresco.transform.imagemagick.transformers.ImageMagickCommandExecutor; -import org.alfresco.transform.office.transformers.LibreOfficeJavaExecutor; +import org.alfresco.transform.libreoffice.transformers.LibreOfficeJavaExecutor; import org.alfresco.transform.pdfRenderer.transformers.PdfRendererCommandExecutor; import org.alfresco.transform.base.executors.Transformer; import org.alfresco.transformer.AbstractTransformerController; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java index 1efe678a..fd690f39 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java @@ -30,11 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; -import org.alfresco.transform.aio.AIOController; -import org.alfresco.transform.aio.AIOCustomConfig; -import org.alfresco.transform.aio.AIOTransformRegistry; -import org.alfresco.transform.office.LibreOfficeControllerTest; -import org.alfresco.transform.office.transformers.LibreOfficeJavaExecutor; +import org.alfresco.transform.libreoffice.LibreOfficeControllerTest; +import org.alfresco.transform.libreoffice.transformers.LibreOfficeJavaExecutor; import org.alfresco.transform.base.executors.Transformer; import org.alfresco.transformer.AbstractTransformerController; import org.junit.jupiter.api.Test; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java index a999d970..ac31a2f3 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.aio; -import org.alfresco.transform.office.LibreOfficeTransformationIT; +import org.alfresco.transform.libreoffice.LibreOfficeTransformationIT; public class AIOLibreOfficeTransformationIT extends LibreOfficeTransformationIT { diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/office/Application.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/libreoffice/Application.java similarity index 96% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/office/Application.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/libreoffice/Application.java index 30d52194..dce69fd4 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/office/Application.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/libreoffice/Application.java @@ -24,10 +24,10 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office; +package org.alfresco.transform.libreoffice; import io.micrometer.core.instrument.MeterRegistry; -import org.alfresco.transform.office.transformers.LibreOfficeJavaExecutor; +import org.alfresco.transform.libreoffice.transformers.LibreOfficeJavaExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/office/LibreOfficeController.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeController.java similarity index 97% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/office/LibreOfficeController.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeController.java index d07de1ee..c443b4ee 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/office/LibreOfficeController.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeController.java @@ -24,10 +24,10 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office; +package org.alfresco.transform.libreoffice; import org.alfresco.transformer.AbstractTransformerController; -import org.alfresco.transform.office.transformers.LibreOfficeJavaExecutor; +import org.alfresco.transform.libreoffice.transformers.LibreOfficeJavaExecutor; import org.alfresco.transformer.probes.ProbeTestTransform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeControllerTest.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java similarity index 99% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeControllerTest.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java index 57fa86f2..1481f133 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeControllerTest.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office; +package org.alfresco.transform.libreoffice; import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; @@ -60,7 +60,7 @@ import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transformer.AbstractTransformerController; import org.alfresco.transformer.AbstractTransformerControllerTest; -import org.alfresco.transform.office.transformers.LibreOfficeJavaExecutor; +import org.alfresco.transform.libreoffice.transformers.LibreOfficeJavaExecutor; import org.alfresco.transformer.executors.RuntimeExec.ExecutionResult; import org.alfresco.transformer.model.FileRefEntity; import org.alfresco.transformer.model.FileRefResponse; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeHttpRequestTest.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java similarity index 97% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeHttpRequestTest.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java index d4e4a946..d366e2c0 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeHttpRequestTest.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office; +package org.alfresco.transform.libreoffice; import org.alfresco.transformer.AbstractHttpRequestTest; import org.springframework.boot.test.context.SpringBootTest; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeQueueTransformServiceIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java similarity index 98% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeQueueTransformServiceIT.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java index 71bf3831..e211729b 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeQueueTransformServiceIT.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office; +package org.alfresco.transform.libreoffice; import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeTransformationIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java similarity index 99% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeTransformationIT.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java index 3ecf4db4..4513e624 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/office/LibreOfficeTransformationIT.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office; +package org.alfresco.transform.libreoffice; import static java.text.MessageFormat.format; import static java.util.function.Function.identity; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/JodConverter.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java similarity index 96% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/JodConverter.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java index feccd272..86080d6d 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/JodConverter.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office.transformers; +package org.alfresco.transform.libreoffice.transformers; import org.artofsolving.jodconverter.office.OfficeManager; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/JodConverterSharedInstance.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java similarity index 99% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/JodConverterSharedInstance.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java index 4a2e7c5d..495ecfee 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/JodConverterSharedInstance.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office.transformers; +package org.alfresco.transform.libreoffice.transformers; import static java.util.Arrays.asList; import static java.util.Objects.requireNonNull; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/LibreOfficeExtractMetadataTask.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java similarity index 99% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/LibreOfficeExtractMetadataTask.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java index 99d10401..3871d571 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/LibreOfficeExtractMetadataTask.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office.transformers; +package org.alfresco.transform.libreoffice.transformers; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.UnknownPropertyException; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/LibreOfficeJavaExecutor.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeJavaExecutor.java similarity index 99% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/LibreOfficeJavaExecutor.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeJavaExecutor.java index fcf8a3f4..3526300a 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/office/transformers/LibreOfficeJavaExecutor.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeJavaExecutor.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.office.transformers; +package org.alfresco.transform.libreoffice.transformers; import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.star.task.ErrorCodeIOException; diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java new file mode 100644 index 00000000..846fb77c --- /dev/null +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java @@ -0,0 +1,78 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.misc; + +import org.alfresco.transform.base.TransformEngine; +import org.alfresco.transform.base.probes.ProbeTestTransform; +import org.alfresco.transform.common.TransformConfigResourceReader; +import org.alfresco.transform.config.TransformConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.util.Collections; + +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; + +@Component +public class MiscTransformEngine implements TransformEngine +{ + private 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\n" + + "This transformer uses ExifTool by Phil Harvey. See license at https://exiftool.org/#license. or in /Perl-Artistic-License.txt"; + + @Autowired + private TransformConfigResourceReader transformConfigResourceReader; + @Value("${transform.core.config.location:classpath:engine_config.json}") + private String engineConfigLocation; + + @Override + public String getTransformEngineName() + { + return "0001-Tika"; + } + + @Override + public String getStartupMessage() { + return LICENCE; + } + + @Override + public TransformConfig getTransformConfig() + { + return transformConfigResourceReader.read(engineConfigLocation); + } + + @Override + public ProbeTestTransform getLivenessAndReadinessProbeTestTransform() + { + return new ProbeTestTransform("quick.pdf", "quick.txt", + MIMETYPE_PDF, MIMETYPE_TEXT_PLAIN, Collections.emptyMap(), + 60, 16, 400, 10240, 60 * 30 + 1, 60 * 15 + 20); + } +}