diff --git a/.gitignore b/.gitignore index 67c83748..3375951a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ *.iml *.iws +# vscode +.vscode + # Mac .DS_Store @@ -26,6 +29,7 @@ target # Package Files # *.jar +!quick.jar *.war *.ear diff --git a/_ci/cache_artifacts.sh b/_ci/cache_artifacts.sh index 135a1373..06cb5214 100644 --- a/_ci/cache_artifacts.sh +++ b/_ci/cache_artifacts.sh @@ -16,7 +16,7 @@ else echo "Downloading LibreOffice distribution..." curl -s -S ${LIBREOFFICE_RPM_URL} -o "${HOME}/artifacts/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz" fi -cp "${HOME}/artifacts/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz" alfresco-docker-libreoffice/ +cp "${HOME}/artifacts/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz" alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot popd diff --git a/_ci/static_analysis.sh b/_ci/static_analysis.sh index aaedddb2..606ba702 100644 --- a/_ci/static_analysis.sh +++ b/_ci/static_analysis.sh @@ -13,11 +13,16 @@ java -jar vosp-api-wrappers-java-$VERACODE_WRAPPER_VERSION.jar -vid $VERACODE_AP ${RUN_IN_SANDBOX} -createprofile false \ -filepath \ alfresco-transformer-base/target/alfresco-transformer-base-*.jar \ - alfresco-docker-alfresco-pdf-renderer/target/alfresco-docker-alfresco-pdf-renderer-*.jar \ - alfresco-docker-imagemagick/target/alfresco-docker-imagemagick-*.jar \ - alfresco-docker-libreoffice/target/alfresco-docker-libreoffice-*.jar \ - alfresco-docker-tika/target/alfresco-docker-tika-*.jar \ - alfresco-docker-transform-misc/target/alfresco-docker-transform-misc-*.jar \ + alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/target/alfresco-transform-pdf-renderer-*.jar \ + alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/target/alfresco-transform-pdf-renderer-*.jar \ + alfresco-transform-imagemagick/alfresco-transform-imagemagick/target/alfresco-transform-imagemagick-*.jar \ + alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/target/alfresco-transform-imagemagick-boot-*.jar \ + alfresco-transform-libreoffice/alfresco-transform-libreoffice/target/alfresco-transform-libreoffice-*.jar \ + alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/target/alfresco-transform-libreoffice-boot-*.jar \ + alfresco-transform-tika/alfresco-transform-tika/target/alfresco-transform-tika-*.jar \ + alfresco-transform-tika/alfresco-transform-tika-boot/target/alfresco-transform-tika-boot-*.jar \ + alfresco-transform-misc/alfresco-transform-misc/target/alfresco-transform-misc-*.jar \ + alfresco-transform-misc/alfresco-transform-misc-boot/target/alfresco-transform-misc-boot*.jar \ -version "$TRAVIS_JOB_ID - $TRAVIS_JOB_NUMBER" -scantimeout 3600 popd diff --git a/alfresco-docker-alfresco-pdf-renderer/.maven-dockerignore b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/.maven-dockerignore similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/.maven-dockerignore rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/.maven-dockerignore diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile similarity index 79% rename from alfresco-docker-imagemagick/Dockerfile rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile index 1d828a03..5c45b496 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile @@ -14,12 +14,12 @@ ENV JAVA_OPTS="" # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 -ARG USERNAME=imagemagick +ARG IMAGEUSERNAME=imagemagick ARG USERID=33002 -COPY target/alfresco-docker-imagemagick-${env.project_version}.jar /usr/bin +COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -RUN ln /usr/bin/alfresco-docker-imagemagick-${env.project_version}.jar /usr/bin/alfresco-docker-imagemagick.jar && \ +RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \ curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \ curl -s -S $IMAGEMAGICK_LICENSE_FILE -o ImageMagick-license.txt && \ @@ -32,11 +32,11 @@ ADD target/generated-resources/licenses.xml /licenses/ ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ RUN groupadd -g ${GROUPID} ${GROUPNAME} && \ - useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \ - chgrp -R ${GROUPNAME} /usr/bin/alfresco-docker-imagemagick.jar + useradd -u ${USERID} -G ${GROUPNAME} ${IMAGEUSERNAME} && \ + chgrp -R ${GROUPNAME} /usr/bin/${env.project_artifactId}.jar EXPOSE 8090 -USER ${USERNAME} +USER ${IMAGEUSERNAME} -ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-imagemagick.jar +ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml similarity index 96% rename from alfresco-docker-imagemagick/pom.xml rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml index 7b4229d4..f37250d5 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml @@ -1,19 +1,20 @@ 4.0.0 - alfresco-docker-imagemagick - Alfresco Docker ImageMagick + alfresco-transform-imagemagick-boot + Alfresco ImageMagick Transformer SpringBoot jar org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT - ../pom.xml + 2.2.0-SNAPSHOT + ../../pom.xml alfresco/alfresco-imagemagick quay.io + ${project.artifactId} @@ -30,6 +31,11 @@ test-jar test + + org.alfresco + alfresco-transform-imagemagick + ${project.version} + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/ImageMagickController.java similarity index 99% rename from alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/ImageMagickController.java index 69dad57a..f97c6b51 100644 --- a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/ImageMagickController.java @@ -79,8 +79,7 @@ public class ImageMagickController extends AbstractTransformerController { private static final Logger logger = LoggerFactory.getLogger(ImageMagickController.class); - @Autowired - private ImageMagickCommandExecutor commandExecutor; + private ImageMagickCommandExecutor commandExecutor = new ImageMagickCommandExecutor(); @Override public String getTransformerName() diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/OptionsBuilder.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/OptionsBuilder.java similarity index 100% rename from alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/OptionsBuilder.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/java/org/alfresco/transformer/OptionsBuilder.java diff --git a/alfresco-docker-imagemagick/src/main/resources/application-default.yaml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-docker-imagemagick/src/main/resources/application-default.yaml rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml diff --git a/alfresco-docker-imagemagick/src/main/resources/engine_config.json b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/engine_config.json similarity index 100% rename from alfresco-docker-imagemagick/src/main/resources/engine_config.json rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/engine_config.json diff --git a/alfresco-docker-imagemagick/src/main/resources/quick.jpg b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/quick.jpg similarity index 100% rename from alfresco-docker-imagemagick/src/main/resources/quick.jpg rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/quick.jpg diff --git a/alfresco-docker-imagemagick/src/main/resources/templates/transformForm.html b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-imagemagick/src/main/resources/templates/transformForm.html rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java similarity index 98% rename from alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java index 201464fd..41be934f 100644 --- a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java @@ -94,8 +94,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest @Mock private RuntimeExec mockCheckCommand; - @SpyBean - private ImageMagickCommandExecutor commandExecutor; + private ImageMagickCommandExecutor commandExecutor = new ImageMagickCommandExecutor(); @SpyBean private ImageMagickController controller; @@ -105,6 +104,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest { ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); + ReflectionTestUtils.setField(controller, "commandExecutor", commandExecutor); mockTransformCommand("jpg", "png", "image/jpg", true); } diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickHttpRequestTest.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickHttpRequestTest.java similarity index 100% rename from alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickHttpRequestTest.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickHttpRequestTest.java diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java similarity index 100% rename from alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java similarity index 100% rename from alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_complete.json b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_complete.json rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_complete.json diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_incomplete.json b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_incomplete.json rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_no_transform_options.json b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_no_transform_options.json rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_with_duplicates.json b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/engine_config_with_duplicates.json rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.bmp b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.bmp similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.bmp rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.bmp diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.eps b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.eps similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.eps rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.eps diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.gif b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.gif similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.gif rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.gif diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.jpg b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.jpg similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.jpg rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.jpg diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.pbm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.pbm similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.pbm rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.pbm diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.pgm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.pgm similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.pgm rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.pgm diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.png b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.png similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.png rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.png diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.pnm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.pnm similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.pnm rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.pnm diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.ppm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.ppm similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.ppm rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.ppm diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.psd b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.psd similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.psd rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.psd diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.tiff b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.tiff similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.tiff rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.tiff diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.xbm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.xbm similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.xbm rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.xbm diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.xpm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.xpm similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.xpm rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.xpm diff --git a/alfresco-docker-imagemagick/src/test/resources/quick.xwd b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.xwd similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/quick.xwd rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/resources/quick.xwd diff --git a/alfresco-docker-imagemagick/LICENSES.md b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/LICENSES.md similarity index 100% rename from alfresco-docker-imagemagick/LICENSES.md rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick/LICENSES.md diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml new file mode 100644 index 00000000..7a53020b --- /dev/null +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + alfresco-transform-imagemagick + Alfresco ImageMagick Transformer + jar + + + alfresco-transform-core + org.alfresco + 2.2.0-SNAPSHOT + ../../pom.xml + + + + + org.alfresco + alfresco-transformer-base + ${project.version} + + + + + + + + org.codehaus.mojo + license-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + \ No newline at end of file diff --git a/alfresco-docker-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 similarity index 98% rename from alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java rename to alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java index a0971997..1cade3a0 100644 --- a/alfresco-docker-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 @@ -29,13 +29,10 @@ package org.alfresco.transformer.executors; import java.util.HashMap; import java.util.Map; -import org.springframework.stereotype.Component; - /** * CommandExecutor implementation for running ImageMagick transformations. It runs the * transformation logic as a separate Shell process. */ -@Component public class ImageMagickCommandExecutor extends AbstractCommandExecutor { private static final String ROOT = "/usr/lib64/ImageMagick-7.0.7"; diff --git a/alfresco-docker-imagemagick/.maven-dockerignore b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/.maven-dockerignore similarity index 100% rename from alfresco-docker-imagemagick/.maven-dockerignore rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/.maven-dockerignore diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile similarity index 78% rename from alfresco-docker-libreoffice/Dockerfile rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index ac7bdecd..0c67e8a6 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile @@ -13,12 +13,12 @@ ENV JAVA_OPTS="" # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 -ARG USERNAME=libreoffice +ARG LIBREUSERNAME=libreoffice ARG USERID=33003 -COPY target/alfresco-docker-libreoffice-${env.project_version}.jar libreoffice-dist-*-linux.gz / +COPY target/${env.project_artifactId}-${env.project_version}.jar libreoffice-dist-*-linux.gz / -RUN ln /alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/alfresco-docker-libreoffice.jar && \ +RUN ln /${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ yum install -y cairo cups-libs libSM && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \ @@ -34,11 +34,11 @@ ADD target/generated-resources/licenses.xml /licenses/ ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ RUN groupadd -g ${GROUPID} ${GROUPNAME} && \ - useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \ - chgrp -R ${GROUPNAME} /usr/bin/alfresco-docker-libreoffice.jar + useradd -u ${USERID} -G ${GROUPNAME} ${LIBREUSERNAME} && \ + chgrp -R ${GROUPNAME} /usr/bin/${env.project_artifactId}.jar EXPOSE 8090 -USER ${USERNAME} +USER ${LIBREUSERNAME} -ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-libreoffice.jar +ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar diff --git a/alfresco-docker-libreoffice/LICENSES.md b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/LICENSES.md similarity index 100% rename from alfresco-docker-libreoffice/LICENSES.md rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/LICENSES.md diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml similarity index 96% rename from alfresco-docker-libreoffice/pom.xml rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml index b596f7a1..46abfa92 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml @@ -1,19 +1,20 @@ 4.0.0 - alfresco-docker-libreoffice - Alfresco Docker LibreOffice + alfresco-transform-libreoffice-boot + Alfresco LibreOffice Transformer Spring Boot jar org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT - ../pom.xml + 2.2.0-SNAPSHOT + ../../pom.xml alfresco/alfresco-libreoffice quay.io + ${project.artifactId} @@ -30,6 +31,11 @@ test-jar test + + org.alfresco + alfresco-transform-libreoffice + ${project.version} + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/LibreOfficeController.java similarity index 98% rename from alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/LibreOfficeController.java index 11b30915..aa3e2ab8 100644 --- a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/java/org/alfresco/transformer/LibreOfficeController.java @@ -77,8 +77,7 @@ public class LibreOfficeController extends AbstractTransformerController { private static final Logger logger = LoggerFactory.getLogger(LibreOfficeController.class); - @Autowired - private LibreOfficeJavaExecutor javaExecutor; + private LibreOfficeJavaExecutor javaExecutor = new LibreOfficeJavaExecutor(); @Override public String getTransformerName() diff --git a/alfresco-docker-libreoffice/src/main/resources/application-default.yaml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-docker-libreoffice/src/main/resources/application-default.yaml rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/application-default.yaml diff --git a/alfresco-docker-libreoffice/src/main/resources/engine_config.json b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/engine_config.json similarity index 100% rename from alfresco-docker-libreoffice/src/main/resources/engine_config.json rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/engine_config.json diff --git a/alfresco-docker-libreoffice/src/main/resources/quick.doc b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/quick.doc similarity index 100% rename from alfresco-docker-libreoffice/src/main/resources/quick.doc rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/quick.doc diff --git a/alfresco-docker-libreoffice/src/main/resources/templates/transformForm.html b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-libreoffice/src/main/resources/templates/transformForm.html rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java similarity index 98% rename from alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java index 6c457721..39c76afa 100644 --- a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java @@ -70,6 +70,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; /** @@ -96,6 +97,8 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest targetExtension = "pdf"; sourceMimetype = "application/msword"; + ReflectionTestUtils.setField(controller, "javaExecutor", javaExecutor); + // The following is based on super.mockTransformCommand(...) // This is because LibreOffice used JodConverter rather than a RuntimeExec diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeHttpRequestTest.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeHttpRequestTest.java similarity index 100% rename from alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeHttpRequestTest.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeHttpRequestTest.java diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java similarity index 100% rename from alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java similarity index 100% rename from alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java diff --git a/alfresco-docker-imagemagick/src/test/resources/engine_config_complete.json b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/engine_config_complete.json rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_complete.json diff --git a/alfresco-docker-imagemagick/src/test/resources/engine_config_incomplete.json b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/engine_config_incomplete.json rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-docker-imagemagick/src/test/resources/engine_config_no_transform_options.json b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/engine_config_no_transform_options.json rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-docker-imagemagick/src/test/resources/engine_config_with_duplicates.json b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-docker-imagemagick/src/test/resources/engine_config_with_duplicates.json rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-docker-libreoffice/src/test/resources/people.csv b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/people.csv similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/people.csv rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/people.csv diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.doc b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.doc similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.doc rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.doc diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.docx b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.docx similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.docx rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.docx diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.html b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.html similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.html rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.html diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.odg b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.odg similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.odg rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.odg diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.odp b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.odp similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.odp rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.odp diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.ods b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.ods similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.ods rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.ods diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.odt b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.odt similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.odt rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.odt diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.otp b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.otp similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.otp rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.otp diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/quick.pdf b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.pdf similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/main/resources/quick.pdf rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.pdf diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.ppt b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.ppt similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.ppt rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.ppt diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.pptx b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.pptx similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.pptx rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.pptx diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.vdx b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.vdx similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.vdx rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.vdx diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.vsd b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.vsd similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.vsd rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.vsd diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.wpd b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.wpd similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.wpd rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.wpd diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.xls b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.xls similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.xls rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.xls diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.xlsx b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.xlsx similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.xlsx rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.xlsx diff --git a/alfresco-docker-libreoffice/src/test/resources/sample.rtf b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/sample.rtf similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/sample.rtf rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/sample.rtf diff --git a/alfresco-docker-libreoffice/src/test/resources/sample.tsv b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/sample.tsv similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/sample.tsv rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/sample.tsv diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml new file mode 100644 index 00000000..88096b79 --- /dev/null +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + alfresco-transform-libreoffice + Alfresco LibreOffice Transformer + jar + + + alfresco-transform-core + org.alfresco + 2.2.0-SNAPSHOT + ../../pom.xml + + + + + org.alfresco + alfresco-transformer-base + ${project.version} + + + + org.dom4j + dom4j + + + + org.alfresco + alfresco-jodconverter-core + + + org.apache.pdfbox + pdfbox + + + org.apache.commons + commons-lang3 + + + + + + + org.codehaus.mojo + license-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + + \ No newline at end of file diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverter.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverter.java similarity index 100% rename from alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverter.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverter.java diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverterSharedInstance.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverterSharedInstance.java similarity index 100% rename from alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverterSharedInstance.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverterSharedInstance.java diff --git a/alfresco-docker-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 similarity index 97% rename from alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java rename to alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java index d6a366e2..38ba646a 100644 --- a/alfresco-docker-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 @@ -32,8 +32,6 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import java.io.File; import java.io.IOException; -import javax.annotation.PostConstruct; - import org.alfresco.transform.exceptions.TransformException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -43,7 +41,6 @@ import org.artofsolving.jodconverter.office.OfficeException; import org.artofsolving.jodconverter.office.OfficeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; import com.sun.star.task.ErrorCodeIOException; @@ -51,7 +48,6 @@ import com.sun.star.task.ErrorCodeIOException; * JavaExecutor implementation for running LibreOffice transformations. It loads the * transformation logic in the same JVM (check the {@link JodConverter} implementation). */ -@Component public class LibreOfficeJavaExecutor implements JavaExecutor { private static final Logger logger = LoggerFactory.getLogger(LibreOfficeJavaExecutor.class); @@ -61,8 +57,7 @@ public class LibreOfficeJavaExecutor implements JavaExecutor private JodConverter jodconverter; - @PostConstruct - public void init() + public LibreOfficeJavaExecutor() { jodconverter = createJodConverter(); } diff --git a/alfresco-docker-libreoffice/.maven-dockerignore b/alfresco-transform-misc/alfresco-transform-misc-boot/.maven-dockerignore similarity index 100% rename from alfresco-docker-libreoffice/.maven-dockerignore rename to alfresco-transform-misc/alfresco-transform-misc-boot/.maven-dockerignore diff --git a/alfresco-docker-transform-misc/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile similarity index 63% rename from alfresco-docker-transform-misc/Dockerfile rename to alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile index 8752093a..961f546d 100644 --- a/alfresco-docker-transform-misc/Dockerfile +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile @@ -8,12 +8,12 @@ ENV JAVA_OPTS="" # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 -ARG USERNAME=transform-misc +ARG MISCUSERNAME=transform-misc ARG USERID=33004 -COPY target/alfresco-docker-transform-misc-${env.project_version}.jar /usr/bin +COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -RUN ln /usr/bin/alfresco-docker-transform-misc-${env.project_version}.jar /usr/bin/alfresco-docker-transform-misc.jar && \ +RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ curl -s -S $APACHE_LICENSE_FILE -o Apache\ 2.0.txt && \ yum clean all @@ -22,11 +22,11 @@ ADD target/generated-resources/licenses.xml /licenses/ ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ RUN groupadd -g ${GROUPID} ${GROUPNAME} && \ - useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \ - chgrp -R ${GROUPNAME} /usr/bin/alfresco-docker-transform-misc.jar + useradd -u ${USERID} -G ${GROUPNAME} ${MISCUSERNAME} && \ + chgrp -R ${GROUPNAME} /usr/bin/${env.project_artifactId}.jar EXPOSE 8090 -USER ${USERNAME} +USER ${MISCUSERNAME} -ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-transform-misc.jar +ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml similarity index 91% rename from alfresco-docker-transform-misc/pom.xml rename to alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml index c8a799c5..1a1b6a81 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml @@ -2,20 +2,21 @@ 4.0.0 - alfresco-docker-transform-misc + alfresco-transform-misc-boot Alfresco Docker Miscellaneous Transformers jar org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT - ../pom.xml + 2.2.0-SNAPSHOT + ../../pom.xml alfresco/alfresco-transform-misc quay.io + ${project.artifactId} @@ -32,6 +33,12 @@ test-jar test + + org.alfresco + alfresco-transform-misc + ${project.version} + + org.springframework.boot spring-boot-starter-thymeleaf @@ -52,40 +59,6 @@ org.dom4j dom4j - - - - org.htmlparser - htmlparser - 2.1 - - - - - org.apache.commons - commons-compress - - - - - org.apache.pdfbox - pdfbox-tools - 2.0.19 - - - - - org.apache.poi - poi-ooxml - ${dependency.poi.version} - - - - - com.sun.mail - javax.mail - 1.6.2 - diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java similarity index 96% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java index 510ebb66..a257b3fc 100644 --- a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/MiscController.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java @@ -60,8 +60,7 @@ public class MiscController extends AbstractTransformerController { private static final Logger logger = LoggerFactory.getLogger(MiscController.class); - @Autowired - private SelectingTransformer transformer; + private SelectingTransformer transformer = new SelectingTransformer(); @Override public String getTransformerName() diff --git a/alfresco-docker-transform-misc/src/main/resources/application-default.yaml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-docker-transform-misc/src/main/resources/application-default.yaml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/application-default.yaml diff --git a/alfresco-docker-transform-misc/src/main/resources/engine_config.json b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/engine_config.json similarity index 100% rename from alfresco-docker-transform-misc/src/main/resources/engine_config.json rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/engine_config.json diff --git a/alfresco-docker-tika/src/test/resources/quick.html b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/quick.html similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.html rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/quick.html diff --git a/alfresco-docker-transform-misc/src/main/resources/templates/transformForm.html b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-transform-misc/src/main/resources/templates/transformForm.html rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java similarity index 97% rename from alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java index bc5ed784..cd597f7f 100644 --- a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscControllerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java @@ -62,7 +62,6 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde @RunWith(SpringRunner.class) @WebMvcTest(MiscController.class) -@Import({SelectingTransformer.class}) public class MiscControllerTest extends AbstractTransformerControllerTest { @Autowired diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java similarity index 100% rename from alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscTransformerHttpRequestTest.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformerHttpRequestTest.java similarity index 100% rename from alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscTransformerHttpRequestTest.java rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformerHttpRequestTest.java diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscTransformsIT.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformsIT.java similarity index 100% rename from alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/MiscTransformsIT.java rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformsIT.java diff --git a/alfresco-docker-transform-misc/src/test/resources/Sample.java.txt b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/Sample.java.txt similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/Sample.java.txt rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/Sample.java.txt diff --git a/alfresco-docker-transform-misc/src/test/resources/people.csv b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/people.csv similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/people.csv rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/people.csv diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.alternative.eml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.alternative.eml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.alternative.eml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.alternative.eml diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.attachment.eml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.attachment.eml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.attachment.eml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.attachment.eml diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.docx b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.docx similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.docx rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.docx diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.eml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.eml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.eml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.eml diff --git a/alfresco-docker-transform-misc/src/main/resources/quick.html b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.html similarity index 100% rename from alfresco-docker-transform-misc/src/main/resources/quick.html rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.html diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.htmlChars.eml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.htmlChars.eml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.htmlChars.eml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.htmlChars.eml diff --git a/alfresco-docker-tika/src/test/resources/quick.key b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.key similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.key rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.key diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.nested.alternative.eml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.nested.alternative.eml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.nested.alternative.eml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.nested.alternative.eml diff --git a/alfresco-docker-tika/src/test/resources/quick.numbers b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.numbers similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.numbers rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.numbers diff --git a/alfresco-docker-tika/src/test/resources/quick.pages b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.pages similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.pages rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.pages diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.spanish.eml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.spanish.eml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.spanish.eml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.spanish.eml diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.txt b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.txt similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.txt rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.txt diff --git a/alfresco-docker-tika/src/test/resources/quick.xml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.xml similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.xml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quick.xml diff --git a/alfresco-docker-transform-misc/src/test/resources/quickConcept.dita b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quickConcept.dita similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quickConcept.dita rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/quickConcept.dita diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.etx b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.etx similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.etx rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.etx diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.ics b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.ics similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.ics rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.ics diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.jsp.txt b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.jsp.txt similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.jsp.txt rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.jsp.txt diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.md b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.md similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.md rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.md diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.mw b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.mw similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.mw rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.mw diff --git a/alfresco-docker-tika/src/test/resources/sample.rtf b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.rtf similarity index 100% rename from alfresco-docker-tika/src/test/resources/sample.rtf rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.rtf diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.sgml b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.sgml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.sgml rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.sgml diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.tsv b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.tsv similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.tsv rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/sample.tsv diff --git a/alfresco-docker-transform-misc/src/test/resources/script.js b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/script.js similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/script.js rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/script.js diff --git a/alfresco-docker-transform-misc/src/test/resources/style.css b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/style.css similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/style.css rename to alfresco-transform-misc/alfresco-transform-misc-boot/src/test/resources/style.css diff --git a/alfresco-docker-transform-misc/LICENSES.md b/alfresco-transform-misc/alfresco-transform-misc/LICENSES.md similarity index 100% rename from alfresco-docker-transform-misc/LICENSES.md rename to alfresco-transform-misc/alfresco-transform-misc/LICENSES.md diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml new file mode 100644 index 00000000..9e22e212 --- /dev/null +++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml @@ -0,0 +1,91 @@ + + + + 4.0.0 + alfresco-transform-misc + Alfresco Miscellaneous Transformers + jar + + + alfresco-transform-core + org.alfresco + 2.2.0-SNAPSHOT + ../../pom.xml + + + + + org.alfresco + alfresco-transformer-base + ${project.version} + + + + org.dom4j + dom4j + + + + + org.htmlparser + htmlparser + 2.1 + + + + + org.apache.commons + commons-compress + + + + + org.apache.pdfbox + pdfbox-tools + 2.0.19 + + + + + org.apache.poi + poi-ooxml + ${dependency.poi.version} + + + + + com.sun.mail + javax.mail + 1.6.2 + + + org.apache.poi + poi-ooxml + 4.1.1 + + + + junit + junit + 4.13 + test + + + + + + + org.codehaus.mojo + license-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + \ No newline at end of file diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java diff --git a/alfresco-docker-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 similarity index 96% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java index e0e9f93f..3b42bd16 100644 --- a/alfresco-docker-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 @@ -37,7 +37,6 @@ import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; import com.google.common.collect.ImmutableMap; @@ -47,7 +46,6 @@ import com.google.common.collect.ImmutableMap; * * @author eknizat */ -@Component public class SelectingTransformer { private static final Logger logger = LoggerFactory.getLogger(SelectingTransformer.class); diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java diff --git a/alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java similarity index 100% rename from alfresco-docker-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java similarity index 92% rename from alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java rename to alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java index 3141e96c..bab76321 100644 --- a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java @@ -37,20 +37,13 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) -@Import(HtmlParserContentTransformer.class) public class HtmlParserContentTransformerTest { private static final String SOURCE_MIMETYPE = "text/html"; private static final String TARGET_MIMETYPE = "text/plain"; - @Autowired - HtmlParserContentTransformer transformer; + HtmlParserContentTransformer transformer = new HtmlParserContentTransformer(); /** * Checks that we correctly handle text in different encodings, diff --git a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java similarity index 93% rename from alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java rename to alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java index 70acf5e8..14632aae 100644 --- a/alfresco-docker-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java @@ -40,17 +40,10 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) -@Import(TextToPdfContentTransformer.class) public class TextToPdfContentTransformerTest { - @Autowired - TextToPdfContentTransformer transformer; + TextToPdfContentTransformer transformer = new TextToPdfContentTransformer(); @Before public void setUp() diff --git a/alfresco-docker-tika/.maven-dockerignore b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/.maven-dockerignore similarity index 100% rename from alfresco-docker-tika/.maven-dockerignore rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/.maven-dockerignore diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile similarity index 73% rename from alfresco-docker-alfresco-pdf-renderer/Dockerfile rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile index 3cbc9eef..9f704c0c 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile @@ -11,12 +11,12 @@ ENV JAVA_OPTS="" # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 -ARG USERNAME=pdf +ARG PDFUSERNAME=pdf ARG USERID=33001 -COPY target/alfresco-docker-alfresco-pdf-renderer-${env.project_version}.jar /usr/bin +COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -RUN ln /usr/bin/alfresco-docker-alfresco-pdf-renderer-${env.project_version}.jar /usr/bin/alfresco-docker-alfresco-pdf-renderer.jar && \ +RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ curl -s -S $PDFIUM_LICENSE_FILE -o pdfium.txt && \ tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ @@ -28,12 +28,12 @@ ADD target/generated-resources/licenses.xml /licenses/ ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ RUN groupadd -g ${GROUPID} ${GROUPNAME} && \ - useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \ - chgrp -R ${GROUPNAME} /usr/bin/alfresco-docker-alfresco-pdf-renderer.jar + useradd -u ${USERID} -G ${GROUPNAME} ${PDFUSERNAME} && \ + chgrp -R ${GROUPNAME} /usr/bin/${env.project_artifactId}.jar EXPOSE 8090 -USER ${USERNAME} +USER ${PDFUSERNAME} -ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-alfresco-pdf-renderer.jar +ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar diff --git a/alfresco-docker-alfresco-pdf-renderer/LICENSES.md b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/LICENSES.md similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/LICENSES.md rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/LICENSES.md diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml similarity index 96% rename from alfresco-docker-alfresco-pdf-renderer/pom.xml rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml index ebbdaac3..81b32f63 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml @@ -1,19 +1,22 @@ + + 4.0.0 - alfresco-docker-alfresco-pdf-renderer - Alfresco Docker Pdf Renderer + alfresco-transform-pdf-renderer-boot + Alfresco Pdf Renderer Spring Boot jar org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT - ../pom.xml + 2.2.0-SNAPSHOT + ../../pom.xml alfresco/alfresco-pdf-renderer quay.io + ${project.artifactId} @@ -30,6 +33,11 @@ test-jar test + + org.alfresco + alfresco-transform-pdf-renderer + ${project.version} + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java similarity index 98% rename from alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java index c02e9175..2bfd9207 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/AlfrescoPdfRendererController.java @@ -77,8 +77,7 @@ public class AlfrescoPdfRendererController extends AbstractTransformerController private static final Logger logger = LoggerFactory.getLogger( AlfrescoPdfRendererController.class); - @Autowired - private PdfRendererCommandExecutor commandExecutor; + private PdfRendererCommandExecutor commandExecutor = new PdfRendererCommandExecutor(); @Override public String getTransformerName() diff --git a/alfresco-docker-alfresco-pdf-renderer/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 similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/OptionsBuilder.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/OptionsBuilder.java similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/OptionsBuilder.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/java/org/alfresco/transformer/OptionsBuilder.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/application-default.yaml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/main/resources/application-default.yaml rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/application-default.yaml diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/engine_config.json b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/engine_config.json similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/main/resources/engine_config.json rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/engine_config.json diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/quick.pdf b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/quick.pdf similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/quick.pdf rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/quick.pdf diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/resources/templates/transformForm.html b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/main/resources/templates/transformForm.html rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java similarity index 98% rename from alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java index cc8b49c6..de77009e 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java @@ -94,9 +94,8 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro @Mock private RuntimeExec mockCheckCommand; - - @SpyBean - private PdfRendererCommandExecutor commandExecutor; + + private PdfRendererCommandExecutor commandExecutor = new PdfRendererCommandExecutor(); @SpyBean private AlfrescoPdfRendererController controller; @@ -106,6 +105,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro { ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); + ReflectionTestUtils.setField(controller, "commandExecutor", commandExecutor); mockTransformCommand("pdf", "png", "application/pdf", true); } diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererHttpRequestTest.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererHttpRequestTest.java similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererHttpRequestTest.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererHttpRequestTest.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererTransformationIT.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererTransformationIT.java similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererTransformationIT.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererTransformationIT.java diff --git a/alfresco-docker-libreoffice/src/test/resources/engine_config_complete.json b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/engine_config_complete.json rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_complete.json diff --git a/alfresco-docker-libreoffice/src/test/resources/engine_config_incomplete.json b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/engine_config_incomplete.json rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-docker-libreoffice/src/test/resources/engine_config_no_transform_options.json b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/engine_config_no_transform_options.json rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-docker-libreoffice/src/test/resources/engine_config_with_duplicates.json b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/engine_config_with_duplicates.json rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-docker-libreoffice/src/test/resources/quick.pdf b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quick.pdf similarity index 100% rename from alfresco-docker-libreoffice/src/test/resources/quick.pdf rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quick.pdf diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/quick.png b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quick.png similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/quick.png rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quick.png diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/quickCS3.ai b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quickCS3.ai similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/quickCS3.ai rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quickCS3.ai diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/resources/quickCS5.ai b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quickCS5.ai similarity index 100% rename from alfresco-docker-alfresco-pdf-renderer/src/test/resources/quickCS5.ai rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/resources/quickCS5.ai diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/LICENSES.md b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/LICENSES.md new file mode 100644 index 00000000..8dd5b427 --- /dev/null +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/LICENSES.md @@ -0,0 +1,4 @@ +### Licenses + +* 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-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml new file mode 100644 index 00000000..2993daad --- /dev/null +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + alfresco-transform-pdf-renderer + Alfresco Pdf Renderer Transformer + jar + + + org.alfresco + alfresco-transform-core + 2.2.0-SNAPSHOT + ../../pom.xml + + + + + org.alfresco + alfresco-transformer-base + ${project.version} + + + + + + + org.codehaus.mojo + license-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + diff --git a/alfresco-docker-alfresco-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 similarity index 97% rename from alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java rename to alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java index 90ad4509..d2b33f67 100644 --- a/alfresco-docker-alfresco-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 @@ -29,13 +29,10 @@ package org.alfresco.transformer.executors; import java.util.HashMap; import java.util.Map; -import org.springframework.stereotype.Component; - /** * CommandExecutor implementation for running PDF Renderer transformations. It runs the * transformation logic as a separate Shell process. */ -@Component public class PdfRendererCommandExecutor extends AbstractCommandExecutor { private static final String EXE = "/usr/bin/alfresco-pdf-renderer"; diff --git a/alfresco-docker-transform-misc/.maven-dockerignore b/alfresco-transform-tika/alfresco-transform-tika-boot/.maven-dockerignore similarity index 100% rename from alfresco-docker-transform-misc/.maven-dockerignore rename to alfresco-transform-tika/alfresco-transform-tika-boot/.maven-dockerignore diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile similarity index 66% rename from alfresco-docker-tika/Dockerfile rename to alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile index 9091a08e..e0bbc73f 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile @@ -10,12 +10,12 @@ ENV JAVA_OPTS="" # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 -ARG USERNAME=tika +ARG TIKAUSERNAME=tika ARG USERID=33004 -COPY target/alfresco-docker-tika-${env.project_version}.jar /usr/bin +COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -RUN ln /usr/bin/alfresco-docker-tika-${env.project_version}.jar /usr/bin/alfresco-docker-tika.jar && \ +RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ curl -s -S $APACHE_LICENSE_FILE -o Apache\ 2.0.txt && \ yum clean all @@ -24,11 +24,11 @@ ADD target/generated-resources/licenses.xml /licenses/ ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ RUN groupadd -g ${GROUPID} ${GROUPNAME} && \ - useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \ - chgrp -R ${GROUPNAME} /usr/bin/alfresco-docker-tika.jar + useradd -u ${USERID} -G ${GROUPNAME} ${TIKAUSERNAME} && \ + chgrp -R ${GROUPNAME} /usr/bin/${env.project_artifactId}.jar EXPOSE 8090 -USER ${USERNAME} +USER ${TIKAUSERNAME} -ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-tika.jar +ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar diff --git a/alfresco-docker-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml similarity index 96% rename from alfresco-docker-tika/pom.xml rename to alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml index 89014152..30b6cd8d 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml @@ -1,19 +1,20 @@ 4.0.0 - alfresco-docker-tika - Alfresco Docker Tika + alfresco-transform-tika-boot + Alfresco Tika Transformer Spring Boot jar org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT - ../pom.xml + 2.2.0-SNAPSHOT + ../../pom.xml alfresco/alfresco-tika quay.io + ${project.artifactId} @@ -30,6 +31,11 @@ test-jar test + + org.alfresco + alfresco-transform-tika + ${project.version} + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-docker-tika/src/license/THIRD-PARTY.properties b/alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties similarity index 100% rename from alfresco-docker-tika/src/license/THIRD-PARTY.properties rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/Application.java similarity index 100% rename from alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/Application.java diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java similarity index 99% rename from alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java index a78e9880..6e3965d3 100644 --- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/TikaController.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java @@ -84,8 +84,7 @@ public class TikaController extends AbstractTransformerController { private static final Logger logger = LoggerFactory.getLogger(TikaController.class); - @Autowired - private TikaJavaExecutor javaExecutor; + private TikaJavaExecutor javaExecutor = new TikaJavaExecutor(); @Override public String getTransformerName() diff --git a/alfresco-docker-tika/src/main/resources/application-default.yaml b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-docker-tika/src/main/resources/application-default.yaml rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/application-default.yaml diff --git a/alfresco-docker-tika/src/main/resources/engine_config.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/engine_config.json similarity index 100% rename from alfresco-docker-tika/src/main/resources/engine_config.json rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/engine_config.json diff --git a/alfresco-docker-tika/src/main/resources/quick.pdf b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/quick.pdf similarity index 100% rename from alfresco-docker-tika/src/main/resources/quick.pdf rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/quick.pdf diff --git a/alfresco-docker-tika/src/main/resources/templates/transformForm.html b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-docker-tika/src/main/resources/templates/transformForm.html rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/main/resources/templates/transformForm.html diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java similarity index 99% rename from alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java index c573ee6d..36cb92ff 100644 --- a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java @@ -133,9 +133,6 @@ public class TikaControllerTest extends AbstractTransformerControllerTest @Mock private RuntimeExec mockCheckCommand; - @SpyBean - private TikaJavaExecutor javaExecutor; - @SpyBean private TikaController controller; diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java similarity index 100% rename from alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaHttpRequestTest.java diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java similarity index 100% rename from alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaTransformationIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaTransformationIT.java similarity index 100% rename from alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaTransformationIT.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaTransformationIT.java diff --git a/alfresco-docker-tika/src/test/resources/engine_config_complete.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-docker-tika/src/test/resources/engine_config_complete.json rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_complete.json diff --git a/alfresco-docker-tika/src/test/resources/engine_config_incomplete.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-docker-tika/src/test/resources/engine_config_incomplete.json rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-docker-tika/src/test/resources/engine_config_no_transform_options.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-docker-tika/src/test/resources/engine_config_no_transform_options.json rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-docker-tika/src/test/resources/engine_config_with_duplicates.json b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-docker-tika/src/test/resources/engine_config_with_duplicates.json rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-docker-tika/src/test/resources/quick.doc b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.doc similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.doc rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.doc diff --git a/alfresco-docker-tika/src/test/resources/quick.docx b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.docx similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.docx rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.docx diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.html b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.html similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.html rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.html diff --git a/alfresco-docker-tika/src/test/resources/quick.jar b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.jar similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.jar rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.jar diff --git a/alfresco-docker-tika/src/test/resources/quick.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.java similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.java rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.java diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.key b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.key similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.key rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.key diff --git a/alfresco-docker-tika/src/test/resources/quick.msg b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.msg similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.msg rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.msg diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.numbers b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.numbers similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.numbers rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.numbers diff --git a/alfresco-docker-tika/src/test/resources/quick.odp b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odp similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.odp rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odp diff --git a/alfresco-docker-tika/src/test/resources/quick.ods b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ods similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.ods rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ods diff --git a/alfresco-docker-tika/src/test/resources/quick.odt b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.odt rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.odt diff --git a/alfresco-docker-tika/src/test/resources/quick.ogg b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ogg similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.ogg rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ogg diff --git a/alfresco-docker-tika/src/test/resources/quick.otp b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otp similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.otp rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.otp diff --git a/alfresco-docker-tika/src/test/resources/quick.ots b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ots similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.ots rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ots diff --git a/alfresco-docker-tika/src/test/resources/quick.ott b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.ott rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ott diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.pages b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pages similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.pages rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pages diff --git a/alfresco-docker-tika/src/test/resources/quick.pdf b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.pdf rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pdf diff --git a/alfresco-docker-tika/src/test/resources/quick.ppt b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ppt similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.ppt rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.ppt diff --git a/alfresco-docker-tika/src/test/resources/quick.pptx b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pptx similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.pptx rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.pptx diff --git a/alfresco-docker-tika/src/test/resources/quick.rar b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.rar similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.rar rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.rar diff --git a/alfresco-docker-tika/src/test/resources/quick.sxw b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.sxw rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.sxw diff --git a/alfresco-docker-tika/src/test/resources/quick.tar b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tar similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.tar rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tar diff --git a/alfresco-docker-tika/src/test/resources/quick.tar.gz b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tar.gz similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.tar.gz rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.tar.gz diff --git a/alfresco-docker-tika/src/test/resources/quick.txt b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.txt similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.txt rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.txt diff --git a/alfresco-docker-tika/src/test/resources/quick.vsd b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.vsd similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.vsd rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.vsd diff --git a/alfresco-docker-tika/src/test/resources/quick.xls b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.xls similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.xls rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.xls diff --git a/alfresco-docker-transform-misc/src/test/resources/quick.xml b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.xml similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/quick.xml rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.xml diff --git a/alfresco-docker-tika/src/test/resources/quick.xslx b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.xslx similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.xslx rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.xslx diff --git a/alfresco-docker-tika/src/test/resources/quick.zip b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.zip similarity index 100% rename from alfresco-docker-tika/src/test/resources/quick.zip rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/quick.zip diff --git a/alfresco-docker-tika/src/test/resources/sample.rss b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/sample.rss similarity index 100% rename from alfresco-docker-tika/src/test/resources/sample.rss rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/sample.rss diff --git a/alfresco-docker-transform-misc/src/test/resources/sample.rtf b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/sample.rtf similarity index 100% rename from alfresco-docker-transform-misc/src/test/resources/sample.rtf rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/sample.rtf diff --git a/alfresco-docker-tika/src/test/resources/sample.xhtml.txt b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/sample.xhtml.txt similarity index 100% rename from alfresco-docker-tika/src/test/resources/sample.xhtml.txt rename to alfresco-transform-tika/alfresco-transform-tika-boot/src/test/resources/sample.xhtml.txt diff --git a/alfresco-docker-tika/LICENSES.md b/alfresco-transform-tika/alfresco-transform-tika/LICENSES.md similarity index 100% rename from alfresco-docker-tika/LICENSES.md rename to alfresco-transform-tika/alfresco-transform-tika/LICENSES.md diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml new file mode 100644 index 00000000..c52116a9 --- /dev/null +++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml @@ -0,0 +1,112 @@ + + + 4.0.0 + alfresco-transform-tika + Alfresco Tika Transformer + jar + + + alfresco-transform-core + org.alfresco + 2.2.0-SNAPSHOT + ../../pom.xml + + + + + org.alfresco + alfresco-transformer-base + ${project.version} + + + + + org.apache.tika + tika-core + 1.21-20190624-alfresco-patched + + + org.apache.tika + tika-parsers + 1.21-20190624-alfresco-patched + + + com.tdunning + json + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcmail-jdk15on + + + + org.quartz-scheduler + quartz + + + + + + + org.bouncycastle + bcprov-jdk15on + 1.64 + + + org.bouncycastle + bcmail-jdk15on + 1.64 + + + + + org.apache.poi + poi + ${dependency.poi.version} + + + org.apache.poi + poi-ooxml + ${dependency.poi.version} + + + org.apache.poi + poi-scratchpad + ${dependency.poi.version} + + + + + org.apache.pdfbox + pdfbox + + + + org.apache.pdfbox + pdfbox-tools + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + org.codehaus.mojo + license-maven-plugin + + + + \ No newline at end of file diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties b/alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties new file mode 100644 index 00000000..93b81141 --- /dev/null +++ b/alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties @@ -0,0 +1,52 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - (MIT-style) netCDF C library license +# - 3-Clause BSD License +# - Apache 2.0 +# - Apache License 2.0 +# - Apache License v2 +# - Apache License v2.0 +# - Apache License, Version 2.0 +# - Apache License, version 2.0 +# - Apache Software License - Version 2.0 +# - BSD +# - BSD 3-clause License w/nuclear disclaimer +# - BSD 3-clause New License +# - BSD License +# - BSD-2-Clause +# - Bouncy Castle Licence +# - CDDL + GPLv2 with classpath exception +# - CDDL, v1.0 +# - CDDL/GPLv2+CE +# - EDL 1.0 +# - EPL 2.0 +# - Eclipse Distribution License - v 1.0 +# - Eclipse Public License - v 1.0 +# - Eclipse Public License 2.0 +# - GNU General Public License, version 2 with the GNU Classpath Exception +# - GNU Lesser General Public License +# - GPL2 w/ CPE +# - LGPL, v2.1 or later +# - LGPL, version 2.1 +# - MIT License +# - MIT License (MIT) +# - Mozilla Public License 1.1 (MPL 1.1) +# - OGC copyright +# - Public Domain +# - Public Domain, per Creative Commons CC0 +# - Similar to Apache License but with the acknowledgment clause removed +# - The Apache License, Version 2.0 +# - The Apache Software License, Version 2.0 +# - The BSD License +# - The MIT License +# - The SAX License +# - The W3C License +# - UnRar License +# - lgpl +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Mar 26 11:14:47 GMT 2020 +net.jcip--jcip-annotations--1.0= diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/Tika.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/Tika.java similarity index 100% rename from alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/Tika.java rename to alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/Tika.java diff --git a/alfresco-docker-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 similarity index 93% rename from alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java rename to alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaJavaExecutor.java index 9f73d2cb..1c92da78 100644 --- a/alfresco-docker-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 @@ -37,23 +37,26 @@ import java.util.StringJoiner; import org.alfresco.transform.exceptions.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.apache.tika.exception.TikaException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import org.xml.sax.SAXException; /** * JavaExecutor implementation for running TIKA transformations. It loads the * transformation logic in the same JVM (check {@link Tika}). */ -@Component public class TikaJavaExecutor implements JavaExecutor { private final Tika tika; - @Autowired - public TikaJavaExecutor() throws TikaException, IOException, SAXException + public TikaJavaExecutor() { - tika = new Tika(); + try + { + tika = new Tika(); + } + catch (SAXException | IOException | TikaException e) + { + throw new RuntimeException("Unable to instantiate Tika: " + e.getMessage()); + } } @Override diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java similarity index 100% rename from alfresco-docker-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java rename to alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/TikaOfficeDetectParser.java diff --git a/alfresco-docker-tika/src/main/resources/tika-config.xml b/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika-config.xml similarity index 100% rename from alfresco-docker-tika/src/main/resources/tika-config.xml rename to alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika-config.xml diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 6d1ec471..0d143864 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -4,12 +4,12 @@ org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../pom.xml alfresco-transformer-base - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2effcdeb..82449ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.alfresco alfresco-transform-core - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom @@ -32,11 +32,16 @@ alfresco-transformer-base - alfresco-docker-tika - alfresco-docker-alfresco-pdf-renderer - alfresco-docker-imagemagick - alfresco-docker-libreoffice - alfresco-docker-transform-misc + alfresco-transform-tika/alfresco-transform-tika + alfresco-transform-tika/alfresco-transform-tika-boot + alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer + alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot + alfresco-transform-libreoffice/alfresco-transform-libreoffice + alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot + alfresco-transform-imagemagick/alfresco-transform-imagemagick + alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot + alfresco-transform-misc/alfresco-transform-misc + alfresco-transform-misc/alfresco-transform-misc-boot