diff --git a/deprecated/alfresco-transformer-base/pom.xml b/deprecated/alfresco-transformer-base/pom.xml index 9fe53cbe..2ea7b9d5 100644 --- a/deprecated/alfresco-transformer-base/pom.xml +++ b/deprecated/alfresco-transformer-base/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/client/model/Mimetype.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/client/model/Mimetype.java new file mode 100644 index 00000000..9aeeb902 --- /dev/null +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/client/model/Mimetype.java @@ -0,0 +1,33 @@ +/* + * #%L + * Alfresco Transform Model + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This program 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. + * + * This program 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 General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package org.alfresco.transform.client.model; + +/** + * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine. + * + * This interface previously existed in the alfresco-transform-model. It now exists in the deprecated + * alfresco-transform-base and extends the new class. This should to make it easier to use the deprecated module + * by custom transformers that have not been converted to the new base. + */ +public interface Mimetype extends org.alfresco.transform.common.Mimetype +{ +} diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/router/ExtensionService.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/router/ExtensionService.java new file mode 100644 index 00000000..ac64299e --- /dev/null +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/router/ExtensionService.java @@ -0,0 +1,36 @@ +/* + * #%L + * Alfresco Transform Model + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This program 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. + * + * This program 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 General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package org.alfresco.transform.router; + +/** + * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine. + * + * This class previously existed in the alfresco-transform-model. It now exists in the deprecated + * alfresco-transform-base and extends the new class. This should to make it easier to use the deprecated module + * by custom transformers that have not been converted to the new base. + */ +public class ExtensionService extends org.alfresco.transform.common.ExtensionService +{ + private ExtensionService() + { + } +} diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java index 73a57f20..219b280e 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java @@ -33,7 +33,7 @@ import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transform.messages.TransformRequestValidator; import org.alfresco.transform.config.TransformConfig; import org.alfresco.transform.registry.TransformServiceRegistry; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.model.FileRefResponse; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java index 4f76f481..1a891f31 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java @@ -37,7 +37,7 @@ import javax.jms.Message; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.messaging.TransformMessageConverter; import org.alfresco.transformer.messaging.TransformReplySender; import org.slf4j.Logger; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java index 4110db2f..37cf6f68 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java @@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.probes.ProbeTestTransform; import org.slf4j.Logger; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java index a1836b9b..9aa8db72 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java @@ -39,7 +39,7 @@ import org.alfresco.transform.config.TransformConfig; import org.alfresco.transform.registry.AbstractTransformRegistry; import org.alfresco.transform.registry.CombinedTransformConfig; import org.alfresco.transform.registry.TransformCache; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java index bb421468..60ddd6a4 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java @@ -31,7 +31,7 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; import java.io.File; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.model.FileRefResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java index 2e2bdb04..99835b19 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java @@ -33,7 +33,7 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import java.io.File; import java.util.Map; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; /** * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine. diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java index a0dd88f5..935f51cd 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java @@ -27,7 +27,7 @@ package org.alfresco.transformer.executors; * #L% */ -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import java.io.File; import java.util.Map; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java index eda486a1..ffdb1c89 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java @@ -42,7 +42,7 @@ import java.util.Arrays; import javax.servlet.http.HttpServletRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java index 01042125..65b42829 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java @@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.servlet.http.HttpServletRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.AbstractTransformerController; import org.alfresco.transformer.logging.LogEntry; import org.slf4j.Logger; diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml index 96776abc..cdd7dfb4 100644 --- a/engines/aio/pom.xml +++ b/engines/aio/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/base/pom.xml b/engines/base/pom.xml index 2ff3c485..787730a6 100644 --- a/engines/base/pom.xml +++ b/engines/base/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java index 9c30c41c..e2f57dfa 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java @@ -32,7 +32,7 @@ import org.alfresco.transform.base.registry.TransformRegistry; import org.alfresco.transform.base.transform.TransformHandler; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.config.TransformConfig; import org.alfresco.transform.registry.TransformServiceRegistry; import org.slf4j.Logger; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformManager.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformManager.java index a015b6b5..7ebf7663 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/TransformManager.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformManager.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.base; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import java.io.File; import java.io.IOException; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java b/engines/base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java index ee000a46..e024ac7f 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java @@ -33,7 +33,7 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import java.io.File; import java.util.Map; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; public abstract class AbstractCommandExecutor implements CommandExecutor { diff --git a/engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java b/engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java index 95294209..c3642840 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java @@ -28,7 +28,7 @@ package org.alfresco.transform.base.fs; import org.alfresco.transform.base.logging.LogEntry; import org.alfresco.transform.common.ExtensionService; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import org.springframework.http.ResponseEntity; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java index 2cfcabad..c03ca28e 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java @@ -29,7 +29,7 @@ package org.alfresco.transform.base.messaging; import org.alfresco.transform.base.TransformController; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java index 7e75151a..87be4eaf 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java @@ -28,7 +28,7 @@ package org.alfresco.transform.base.probes; import org.alfresco.transform.base.transform.TransformHandler; import org.alfresco.transform.base.logging.LogEntry; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java b/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java index 1c8f3408..2772a35a 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java @@ -34,7 +34,7 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; import java.io.File; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.base.model.FileRefResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/FragmentHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/FragmentHandler.java index 7e715d4b..dd083622 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/transform/FragmentHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/FragmentHandler.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.base.transform; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import java.io.IOException; import java.io.OutputStream; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java index 42bc8d19..bf2bfd56 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/ProcessHandler.java @@ -32,10 +32,9 @@ import org.alfresco.transform.base.logging.LogEntry; import org.alfresco.transform.base.probes.ProbeTransform; import org.alfresco.transform.base.registry.CustomTransformers; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.common.TransformerDebug; import org.alfresco.transform.registry.TransformServiceRegistry; -import org.springframework.http.HttpStatus; import org.springframework.web.multipart.MultipartFile; import javax.jms.Destination; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java index 67a1eb19..7c4c6524 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java @@ -26,7 +26,6 @@ */ package org.alfresco.transform.base.transform; -import org.alfresco.transform.base.TransformEngine; import org.alfresco.transform.base.sfs.SharedFileStoreClient; import org.alfresco.transform.base.messaging.TransformReplySender; import org.alfresco.transform.base.model.FileRefResponse; @@ -36,7 +35,7 @@ import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transform.common.ExtensionService; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.common.TransformerDebug; import org.alfresco.transform.messages.TransformRequestValidator; import org.alfresco.transform.messages.TransformStack; @@ -64,7 +63,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; diff --git a/engines/example/pom.xml b/engines/example/pom.xml index 438a9299..e58e2960 100644 --- a/engines/example/pom.xml +++ b/engines/example/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/imagemagick/pom.xml b/engines/imagemagick/pom.xml index ea0cf9e1..d0c4a6f9 100644 --- a/engines/imagemagick/pom.xml +++ b/engines/imagemagick/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java index e016491c..526d812f 100644 --- a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java +++ b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java @@ -27,7 +27,7 @@ package org.alfresco.transform.imagemagick; import com.google.common.collect.ImmutableList; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import java.util.List; import java.util.StringJoiner; diff --git a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java index 52f9518c..e20309ad 100644 --- a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java +++ b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java @@ -30,7 +30,7 @@ import org.alfresco.transform.base.TransformManager; import org.alfresco.transform.base.executors.AbstractCommandExecutor; import org.alfresco.transform.base.executors.RuntimeExec; import org.alfresco.transform.base.util.CustomTransformerFileAdaptor; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.imagemagick.ImageMagickOptionsBuilder; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/engines/libreoffice/pom.xml b/engines/libreoffice/pom.xml index c9dbe6bb..09e6617c 100644 --- a/engines/libreoffice/pom.xml +++ b/engines/libreoffice/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java index 237893e7..82325106 100644 --- a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java +++ b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java @@ -31,7 +31,7 @@ import com.sun.star.task.ErrorCodeIOException; import org.alfresco.transform.base.TransformManager; import org.alfresco.transform.base.executors.JavaExecutor; import org.alfresco.transform.base.util.CustomTransformerFileAdaptor; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; diff --git a/engines/misc/pom.xml b/engines/misc/pom.xml index 44b35212..63848380 100644 --- a/engines/misc/pom.xml +++ b/engines/misc/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/pdfrenderer/pom.xml b/engines/pdfrenderer/pom.xml index 29204fe5..70d2d11e 100644 --- a/engines/pdfrenderer/pom.xml +++ b/engines/pdfrenderer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/transformers/PdfRendererTransformer.java b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/transformers/PdfRendererTransformer.java index 6cc12c81..82b4a515 100644 --- a/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/transformers/PdfRendererTransformer.java +++ b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/transformers/PdfRendererTransformer.java @@ -30,7 +30,7 @@ import org.alfresco.transform.base.TransformManager; import org.alfresco.transform.base.executors.AbstractCommandExecutor; import org.alfresco.transform.base.executors.RuntimeExec; import org.alfresco.transform.base.util.CustomTransformerFileAdaptor; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.pdfrenderer.PdfRendererOptionsBuilder; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/engines/tika/pom.xml b/engines/tika/pom.xml index 4f0a486a..3997679e 100644 --- a/engines/tika/pom.xml +++ b/engines/tika/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT ../../pom.xml diff --git a/model/pom.xml b/model/pom.xml index 88758a77..6596fa7d 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT diff --git a/model/src/main/java/org/alfresco/transform/common/ExtensionService.java b/model/src/main/java/org/alfresco/transform/common/ExtensionService.java index 56ca52af..b91dd557 100644 --- a/model/src/main/java/org/alfresco/transform/common/ExtensionService.java +++ b/model/src/main/java/org/alfresco/transform/common/ExtensionService.java @@ -123,6 +123,10 @@ public class ExtensionService Map.entry(MIMETYPE_IMAGE_XWD, "xwd") ); + protected ExtensionService() + { + } + public static String getExtensionForTargetMimetype(String targetMimetype, String sourceMimetype) { if (targetMimetype == null) diff --git a/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigResourceReader.java b/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigResourceReader.java index b0b36d42..f103e9b9 100644 --- a/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigResourceReader.java +++ b/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigResourceReader.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.config.reader; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.config.TransformConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; diff --git a/model/src/main/java/org/alfresco/transform/common/TransformException.java b/model/src/main/java/org/alfresco/transform/exceptions/TransformException.java similarity index 97% rename from model/src/main/java/org/alfresco/transform/common/TransformException.java rename to model/src/main/java/org/alfresco/transform/exceptions/TransformException.java index de5113d2..3812f5d8 100644 --- a/model/src/main/java/org/alfresco/transform/common/TransformException.java +++ b/model/src/main/java/org/alfresco/transform/exceptions/TransformException.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.common; +package org.alfresco.transform.exceptions; import org.springframework.http.HttpStatus; diff --git a/model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java b/model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java index 30578550..180c5fb0 100644 --- a/model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java +++ b/model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java @@ -21,7 +21,7 @@ */ package org.alfresco.transform.registry; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transform.config.TransformOption; import org.alfresco.transform.config.TransformOptionGroup; import org.alfresco.transform.config.TransformOptionValue; diff --git a/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java index 0d53c0e1..746a2685 100644 --- a/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java +++ b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java @@ -654,10 +654,11 @@ public class CombinedTransformConfigTest config.addTransformConfig(transformConfig, READ_FROM_B, BASE_URL_B, registry); config.combineTransformerConfig(registry); - String expected = "No supported source and target mimetypes could be added to the transformer \"5\" as " + - "intermediate steps should have a target mimetype. Read from readFromB"; - assertEquals(1, registry.errorMessages.size()); - assertEquals(expected, registry.errorMessages.get(0)); + assertEquals(2, registry.errorMessages.size()); + assertEquals("No supported source and target mimetypes could be added to the transformer \"5\" as " + + "intermediate steps should have a target mimetype. Read from readFromB", registry.errorMessages.get(0)); + assertEquals("Transformer \"5\" has no supported source and target mimetypes, so will be ignored. " + + "Read from readFromB", registry.errorMessages.get(1)); } @Test diff --git a/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java index cc05f9cf..49a16f2c 100644 --- a/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java +++ b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java @@ -27,7 +27,7 @@ package org.alfresco.transform.registry; import com.google.common.collect.ImmutableMap; -import org.alfresco.transform.common.TransformException; +import org.alfresco.transform.exceptions.TransformException; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/pom.xml b/pom.xml index 9b4ab8df..fbd8d548 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco alfresco-transform-core - 3.0.0-HXP-A8-SNAPSHOT + 0.0.2-HXP-SNAPSHOT Alfresco Transform Core pom