From 0eb8d9e142e1e1bc5b9495be2816bdd357983ece Mon Sep 17 00:00:00 2001 From: alandavis Date: Sun, 3 Jul 2022 11:41:07 +0100 Subject: [PATCH] Save point: Simpler project structure for core t-engines --- README.md | 8 +- .../alfresco-transform-core-aio/pom.xml | 66 ---- .../coreaio/AIOControllerImageMagickTest.java | 145 -------- .../coreaio/AIOControllerLibreOfficeTest.java | 120 ------- .../coreaio/AIOControllerMiscTest.java | 88 ----- .../coreaio/AIOControllerPdfRendererTest.java | 119 ------- .../coreaio/AIOControllerTikaTest.java | 102 ------ .../coreaio/AIOCustomConfigTest.java | 55 --- .../coreaio/AIOTransformRegistryTest.java | 321 ------------------ .../alfresco-transform-imagemagick/pom.xml | 30 -- .../alfresco-transform-libreoffice/pom.xml | 46 --- .../alfresco-transform-misc/pom.xml | 86 ----- .../alfresco-transform-pdf-renderer/pom.xml | 30 -- .../alfresco-transform-tika/pom.xml | 125 ------- .../alfresco-transformer-base}/README.md | 6 +- .../alfresco-transformer-base}/pom.xml | 4 +- .../alfresco/transform/CustomTransformer.java | 0 .../alfresco/transform/TransformEngine.java | 0 .../AbstractTransformerController.java | 0 .../transformer/QueueTransformService.java | 0 .../transformer/TransformController.java | 0 .../transformer/TransformInterceptor.java | 0 .../transformer/TransformRegistryImpl.java | 0 .../AlfrescoSharedFileStoreClient.java | 0 .../config/WebApplicationConfig.java | 0 .../executors/AbstractCommandExecutor.java | 0 .../executors/CommandExecutor.java | 0 .../executors/ExecParameterTokenizer.java | 0 .../transformer/executors/JavaExecutor.java | 0 .../transformer/executors/RuntimeExec.java | 0 .../transformer/executors/Transformer.java | 0 .../alfresco/transformer/fs/FileManager.java | 0 .../transformer/logging/LogEntry.java | 0 .../transformer/logging/StandardMessages.java | 0 .../messaging/MessagingConfig.java | 0 .../transformer/messaging/MessagingInfo.java | 0 .../messaging/TransformMessageConverter.java | 0 .../messaging/TransformReplySender.java | 0 .../AbstractMetadataExtractor.java | 0 .../transformer/model/FileRefEntity.java | 0 .../transformer/model/FileRefResponse.java | 0 .../probes/ProbeTestTransform.java | 0 .../transformer/util/RequestParamMap.java | 0 .../org/alfresco/transformer/util/Util.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/engine_config.json | 0 .../src/main/resources/templates/error.html | 0 .../src/main/resources/templates/log.html | 0 .../transformer/AbstractHttpRequestTest.java | 0 .../AbstractMetadataExtractsIT.java | 0 .../AbstractQueueTransformServiceIT.java | 0 .../AbstractTransformerControllerTest.java | 0 .../alfresco/transformer/EngineClient.java | 0 .../QueueTransformServiceTest.java | 0 .../alfresco/transformer/SourceTarget.java | 0 .../alfresco/transformer/TestFileInfo.java | 0 .../resources/engine_config_complete.json | 0 .../resources/engine_config_incomplete.json | 0 .../engine_config_no_transform_options.json | 0 .../engine_config_with_duplicates.json | 0 .../aio}/Dockerfile | 8 +- .../aio}/pom.xml | 130 ++++--- .../transform/coreaio/AIOTransformEngine.java | 10 +- .../main/resources/application-default.yaml | 0 .../src/main/resources/application.properties | 0 .../licenses/3rd-party/Apache 2.0.txt | 0 .../3rd-party/ImageMagick-license.txt | 0 .../3rd-party/Perl-Artistic-license.txt | 0 .../licenses/3rd-party/libreoffice.txt | 0 .../resources/licenses/3rd-party/pdfium.txt | 0 .../aio}/src/main/resources/quick.html | 0 .../resources/templates/transformForm.html | 0 .../aio}/AIOControllerHttpRequestTest.java | 4 +- .../aio/AIOControllerImageMagickTest.java | 119 +++++++ .../aio/AIOControllerLibreOfficeTest.java | 101 ++++++ .../transform/aio/AIOControllerMiscTest.java | 73 ++++ .../aio/AIOControllerPdfRendererTest.java | 103 ++++++ .../transform/aio}/AIOControllerTest.java | 32 +- .../transform/aio/AIOControllerTikaTest.java | 82 +++++ .../transform/aio}/AIOImageMagickIT.java | 2 +- .../aio}/AIOLibreOfficeTransformationIT.java | 3 +- .../aio}/AIOMiscMetadataExtractsIT.java | 3 +- .../transform/aio}/AIOMiscTransformsIT.java | 3 +- .../transform/aio}/AIOPdfRendererIT.java | 8 +- .../aio}/AIOQueueTransformServiceIT.java | 12 +- .../aio}/AIOTikaMetadataExtractsIT.java | 3 +- .../aio}/AIOTikaTransformationIT.java | 3 +- .../aio/AIOTransformRegistryTest.java | 312 +++++++++++++++++ .../test/resources/misc_engine_config.json | 0 .../test/resources/tika_engine_config.json | 0 {t-engine-base => engines/base}/README.md | 8 +- {t-engine-base => engines/base}/pom.xml | 4 +- .../alfresco/transform/base/Application.java | 0 .../transform/base/CustomTransformer.java | 0 .../transform/base/QueueTransformService.java | 0 .../transform/base/TransformController.java | 20 +- .../transform/base/TransformEngine.java | 0 .../transform/base/TransformInterceptor.java | 0 .../transform/base/TransformRegistryImpl.java | 0 .../AlfrescoSharedFileStoreClient.java | 0 .../base/config/WebApplicationConfig.java | 0 .../executors/AbstractCommandExecutor.java | 0 .../base/executors/CommandExecutor.java | 0 .../executors/ExecParameterTokenizer.java | 0 .../transform/base/executors/RuntimeExec.java | 0 .../transform/base/fs/FileManager.java | 0 .../transform/base/logging/LogEntry.java | 0 .../base/logging/StandardMessages.java | 0 .../base/messaging/MessagingConfig.java | 0 .../base/messaging/MessagingInfo.java | 0 .../messaging/TransformMessageConverter.java | 0 .../base/messaging/TransformReplySender.java | 0 .../AbstractMetadataExtractor.java | 0 .../transform/base/model/FileRefEntity.java | 0 .../transform/base/model/FileRefResponse.java | 0 .../base/probes/ProbeTestTransform.java | 0 .../alfresco/transform/base/util/Util.java | 0 .../base}/src/main/resources/application.yaml | 0 .../src/main/resources/engine_config.json | 0 .../src/main/resources/templates/error.html | 0 .../src/main/resources/templates/log.html | 0 .../base/AbstractHttpRequestTest.java | 0 .../base/AbstractMetadataExtractsIT.java | 0 .../base/AbstractQueueTransformServiceIT.java | 0 .../base/AbstractTransformControllerTest.java | 5 +- .../alfresco/transform/base/EngineClient.java | 0 .../base/QueueTransformServiceTest.java | 0 .../alfresco/transform/base/SourceTarget.java | 6 +- .../alfresco/transform/base/TestFileInfo.java | 0 .../resources/engine_config_complete.json | 0 .../resources/engine_config_incomplete.json | 0 .../engine_config_no_transform_options.json | 0 .../engine_config_with_duplicates.json | 0 .../imagemagick}/.maven-dockerignore | 0 .../imagemagick}/Dockerfile | 0 .../imagemagick}/LICENSES.md | 0 .../imagemagick}/README.md | 0 .../imagemagick}/pom.xml | 15 +- .../imagemagick}/scripts/build-rpms.sh | 0 .../ImageMagickOptionsBuilder.java | 0 .../ImageMagickTransformEngine.java | 0 .../transformers/ImageMagickTransformer.java | 0 .../main/resources/application-default.yaml | 0 .../resources/imagemagick_engine_config.json | 0 .../3rd-party/ImageMagick-license.txt | 0 .../imagemagick}/src/main/resources/quick.jpg | Bin .../resources/templates/transformForm.html | 0 .../ImageMagickControllerTest.java | 31 +- .../ImageMagickHttpRequestTest.java | 2 +- .../ImageMagickQueueTransformServiceIT.java | 2 +- .../ImageMagickTransformationIT.java | 6 +- .../resources/engine_config_complete.json | 0 .../resources/engine_config_incomplete.json | 0 .../engine_config_no_transform_options.json | 0 .../engine_config_with_duplicates.json | 0 .../imagemagick}/src/test/resources/quick.bmp | Bin .../imagemagick}/src/test/resources/quick.eps | 0 .../imagemagick}/src/test/resources/quick.gif | Bin .../imagemagick}/src/test/resources/quick.jpg | Bin .../imagemagick}/src/test/resources/quick.pbm | Bin .../imagemagick}/src/test/resources/quick.pgm | 0 .../imagemagick}/src/test/resources/quick.png | Bin .../imagemagick}/src/test/resources/quick.pnm | 0 .../imagemagick}/src/test/resources/quick.ppm | 0 .../imagemagick}/src/test/resources/quick.psd | Bin .../src/test/resources/quick.tiff | Bin .../imagemagick}/src/test/resources/quick.xbm | 0 .../imagemagick}/src/test/resources/quick.xpm | 0 .../imagemagick}/src/test/resources/quick.xwd | Bin .../libreoffice}/.maven-dockerignore | 0 .../libreoffice}/Dockerfile | 0 .../libreoffice}/LICENSES.md | 0 .../libreoffice}/pom.xml | 25 +- .../LibreOfficeTransformEngine.java | 0 .../transformers/JodConverter.java | 0 .../JodConverterSharedInstance.java | 0 .../LibreOfficeExtractMetadataTask.java | 0 .../transformers/LibreOfficeTransformer.java | 0 .../main/resources/application-default.yaml | 0 .../src/main/resources/application.properties | 0 .../resources/libreoffice_engine_config.json | 0 .../licenses}/3rd-party/libreoffice.txt | 0 .../libreoffice}/src/main/resources/quick.doc | Bin .../resources/templates/transformForm.html | 0 .../LibreOfficeControllerTest.java | 107 +++--- .../LibreOfficeHttpRequestTest.java | 2 +- .../LibreOfficeQueueTransformServiceIT.java | 2 +- .../LibreOfficeTransformationIT.java | 6 +- .../resources/engine_config_complete.json | 0 .../resources/engine_config_incomplete.json | 0 .../engine_config_no_transform_options.json | 0 .../engine_config_with_duplicates.json | 0 .../src/test/resources/people.csv | 0 .../src/test/resources/quick.dita | 0 .../libreoffice}/src/test/resources/quick.doc | Bin .../src/test/resources/quick.docx | Bin .../src/test/resources/quick.html | 0 .../libreoffice}/src/test/resources/quick.odg | Bin .../libreoffice}/src/test/resources/quick.odp | Bin .../libreoffice}/src/test/resources/quick.ods | Bin .../libreoffice}/src/test/resources/quick.odt | Bin .../libreoffice}/src/test/resources/quick.otp | Bin .../libreoffice}/src/test/resources/quick.pdf | Bin .../src/test/resources/quick.ppsm | Bin .../src/test/resources/quick.ppsx | Bin .../libreoffice}/src/test/resources/quick.ppt | Bin .../src/test/resources/quick.pptx | Bin .../libreoffice}/src/test/resources/quick.stc | Bin .../libreoffice}/src/test/resources/quick.sti | Bin .../libreoffice}/src/test/resources/quick.stw | Bin .../libreoffice}/src/test/resources/quick.sxc | Bin .../libreoffice}/src/test/resources/quick.sxi | Bin .../libreoffice}/src/test/resources/quick.txt | 0 .../libreoffice}/src/test/resources/quick.vdx | 0 .../libreoffice}/src/test/resources/quick.vsd | Bin .../libreoffice}/src/test/resources/quick.wpd | Bin .../libreoffice}/src/test/resources/quick.xls | Bin .../src/test/resources/quick.xlsx | Bin .../src/test/resources/quick.xltm | Bin .../libreoffice}/src/test/resources/quick.xml | 0 .../src/test/resources/sample.rtf | 0 .../src/test/resources/sample.tsv | 0 .../misc}/.maven-dockerignore | 0 .../misc}/Dockerfile | 0 .../misc}/LICENSES.md | 0 .../misc}/pom.xml | 82 +++-- .../transform/misc/MiscTransformEngine.java | 5 +- .../HtmlMetadataExtractor.java | 0 .../RFC822MetadataExtractor.java | 0 .../AppleIWorksContentTransformer.java | 0 .../misc/transformers/EMLTransformer.java | 0 .../HtmlParserContentTransformer.java | 0 .../OOXMLThumbnailContentTransformer.java | 0 .../StringExtractingContentTransformer.java | 0 .../TextToPdfContentTransformer.java | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 .../main/resources/application-default.yaml | 0 .../licenses}/3rd-party/Apache 2.0.txt | 0 .../main/resources/misc_engine_config.json | 0 .../misc}/src/main/resources/quick.html | 0 .../resources/templates/transformForm.html | 0 .../transform/misc/MiscControllerTest.java | 45 +-- .../misc/MiscMetadataExtractsIT.java | 8 +- .../misc/MiscQueueTransformServiceIT.java | 2 +- .../misc/MiscTransformerHttpRequestTest.java | 0 .../transform/misc/MiscTransformsIT.java | 8 +- .../HtmlParserContentTransformerTest.java | 0 .../TextToPdfContentTransformerTest.java | 0 .../misc}/src/test/resources/Sample.java.txt | 0 .../test/resources/misc_engine_config.json | 0 .../misc}/src/test/resources/people.csv | 0 .../src/test/resources/quick.alternative.eml | 0 .../src/test/resources/quick.attachment.eml | 0 .../misc}/src/test/resources/quick.docx | Bin .../misc}/src/test/resources/quick.eml | 0 .../test/resources/quick.eml_metadata.json | 0 .../misc}/src/test/resources/quick.html | 0 .../src/test/resources/quick.htmlChars.eml | 0 .../test/resources/quick.html_metadata.json | 0 .../src/test/resources/quick.japanese.html | 0 .../quick.japanese.html_metadata.json | 0 .../misc}/src/test/resources/quick.key | Bin .../resources/quick.nested.alternative.eml | 0 .../misc}/src/test/resources/quick.numbers | Bin .../misc}/src/test/resources/quick.pages | Bin .../src/test/resources/quick.spanish.eml | 0 .../resources/quick.spanish.eml_metadata.json | 0 .../misc}/src/test/resources/quick.xhtml.alf | 0 .../resources/quick.xhtml.alf_metadata.json | 0 .../misc}/src/test/resources/quick.xml | 0 .../misc}/src/test/resources/quick2.txt | 0 .../src/test/resources/quickConcept.dita | 0 .../misc}/src/test/resources/sample.etx | 0 .../misc}/src/test/resources/sample.ics | 0 .../misc}/src/test/resources/sample.jsp.txt | 0 .../misc}/src/test/resources/sample.md | 0 .../misc}/src/test/resources/sample.mw | 0 .../misc}/src/test/resources/sample.rtf | 0 .../misc}/src/test/resources/sample.sgml | 0 .../misc}/src/test/resources/sample.tsv | 0 .../misc}/src/test/resources/script.js | 0 .../misc}/src/test/resources/style.css | 0 .../pdfrenderer}/.maven-dockerignore | 0 .../pdfrenderer}/Dockerfile | 0 .../pdfrenderer}/LICENSES.md | 0 .../pdfrenderer}/pom.xml | 13 +- .../PdfRendererOptionsBuilder.java | 4 +- .../PdfRendererTransformEngine.java | 0 .../transformers/PdfRendererTransformer.java | 0 .../main/resources/application-default.yaml | 0 .../resources/licenses}/3rd-party/pdfium.txt | 0 .../resources/pdfrenderer_engine_config.json | 0 .../pdfrenderer}/src/main/resources/quick.pdf | Bin .../resources/templates/transformForm.html | 0 .../AlfrescoPdfRendererControllerTest.java | 34 +- .../AlfrescoPdfRendererHttpRequestTest.java | 2 +- ...scoPdfRendererQueueTransformServiceIT.java | 2 +- .../AlfrescoPdfRendererTransformationIT.java | 6 +- .../resources/engine_config_complete.json | 0 .../resources/engine_config_incomplete.json | 0 .../engine_config_no_transform_options.json | 0 .../engine_config_with_duplicates.json | 0 .../resources/pdfrenderer_engine_config.json | 0 .../pdfrenderer}/src/test/resources/quick.pdf | Bin .../pdfrenderer}/src/test/resources/quick.png | Bin .../src/test/resources/quickCS3.ai | 0 .../src/test/resources/quickCS5.ai | 0 .../tika}/.maven-dockerignore | 0 .../tika}/Dockerfile | 0 .../tika}/LICENSES.md | 0 .../tika}/pom.xml | 27 +- .../transform/tika/TikaTransformEngine.java | 0 .../AbstractTikaMetadataExtractor.java | 0 .../DWGMetadataExtractor.java | 0 .../IPTCMetadataExtractor.java | 0 .../MP3MetadataExtractor.java | 0 .../MailMetadataExtractor.java | 0 .../OfficeMetadataExtractor.java | 0 .../OpenDocumentMetadataExtractor.java | 0 .../PdfBoxMetadataExtractor.java | 0 .../PoiMetadataExtractor.java | 0 .../TikaAudioMetadataExtractor.java | 0 .../TikaAutoMetadataExtractor.java | 0 .../tika/parsers/ExifToolParser.java | 0 .../tika/parsers/TikaOfficeDetectParser.java | 0 .../tika/transformers/ArchiveTransformer.java | 0 .../transformers/GenericTikaTransformer.java | 0 .../tika/transformers/OOXMLTransformer.java | 0 .../tika/transformers/OfficeTransformer.java | 0 .../transformers/OutlookMsgTransformer.java | 0 .../tika/transformers/PdfBoxTransformer.java | 0 .../tika/transformers/PoiTransformer.java | 0 .../transformers/TextMiningTransformer.java | 0 .../transform/tika/transformers/Tika.java | 0 .../transformers/TikaAutoTransformer.java | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 ...adataExtractor_metadata_extract.properties | 0 .../main/resources/application-default.yaml | 0 .../licenses}/3rd-party/Apache 2.0.txt | 0 .../3rd-party/Perl-Artistic-license.txt | 0 .../external/config/exiftool-parser.xml | 0 .../tika}/src/main/resources/quick.pdf | Bin .../resources/templates/transformForm.html | 0 .../tika}/src/main/resources/tika-config.xml | 0 .../main/resources/tika_engine_config.json | 0 .../transform/tika/TikaControllerTest.java | 11 +- .../transform/tika/TikaHttpRequestTest.java | 0 .../tika/TikaMetadataExtractsIT.java | 0 .../tika/TikaQueueTransformServiceIT.java | 0 .../transform/tika/TikaTransformationIT.java | 1 + .../IPTCMetadataExtractorTest.java | 0 .../tika/parsers/ExifToolParserTest.java | 0 .../GenericTikaTransformerTest.java | 0 .../20140614_163822_Photogrpahy_Class.ARW | Bin ...163822_Photogrpahy_Class.ARW_metadata.json | 0 .../test/resources/20140629_145035_Flower.RW2 | Bin .../20140629_145035_Flower.RW2_metadata.json | 0 .../test/resources/20141227_134519_Palace.CR2 | Bin .../20141227_134519_Palace.CR2_metadata.json | 0 .../test/resources/20150408_074941_Bush.NEF | Bin .../20150408_074941_Bush.NEF_metadata.json | 0 .../20160502_190928_London_Underground.RAF | Bin ...90928_London_Underground.RAF_metadata.json | 0 .../test/resources/dmsu1332-reproduced.xlsx | Bin .../dmsu1332-reproduced.xlsx_metadata.json | 0 .../resources/engine_config_complete.json | 0 .../resources/engine_config_incomplete.json | 0 .../engine_config_no_transform_options.json | 0 .../engine_config_with_duplicates.json | 0 .../src/test/resources/problemFootnotes2.docx | Bin .../tika}/src/test/resources/quick.3g2 | Bin .../test/resources/quick.3g2_metadata.json | 0 .../tika}/src/test/resources/quick.3gp | Bin .../test/resources/quick.3gp_metadata.json | 0 .../tika}/src/test/resources/quick.ai | 0 .../src/test/resources/quick.ai_metadata.json | 0 .../tika}/src/test/resources/quick.bmp | Bin .../test/resources/quick.bmp_metadata.json | 0 .../tika}/src/test/resources/quick.csv | 0 .../tika}/src/test/resources/quick.doc | Bin .../test/resources/quick.doc_metadata.json | 0 .../tika}/src/test/resources/quick.docx | Bin .../test/resources/quick.docx_metadata.json | 0 .../tika}/src/test/resources/quick.flv | Bin .../test/resources/quick.flv_metadata.json | 0 .../tika}/src/test/resources/quick.gif | Bin .../test/resources/quick.gif_metadata.json | 0 .../tika}/src/test/resources/quick.html | 0 .../tika}/src/test/resources/quick.jar | Bin .../tika}/src/test/resources/quick.java | 0 .../tika}/src/test/resources/quick.jpg | Bin .../test/resources/quick.jpg_metadata.json | 0 .../tika}/src/test/resources/quick.key | Bin .../test/resources/quick.key_metadata.json | 0 .../tika}/src/test/resources/quick.m4a | Bin .../test/resources/quick.m4a_metadata.json | 0 .../tika}/src/test/resources/quick.m4v | Bin .../test/resources/quick.m4v_metadata.json | 0 .../tika}/src/test/resources/quick.mov | Bin .../test/resources/quick.mov_metadata.json | 0 .../tika}/src/test/resources/quick.mp3 | Bin .../test/resources/quick.mp3_metadata.json | 0 .../tika}/src/test/resources/quick.mp4 | Bin .../test/resources/quick.mp4_metadata.json | 0 .../tika}/src/test/resources/quick.msg | Bin .../test/resources/quick.msg_metadata.json | 0 .../tika}/src/test/resources/quick.numbers | Bin .../resources/quick.numbers_metadata.json | 0 .../tika}/src/test/resources/quick.odf | Bin .../test/resources/quick.odf_metadata.json | 0 .../tika}/src/test/resources/quick.odg | Bin .../test/resources/quick.odg_metadata.json | 0 .../tika}/src/test/resources/quick.odp | Bin .../test/resources/quick.odp_metadata.json | 0 .../tika}/src/test/resources/quick.ods | Bin .../test/resources/quick.ods_metadata.json | 0 .../tika}/src/test/resources/quick.odt | Bin .../test/resources/quick.odt_metadata.json | 0 .../tika}/src/test/resources/quick.ogg | Bin .../test/resources/quick.ogg_metadata.json | 0 .../tika}/src/test/resources/quick.ogv | Bin .../tika}/src/test/resources/quick.otg | Bin .../test/resources/quick.otg_metadata.json | 0 .../tika}/src/test/resources/quick.otp | Bin .../test/resources/quick.otp_metadata.json | 0 .../tika}/src/test/resources/quick.ots | Bin .../test/resources/quick.ots_metadata.json | 0 .../tika}/src/test/resources/quick.ott | Bin .../test/resources/quick.ott_metadata.json | 0 .../tika}/src/test/resources/quick.pages | Bin .../test/resources/quick.pages_metadata.json | 0 .../tika}/src/test/resources/quick.pdf | Bin .../test/resources/quick.pdf_metadata.json | 0 .../tika}/src/test/resources/quick.png | Bin .../test/resources/quick.png_metadata.json | 0 .../tika}/src/test/resources/quick.ppt | Bin .../test/resources/quick.ppt_metadata.json | 0 .../tika}/src/test/resources/quick.pptx | Bin .../test/resources/quick.pptx_metadata.json | 0 .../tika}/src/test/resources/quick.rar | Bin .../tika}/src/test/resources/quick.sxw | Bin .../test/resources/quick.sxw_metadata.json | 0 .../tika}/src/test/resources/quick.tar | Bin .../tika}/src/test/resources/quick.tar.gz | Bin .../test/resources/quick.tar_metadata.json | 0 .../tika}/src/test/resources/quick.tiff | Bin .../test/resources/quick.tiff_metadata.json | 0 .../tika}/src/test/resources/quick.txt | 0 .../test/resources/quick.txt_metadata.json | 0 .../tika}/src/test/resources/quick.vsd | Bin .../test/resources/quick.vsd_metadata.json | 0 .../tika}/src/test/resources/quick.xls | Bin .../test/resources/quick.xls_metadata.json | 0 .../tika}/src/test/resources/quick.xlsx | Bin .../test/resources/quick.xlsx_metadata.json | 0 .../tika}/src/test/resources/quick.xml | 0 .../test/resources/quick.xml_metadata.json | 0 .../tika}/src/test/resources/quick.xslx | Bin .../tika}/src/test/resources/quick.z | 0 .../tika}/src/test/resources/quick.zip | Bin .../test/resources/quick.zip_metadata.json | 0 .../test/resources/quick2010CustomProps.dwg | Bin .../quick2010CustomProps.dwg_metadata.json | 0 .../src/test/resources/quickIPTC-EXT.jpg | Bin .../resources/quickIPTC-EXT.jpg_metadata.json | 0 .../resources/quickIPTC-multi-creator.jpg | Bin .../quickIPTC-multi-creator.jpg_metadata.json | 0 .../tika}/src/test/resources/quickIPTC.gif | Bin .../resources/quickIPTC.gif_metadata.json | 0 .../tika}/src/test/resources/quickIPTC.png | Bin .../resources/quickIPTC.png_metadata.json | 0 .../tika}/src/test/resources/sample.rss | 0 .../tika}/src/test/resources/sample.rtf | 0 .../tika}/src/test/resources/sample.xhtml.txt | 0 .../src/test/resources/testJPEG_IPTC_EXT.jpg | Bin .../testJPEG_IPTC_EXT.jpg_metadata.json | 0 .../test/resources/tika_engine_config.json | 0 {alfresco-transform-model => model}/README.md | 0 {alfresco-transform-model => model}/pom.xml | 2 +- .../client/model/InternalContext.java | 0 .../transform/client/model/MultiStep.java | 0 .../client/model/TransformReply.java | 0 .../client/model/TransformRequest.java | 0 .../transform/common/ExtensionService.java | 0 .../alfresco/transform/common/Mimetype.java | 0 .../common/RepositoryClientData.java | 0 .../transform/common/RequestParamMap.java | 2 +- .../common/TransformConfigResourceReader.java | 0 .../transform/common/TransformException.java | 0 .../transform/common/TransformerDebug.java | 0 .../config/AbstractTransformOption.java | 0 .../transform/config/AddSupported.java | 0 .../transform/config/CoreFunction.java | 0 .../config/CoreVersionDecorator.java | 2 +- .../transform/config/OverrideSupported.java | 0 .../transform/config/RemoveSupported.java | 0 .../transform/config/SupportedDefaults.java | 0 .../config/SupportedSourceAndTarget.java | 0 .../transform/config/TransformConfig.java | 0 .../transform/config/TransformOption.java | 0 .../config/TransformOptionGroup.java | 0 .../config/TransformOptionValue.java | 0 .../transform/config/TransformStep.java | 0 .../transform/config/Transformer.java | 0 .../transform/config/TransformerAndTypes.java | 0 .../TransformerTypesSizeAndPriority.java | 0 .../org/alfresco/transform/config/Types.java | 0 .../messages/TransformRequestValidator.java | 0 .../transform/messages/TransformStack.java | 0 .../registry/AbstractTransformRegistry.java | 0 .../registry/CombinedTransformConfig.java | 0 .../alfresco/transform/registry/Defaults.java | 0 .../alfresco/transform/registry/Origin.java | 0 .../registry/SupportedTransform.java | 0 .../transform/registry/TransformCache.java | 0 .../registry/TransformRegistryHelper.java | 0 .../registry/TransformServiceRegistry.java | 0 .../registry/TransformerAndSourceType.java | 0 .../common/TransformerDebugTest.java | 0 .../transform/config/CoreFunctionTest.java | 0 .../config/CoreVersionDecoratorTest.java | 0 .../TransformRequestValidatorTest.java | 0 .../messages/TransformStackTest.java | 0 .../registry/CombinedTransformConfigTest.java | 0 .../OverrideTransformConfigTests.java | 0 .../registry/TestTransformRegistry.java | 0 .../registry/TransformRegistryHelperTest.java | 0 .../registry/TransformRegistryTest.java | 0 pom.xml | 79 ++--- 538 files changed, 1182 insertions(+), 1756 deletions(-) delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerImageMagickTest.java delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerLibreOfficeTest.java delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerMiscTest.java delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerPdfRendererTest.java delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTikaTest.java delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOCustomConfigTest.java delete mode 100644 alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTransformRegistryTest.java delete mode 100644 alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml delete mode 100644 alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml delete mode 100644 alfresco-transform-misc/alfresco-transform-misc/pom.xml delete mode 100644 alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml delete mode 100644 alfresco-transform-tika/alfresco-transform-tika/pom.xml rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/README.md (96%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/pom.xml (99%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transform/CustomTransformer.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transform/TransformEngine.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/AbstractTransformerController.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/QueueTransformService.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/TransformController.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/TransformInterceptor.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/executors/CommandExecutor.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/executors/ExecParameterTokenizer.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/executors/RuntimeExec.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/executors/Transformer.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/fs/FileManager.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/logging/LogEntry.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/logging/StandardMessages.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/model/FileRefEntity.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/model/FileRefResponse.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/util/RequestParamMap.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/java/org/alfresco/transformer/util/Util.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/resources/application.yaml (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/resources/engine_config.json (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/resources/templates/error.html (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/main/resources/templates/log.html (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/EngineClient.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/SourceTarget.java (100%) rename {alfresco-transformer-base => deprecated/alfresco-transformer-base}/src/test/java/org/alfresco/transformer/TestFileInfo.java (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => deprecated/alfresco-transformer-base}/src/test/resources/engine_config_complete.json (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => deprecated/alfresco-transformer-base}/src/test/resources/engine_config_incomplete.json (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => deprecated/alfresco-transformer-base}/src/test/resources/engine_config_no_transform_options.json (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => deprecated/alfresco-transformer-base}/src/test/resources/engine_config_with_duplicates.json (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/Dockerfile (91%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio-boot => engines/aio}/pom.xml (88%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java (90%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/application-default.yaml (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/application.properties (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/licenses/3rd-party/Apache 2.0.txt (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/licenses/3rd-party/ImageMagick-license.txt (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/licenses/3rd-party/libreoffice.txt (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/licenses/3rd-party/pdfium.txt (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/quick.html (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/main/resources/templates/transformForm.html (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOControllerHttpRequestTest.java (94%) create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerImageMagickTest.java create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerMiscTest.java create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerPdfRendererTest.java rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOControllerTest.java (74%) create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTikaTest.java rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOImageMagickIT.java (94%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOLibreOfficeTransformationIT.java (90%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOMiscMetadataExtractsIT.java (94%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOMiscTransformsIT.java (90%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOPdfRendererIT.java (84%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOQueueTransformServiceIT.java (92%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOTikaMetadataExtractsIT.java (94%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio => engines/aio/src/test/java/org/alfresco/transform/aio}/AIOTikaTransformationIT.java (90%) create mode 100644 engines/aio/src/test/java/org/alfresco/transform/aio/AIOTransformRegistryTest.java rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/test/resources/misc_engine_config.json (100%) rename {alfresco-transform-core-aio/alfresco-transform-core-aio => engines/aio}/src/test/resources/tika_engine_config.json (100%) rename {t-engine-base => engines/base}/README.md (96%) rename {t-engine-base => engines/base}/pom.xml (97%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/Application.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/CustomTransformer.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/QueueTransformService.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/TransformController.java (96%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/TransformEngine.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/TransformInterceptor.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/clients/AlfrescoSharedFileStoreClient.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/executors/CommandExecutor.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/executors/ExecParameterTokenizer.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/fs/FileManager.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/logging/LogEntry.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/logging/StandardMessages.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/messaging/MessagingConfig.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/metadataExtractors/AbstractMetadataExtractor.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/model/FileRefEntity.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/model/FileRefResponse.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/probes/ProbeTestTransform.java (100%) rename {t-engine-base => engines/base}/src/main/java/org/alfresco/transform/base/util/Util.java (100%) rename {t-engine-base => engines/base}/src/main/resources/application.yaml (100%) rename {t-engine-base => engines/base}/src/main/resources/engine_config.json (100%) rename {t-engine-base => engines/base}/src/main/resources/templates/error.html (100%) rename {t-engine-base => engines/base}/src/main/resources/templates/log.html (100%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/AbstractHttpRequestTest.java (100%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java (100%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java (100%) rename t-engine-base/src/test/java/org/alfresco/transform/base/AbstractTransformerControllerTest.java => engines/base/src/test/java/org/alfresco/transform/base/AbstractTransformControllerTest.java (99%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/EngineClient.java (100%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java (100%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/SourceTarget.java (94%) rename {t-engine-base => engines/base}/src/test/java/org/alfresco/transform/base/TestFileInfo.java (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/base}/src/test/resources/engine_config_complete.json (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/base}/src/test/resources/engine_config_incomplete.json (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/base}/src/test/resources/engine_config_no_transform_options.json (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/base}/src/test/resources/engine_config_with_duplicates.json (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/.maven-dockerignore (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/Dockerfile (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/LICENSES.md (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7 => engines/imagemagick}/README.md (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot => engines/imagemagick}/pom.xml (96%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7 => engines/imagemagick}/scripts/build-rpms.sh (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/resources/application-default.yaml (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/resources/imagemagick_engine_config.json (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources => engines/imagemagick/src/main/resources/licenses}/3rd-party/ImageMagick-license.txt (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/resources/quick.jpg (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/main/resources/templates/transformForm.html (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java (94%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java (96%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java (96%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java (98%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/imagemagick}/src/test/resources/engine_config_complete.json (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/imagemagick}/src/test/resources/engine_config_incomplete.json (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/imagemagick}/src/test/resources/engine_config_no_transform_options.json (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/imagemagick}/src/test/resources/engine_config_with_duplicates.json (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.bmp (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.eps (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.gif (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.jpg (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.pbm (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.pgm (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.png (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.pnm (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.ppm (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.psd (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.tiff (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.xbm (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.xpm (100%) rename {alfresco-transform-imagemagick/alfresco-transform-imagemagick => engines/imagemagick}/src/test/resources/quick.xwd (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/.maven-dockerignore (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/Dockerfile (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/LICENSES.md (100%) rename {alfresco-transform-misc/alfresco-transform-misc-boot => engines/libreoffice}/pom.xml (96%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers => engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice}/LibreOfficeTransformEngine.java (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/resources/application-default.yaml (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/resources/application.properties (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/resources/libreoffice_engine_config.json (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources => engines/libreoffice/src/main/resources/licenses}/3rd-party/libreoffice.txt (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/resources/quick.doc (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/main/resources/templates/transformForm.html (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java (79%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java (96%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java (96%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java (98%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/libreoffice}/src/test/resources/engine_config_complete.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/libreoffice}/src/test/resources/engine_config_incomplete.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/libreoffice}/src/test/resources/engine_config_no_transform_options.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/libreoffice}/src/test/resources/engine_config_with_duplicates.json (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/people.csv (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.dita (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.doc (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.docx (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.html (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.odg (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.odp (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.ods (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.odt (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.otp (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.pdf (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.ppsm (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.ppsx (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.ppt (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.pptx (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.stc (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.sti (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.stw (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.sxc (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.sxi (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.txt (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.vdx (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.vsd (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.wpd (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.xls (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.xlsx (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.xltm (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/quick.xml (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/sample.rtf (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice => engines/libreoffice}/src/test/resources/sample.tsv (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/.maven-dockerignore (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/Dockerfile (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/LICENSES.md (100%) rename {alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot => engines/misc}/pom.xml (87%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java (94%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/transformers/AppleIWorksContentTransformer.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/transformers/EMLTransformer.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformer.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/transformers/OOXMLThumbnailContentTransformer.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/transformers/StringExtractingContentTransformer.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformer.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/resources/HtmlMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/resources/RFC822MetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/resources/application-default.yaml (100%) rename {alfresco-transform-misc/alfresco-transform-misc/src/main/resources => engines/misc/src/main/resources/licenses}/3rd-party/Apache 2.0.txt (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/resources/misc_engine_config.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/resources/quick.html (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/main/resources/templates/transformForm.html (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java (94%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java (93%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java (94%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java (97%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformerTest.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformerTest.java (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/Sample.java.txt (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/misc_engine_config.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/people.csv (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.alternative.eml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.attachment.eml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.docx (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.eml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.eml_metadata.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.html (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.htmlChars.eml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.html_metadata.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.japanese.html (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.japanese.html_metadata.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.key (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.nested.alternative.eml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.numbers (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.pages (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.spanish.eml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.spanish.eml_metadata.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.xhtml.alf (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.xhtml.alf_metadata.json (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick.xml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quick2.txt (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/quickConcept.dita (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.etx (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.ics (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.jsp.txt (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.md (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.mw (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.rtf (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.sgml (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/sample.tsv (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/script.js (100%) rename {alfresco-transform-misc/alfresco-transform-misc => engines/misc}/src/test/resources/style.css (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/.maven-dockerignore (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/Dockerfile (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/LICENSES.md (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot => engines/pdfrenderer}/pom.xml (96%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer => engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer}/PdfRendererOptionsBuilder.java (96%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer => engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer}/PdfRendererTransformEngine.java (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer => engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer}/transformers/PdfRendererTransformer.java (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/main/resources/application-default.yaml (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources => engines/pdfrenderer/src/main/resources/licenses}/3rd-party/pdfium.txt (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/main/resources/pdfrenderer_engine_config.json (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/main/resources/quick.pdf (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/main/resources/templates/transformForm.html (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java (92%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java (96%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java (96%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java (94%) rename {alfresco-transformer-base => engines/pdfrenderer}/src/test/resources/engine_config_complete.json (100%) rename {alfresco-transformer-base => engines/pdfrenderer}/src/test/resources/engine_config_incomplete.json (100%) rename {alfresco-transformer-base => engines/pdfrenderer}/src/test/resources/engine_config_no_transform_options.json (100%) rename {alfresco-transformer-base => engines/pdfrenderer}/src/test/resources/engine_config_with_duplicates.json (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/resources/pdfrenderer_engine_config.json (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/resources/quick.pdf (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/resources/quick.png (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/resources/quickCS3.ai (100%) rename {alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer => engines/pdfrenderer}/src/test/resources/quickCS5.ai (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/.maven-dockerignore (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/Dockerfile (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/LICENSES.md (100%) rename {alfresco-transform-tika/alfresco-transform-tika-boot => engines/tika}/pom.xml (96%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/AbstractTikaMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/DWGMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/MP3MetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/MailMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/OfficeMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/OpenDocumentMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/PdfBoxMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/PoiMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAudioMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAutoMetadataExtractor.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/parsers/ExifToolParser.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/parsers/TikaOfficeDetectParser.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/ArchiveTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/GenericTikaTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/OOXMLTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/OfficeTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/OutlookMsgTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/PdfBoxTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/PoiTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/TextMiningTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/Tika.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/java/org/alfresco/transform/tika/transformers/TikaAutoTransformer.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/DWGMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/MP3MetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/MailMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/OfficeMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/OpenDocumentMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/PdfBoxMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/PoiMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/TikaAudioMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/TikaAutoMetadataExtractor_metadata_extract.properties (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/application-default.yaml (100%) rename {alfresco-transform-tika/alfresco-transform-tika/src/main/resources => engines/tika/src/main/resources/licenses}/3rd-party/Apache 2.0.txt (100%) rename {alfresco-transform-tika/alfresco-transform-tika/src/main/resources => engines/tika/src/main/resources/licenses}/3rd-party/Perl-Artistic-license.txt (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/parsers/external/config/exiftool-parser.xml (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/quick.pdf (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/templates/transformForm.html (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/tika-config.xml (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/main/resources/tika_engine_config.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java (97%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java (99%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractorTest.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/parsers/ExifToolParserTest.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/java/org/alfresco/transform/tika/transformers/GenericTikaTransformerTest.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20140614_163822_Photogrpahy_Class.ARW (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20140614_163822_Photogrpahy_Class.ARW_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20140629_145035_Flower.RW2 (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20140629_145035_Flower.RW2_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20141227_134519_Palace.CR2 (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20141227_134519_Palace.CR2_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20150408_074941_Bush.NEF (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20150408_074941_Bush.NEF_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20160502_190928_London_Underground.RAF (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/20160502_190928_London_Underground.RAF_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/dmsu1332-reproduced.xlsx (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/dmsu1332-reproduced.xlsx_metadata.json (100%) rename {t-engine-base => engines/tika}/src/test/resources/engine_config_complete.json (100%) rename {t-engine-base => engines/tika}/src/test/resources/engine_config_incomplete.json (100%) rename {t-engine-base => engines/tika}/src/test/resources/engine_config_no_transform_options.json (100%) rename {t-engine-base => engines/tika}/src/test/resources/engine_config_with_duplicates.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/problemFootnotes2.docx (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.3g2 (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.3g2_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.3gp (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.3gp_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ai (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ai_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.bmp (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.bmp_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.csv (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.doc (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.doc_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.docx (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.docx_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.flv (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.flv_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.gif (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.gif_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.html (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.jar (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.java (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.jpg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.jpg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.key (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.key_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.m4a (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.m4a_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.m4v (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.m4v_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.mov (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.mov_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.mp3 (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.mp3_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.mp4 (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.mp4_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.msg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.msg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.numbers (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.numbers_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odf (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odf_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odp (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odp_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ods (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ods_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odt (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.odt_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ogg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ogg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ogv (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.otg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.otg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.otp (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.otp_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ots (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ots_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ott (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ott_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.pages (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.pages_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.pdf (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.pdf_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.png (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.png_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ppt (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.ppt_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.pptx (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.pptx_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.rar (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.sxw (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.sxw_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.tar (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.tar.gz (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.tar_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.tiff (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.tiff_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.txt (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.txt_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.vsd (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.vsd_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xls (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xls_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xlsx (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xlsx_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xml (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xml_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.xslx (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.z (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.zip (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick.zip_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick2010CustomProps.dwg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quick2010CustomProps.dwg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC-EXT.jpg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC-EXT.jpg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC-multi-creator.jpg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC-multi-creator.jpg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC.gif (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC.gif_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC.png (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/quickIPTC.png_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/sample.rss (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/sample.rtf (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/sample.xhtml.txt (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/testJPEG_IPTC_EXT.jpg (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json (100%) rename {alfresco-transform-tika/alfresco-transform-tika => engines/tika}/src/test/resources/tika_engine_config.json (100%) rename {alfresco-transform-model => model}/README.md (100%) rename {alfresco-transform-model => model}/pom.xml (99%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/client/model/InternalContext.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/client/model/MultiStep.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/client/model/TransformReply.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/client/model/TransformRequest.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/ExtensionService.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/Mimetype.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/RepositoryClientData.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/RequestParamMap.java (96%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/TransformConfigResourceReader.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/TransformException.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/common/TransformerDebug.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/AddSupported.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/CoreFunction.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java (99%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/OverrideSupported.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/RemoveSupported.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/SupportedDefaults.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformConfig.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformOption.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformOptionValue.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformStep.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/Transformer.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/config/Types.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/messages/TransformStack.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/Defaults.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/Origin.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/SupportedTransform.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/TransformCache.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java (100%) rename {alfresco-transform-model => model}/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/messages/TransformStackTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java (100%) rename {alfresco-transform-model => model}/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java (100%) diff --git a/README.md b/README.md index 8303f87e..1ca7211f 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,15 @@ Contains the common transformer (T-Engine) code, plus a few implementations. configuration files and messages sent between clients, T-Engines and T-Router. Also contains code to work out which transform should be used for a combination of configuration files; see the sub-project's [README](https://github.com/Alfresco/alfresco-transform-core/blob/master/alfresco-transform-model/README.md) -* `alfresco-t-engine-base` - library packaged as a jar file which contains code that is common +* `alfresco-base-t-engine` - library packaged as a jar file which contains code that is common to all the transformers; see the sub-project's - [README](https://github.com/Alfresco/alfresco-transform-core/blob/master/alfresco-t-engine-base/README.md) + [README](https://github.com/Alfresco/alfresco-transform-core/blob/master/alfresco-base-t-engine/README.md) * `alfresco-transform-` - multiple T-Engines; each one of them builds both a SpringBoot fat jar and a [Docker image](https://github.com/Alfresco/alfresco-transform-core#docker) ### Documentation -In addition to the subprojects (such as `alfresco-t-engine-base` README above) some additional documentation can be found in: +In addition to the subprojects (such as `alfresco-base-t-engine` README above) some additional documentation can be found in: * [this project's docs](docs) folder * [ACS Packaging docs](https://github.com/Alfresco/acs-packaging/tree/master/docs) folder @@ -49,7 +49,7 @@ The artifacts can be obtained by: org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine version ``` diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml deleted file mode 100644 index 5e25bbbc..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - alfresco-transform-core-aio - Alfresco Core All-In-One Transformer - - - alfresco-transform-core - org.alfresco - 2.6.1-SNAPSHOT - ../../pom.xml - - - - - org.alfresco - alfresco-t-engine-base - ${project.version} - - - org.alfresco - alfresco-transform-misc - ${project.version} - - - org.alfresco - alfresco-transform-tika - ${project.version} - - - org.alfresco - alfresco-transform-pdf-renderer - ${project.version} - - - org.alfresco - alfresco-transform-libreoffice - ${project.version} - - - org.alfresco - alfresco-transform-imagemagick - ${project.version} - - - org.springframework.boot - spring-boot-starter-test - test - - - com.vaadin.external.google - android-json - - - - - - - - - org.codehaus.mojo - license-maven-plugin - - - - diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerImageMagickTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerImageMagickTest.java deleted file mode 100644 index 9e3d380f..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerImageMagickTest.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.util.Map; - -import org.alfresco.transform.aio.AIOController; -import org.alfresco.transform.aio.AIOCustomConfig; -import org.alfresco.transform.aio.AIOTransformRegistry; -import org.alfresco.transform.imagemagick.ImageMagickControllerTest; -import org.alfresco.transform.base.executors.Transformer; -import org.alfresco.transformer.AbstractTransformerController; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; - -/** - * Test the AIOController ImageMagick transforms without a server. - * Super class includes tests for the AbstractTransformerController. - */ -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -public class AIOControllerImageMagickTest extends ImageMagickControllerTest -{ - // All tests contained in ImageMagickControllerTest - - @Autowired AIOTransformRegistry transformRegistry; - - @BeforeEach @Override - public void before() throws IOException - { - ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); - ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); - //Need to wire in the mocked commandExecutor into the controller... - Map transformers = transformRegistry.getTransformerEngineMapping(); - transformers.replace("imagemagick", commandExecutor); - - mockTransformCommand("jpg", "png", "image/jpeg", true); - } - - @Override - protected AbstractTransformerController getController() - { - return controller; - } - - @Override - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) - { - final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) - .param("targetMimetype", targetMimetype) - .param("sourceMimetype", sourceMimetype); - - return builder; - } - - @Test - public void testTestValidity() - { - // just test that we are actually testing against the AIOController (instead of MiscController) - assertTrue(controller instanceof AIOController, "Wrong controller wired for test"); - } - - @Test - @Override - public void noTargetFileTest() - { - // Ignore the test in super class as the AIO transforms will not be selected . - // It is the mock that returns a zero length file for other transformers, when we supply an invalid targetExtension. - } - - @Test - @Override - public void testGetTransformConfigInfo() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - - } - - @Test - @Override - public void testGetTransformConfigInfoExcludingCoreVersion() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - } - - @Test - @Override - public void testGetInfoFromConfigWithDuplicates() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetInfoFromConfigWithEmptyTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetInfoFromConfigWithNoTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - -} diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerLibreOfficeTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerLibreOfficeTest.java deleted file mode 100644 index e5f8b8f2..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerLibreOfficeTest.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Map; - -import org.alfresco.transform.libreoffice.LibreOfficeControllerTest; -import org.alfresco.transform.libreoffice.transformers.LibreOfficeTransformer; -import org.alfresco.transform.base.executors.Transformer; -import org.alfresco.transformer.AbstractTransformerController; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; - -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -/** - * Test the AIOController without a server. - * Super class includes tests for the LibreOfficeController and AbstractTransformerController. - */ -public class AIOControllerLibreOfficeTest extends LibreOfficeControllerTest -{ - //Tests contained in LibreOfficeControllerTest - - @Test - public void testTestValidity() - { - // just test that we are actually testing against the AIOController (instead of MiscController) - assertTrue(controller instanceof AIOController,"Wrong controller wired for test"); - } - - @Autowired AIOTransformRegistry transformRegistry; - - @Override - // Used by the super class to mock the javaExecutor, a different implementation is required here - protected void setJavaExecutor(AbstractTransformerController controller, LibreOfficeTransformer javaExecutor) - { - //Need to wire in the mocked javaExecutor into the controller... - Map transformers = transformRegistry.getTransformerEngineMapping(); - transformers.replace("libreoffice", javaExecutor); - // No need to set the transform registry to the controller as it is @Autowired in - } - - @Override - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) - { - final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) - .param("targetMimetype", targetMimetype) - .param("sourceMimetype", sourceMimetype); - - return builder; - } - - @Test - @Override - public void testGetTransformConfigInfo() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetTransformConfigInfoExcludingCoreVersion() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - } - - @Test - @Override - public void testGetInfoFromConfigWithDuplicates() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - @Test - @Override - public void testGetInfoFromConfigWithEmptyTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - @Test - @Override - public void testGetInfoFromConfigWithNoTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } -} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerMiscTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerMiscTest.java deleted file mode 100644 index 0c21f979..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerMiscTest.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.alfresco.transform.aio.AIOController; -import org.alfresco.transform.aio.AIOCustomConfig; -import org.alfresco.transform.misc.MiscControllerTest; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; - -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -public class AIOControllerMiscTest extends MiscControllerTest -{ - //Tests contained in MiscControllerTest - - - @Test - public void testTestValidity() - { - // just test that we are actually testing against the AIOController (instead of MiscController) - assertTrue(controller instanceof AIOController, "Wrong controller wired for test"); - } - - @Test - @Override - public void testGetTransformConfigInfo() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetTransformConfigInfoExcludingCoreVersion() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - } - - @Test - @Override - public void testGetInfoFromConfigWithDuplicates() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - @Test - @Override - public void testGetInfoFromConfigWithEmptyTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - @Test - @Override - public void testGetInfoFromConfigWithNoTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } -} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerPdfRendererTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerPdfRendererTest.java deleted file mode 100644 index 6af371b0..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerPdfRendererTest.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Map; - -import org.alfresco.transform.pdfRenderer.AlfrescoPdfRendererControllerTest; -import org.alfresco.transform.base.executors.Transformer; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; - -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -/** - * Test the AIOController PDF Renderer transforms without a server. - * Super class includes tests for the AbstractTransformerController. - */ -public class AIOControllerPdfRendererTest extends AlfrescoPdfRendererControllerTest -{ - @Autowired AIOTransformRegistry transformRegistry; - - @Override - protected void setFields() - { - ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); - ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); - //Need to wire in the mocked commandExecutor into the controller... - Map transformers = transformRegistry.getTransformerEngineMapping(); - transformers.replace("pdfrenderer", commandExecutor); - } - - @Override - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) - { - final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) - .param("targetMimetype", targetMimetype) - .param("sourceMimetype", sourceMimetype); - - return builder; - } - - @Test - public void testTestValidity() - { - // just test that we are actually testing against the AIOController (instead of MiscController) - assertTrue(controller instanceof AIOController, "Wrong controller wired for test"); - } - - @Test - @Override - public void testGetTransformConfigInfo() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - } - - @Test - @Override - public void testGetTransformConfigInfoExcludingCoreVersion() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - } - - @Test - @Override - public void testGetInfoFromConfigWithDuplicates() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetInfoFromConfigWithEmptyTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetInfoFromConfigWithNoTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } -} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTikaTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTikaTest.java deleted file mode 100644 index b349c92e..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTikaTest.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.alfresco.transform.aio.AIOController; -import org.alfresco.transform.aio.AIOCustomConfig; -import org.alfresco.transform.tika.TikaControllerTest; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; - -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -/** - * Test the AIOController Tika transforms without a server. - * Super class includes tests for the AbstractTransformerController. - */ -public class AIOControllerTikaTest extends TikaControllerTest -{ - // All tests contained in TikaControllerTest - - @Test - public void testTestValidity() - { - // just test that we are actually testing against the AIOController (instead of MiscController) - assertTrue(controller instanceof AIOController,"Wrong controller wired for test"); - } - - @Test - @Override - public void testGetTransformConfigInfo() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - - } - - @Test - @Override - public void testGetTransformConfigInfoExcludingCoreVersion() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - } - - @Test - @Override - public void testGetInfoFromConfigWithDuplicates() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetInfoFromConfigWithEmptyTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void testGetInfoFromConfigWithNoTransformOptions() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - - } - - @Test - @Override - public void xlsxEmbedTest() - { - // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. - // It uses the real class path rather than the test one. - } -} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOCustomConfigTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOCustomConfigTest.java deleted file mode 100644 index 9c46994c..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOCustomConfigTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - -import org.alfresco.transform.aio.AIOController; -import org.alfresco.transform.aio.AIOCustomConfig; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; - -import java.util.StringJoiner; - -import static org.junit.jupiter.api.Assertions.*; - -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -class AIOCustomConfigTest -{ - @Autowired - AIOCustomConfig aioCustomConfig; - - @Test - void testGetTEnginesSortedByName() - { - // T-Engine config must be read in a predictable order (alphabetically on T-Engine name) as they may override each other. - StringJoiner sortedTEngines = new StringJoiner(","); - aioCustomConfig.getTEnginesSortedByName().stream().forEach(tEngine -> sortedTEngines.add(tEngine.getTransformerId())); - assertEquals("imagemagick,libreoffice,misc,pdfrenderer,tika", sortedTEngines.toString()); - } -} diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTransformRegistryTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTransformRegistryTest.java deleted file mode 100644 index 61db9a4c..00000000 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTransformRegistryTest.java +++ /dev/null @@ -1,321 +0,0 @@ -/* - * #%L - * Alfresco Transform Core - * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.transform.coreaio; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.alfresco.transform.aio.AIOTransformRegistry; -import org.alfresco.transform.config.TransformConfig; -import org.alfresco.transform.base.executors.Transformer; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.text.PDFTextStripper; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.core.io.ClassPathResource; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.nio.file.Files; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.alfresco.transform.common.RequestParamMap.PAGE_LIMIT; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class AIOTransformRegistryTest -{ - private static final String SOURCE_MIMETYPE = "text/html"; - private static final String TARGET_MIMETYPE = "text/plain"; - String SOURCE_ENCODING = "sourceEncoding"; - - AIOTransformRegistry aioTransformerRegistry = new AIOTransformRegistry(); - ObjectMapper objectMapper = new ObjectMapper(); - - - @BeforeEach - public void before() throws Exception - { -// aioTransformerRegistry.registerTransformer(new SelectingTransformer()); -// aioTransformerRegistry.registerTransformer(new TikaJavaExecutor()); - aioTransformerRegistry.registerCombinedTransformers(); - } - - private void writeToFile(File file, String content, String encoding) throws Exception - { - try (OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream(file), encoding)) - { - ow.append(content); - } - } - - private String readFromFile(File file, final String encoding) throws Exception - { - return new String(Files.readAllBytes(file.toPath()), encoding); - } - - private TransformConfig loadConfig(String s) throws Exception - { - return objectMapper.readValue(new ClassPathResource(s).getFile(), TransformConfig.class); - } - - @Test - public void testConfigAggregation() throws Exception - { - List expectedTransformNames = Arrays.asList("html", "string", "appleIWorks", "textToPdf", "rfc822", - "Archive", "OutlookMsg", "PdfBox", "Office", "Poi", "OOXML", "TikaAuto", "TextMining"); - - List expectedTransformOptionNames = Arrays.asList("tikaOptions", "archiveOptions", "pdfboxOptions", - "textToPdfOptions", "stringOptions", "metadataOptions"); - - TransformConfig miscConfig = loadConfig("misc_engine_config.json"); - TransformConfig tikaConfig = loadConfig("tika_engine_config.json"); - - // check correct number of transformers - assertEquals( - miscConfig.getTransformers().size() + tikaConfig.getTransformers().size(), - aioTransformerRegistry.getTransformConfig().getTransformers().size(), - "Number of expected transformers"); - - List actualTransformerNames = aioTransformerRegistry.getTransformConfig().getTransformers() - .stream().map(t -> t.getTransformerName()).collect(Collectors.toList()); - // check all transformers are there - for(String transformNames : expectedTransformNames) - { - assertTrue(actualTransformerNames.contains(transformNames),"Expected transformer missing."); - } - - // check correct number of options - long distinctOptionCount = Stream.concat( - miscConfig.getTransformOptions().keySet().stream(), - tikaConfig.getTransformOptions().keySet().stream()).distinct().count(); - assertEquals( - distinctOptionCount, - aioTransformerRegistry.getTransformConfig().getTransformOptions().size(), - "Number of expected transformers"); - - Set actualOptionNames = aioTransformerRegistry.getTransformConfig().getTransformOptions().keySet(); - - // check all options are there - for (String optionName : expectedTransformOptionNames) - { - assertTrue(actualOptionNames.contains(optionName), "Expected transform option missing:"+optionName); - } - } - - @Test - public void testTransformerMapping() - { - List tikaTransforms = Arrays.asList("Archive", "OutlookMsg", "PdfBox", "Office", "Poi", "OOXML", "TikaAuto", "TextMining"); - List miscTransforms = Arrays.asList("html", "string", "appleIWorks", "textToPdf", "rfc822"); - - for (String transform : tikaTransforms) - { - String actualId = aioTransformerRegistry.getByTransformName(transform).getTransformerId(); - assertEquals("tika", actualId, "Wrong mapping for transform "+transform); - } - - for (String transform : miscTransforms) - { - String actualId = aioTransformerRegistry.getByTransformName(transform).getTransformerId(); - assertEquals("misc", actualId, "Wrong mapping for transform "+transform); - } - } - - // Test copied from Misc (HtmlParserContentTransformerTest) See ATS-712 aioTransformerRegistry - html - @Test - public void testMiscHtml() throws Exception - { - final String NEWLINE = System.getProperty("line.separator"); - final String TITLE = "Testing!"; - final String TEXT_P1 = "This is some text in English"; - final String TEXT_P2 = "This is more text in English"; - final String TEXT_P3 = "C'est en Fran\u00e7ais et Espa\u00f1ol"; - String partA = "" + TITLE + "" + NEWLINE; - String partB = "

" + TEXT_P1 + "

" + NEWLINE + - "

" + TEXT_P2 + "

" + NEWLINE + - "

" + TEXT_P3 + "

" + NEWLINE; - String partC = ""; - final String expected = TITLE + NEWLINE + TEXT_P1 + NEWLINE + TEXT_P2 + NEWLINE + TEXT_P3 + NEWLINE; - - File tmpS = null; - File tmpD = null; - - try - { - // Content set to ISO 8859-1 - tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); - writeToFile(tmpS, partA + partB + partC, "ISO-8859-1"); - - tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); - - Map parameters = new HashMap<>(); - parameters.put(SOURCE_ENCODING, "ISO-8859-1"); - Transformer transformer = aioTransformerRegistry.getByTransformName("html"); - transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); - - assertEquals(expected, readFromFile(tmpD, "UTF-8")); - tmpS.delete(); - tmpD.delete(); - - // Content set to UTF-8 - tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); - writeToFile(tmpS, partA + partB + partC, "UTF-8"); - - tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); - parameters = new HashMap<>(); - parameters.put(SOURCE_ENCODING, "UTF-8"); - transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); - assertEquals(expected, readFromFile(tmpD, "UTF-8")); - tmpS.delete(); - tmpD.delete(); - - // Content set to UTF-16 - tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); - writeToFile(tmpS, partA + partB + partC, "UTF-16"); - - tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); - parameters = new HashMap<>(); - parameters.put(SOURCE_ENCODING, "UTF-16"); - transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); - assertEquals(expected, readFromFile(tmpD, "UTF-8")); - tmpS.delete(); - tmpD.delete(); - - // Note - since HTML Parser 2.0 META tags specifying the - // document encoding will ONLY be respected if the original - // content type was set to ISO-8859-1. - // - // This means there is now only one test which we can perform - // to ensure that this now-limited overriding of the encoding - // takes effect. - - // Content set to ISO 8859-1, meta set to UTF-8 - tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); - String str = partA + - "" + - partB + partC; - - writeToFile(tmpS, str, "UTF-8"); - - tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); - - parameters = new HashMap<>(); - parameters.put(SOURCE_ENCODING, "ISO-8859-1"); - transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); - assertEquals(expected, readFromFile(tmpD, "UTF-8")); - tmpS.delete(); - tmpD.delete(); - - // Note - we can't test UTF-16 with only a meta encoding, - // because without that the parser won't know about the - // 2 byte format so won't be able to identify the meta tag - } - finally - { - if (tmpS != null && tmpS.exists()) tmpS.delete(); - if (tmpD != null && tmpD.exists()) tmpD.delete(); - } - } - - // Test copied from Misc (TextToPdfContentTransformerTest) See ATS-712 aioTransformerRegistry - pdf - @Test - public void testMiscPdf() throws Exception - { - transformTextAndCheckPageLength(-1); - } - - private void transformTextAndCheckPageLength(int pageLimit) throws Exception - { - int pageLength = 32; - int lines = (pageLength + 10) * ((pageLimit > 0) ? pageLimit : 1); - StringBuilder sb = new StringBuilder(); - String checkText = null; - int cutoff = pageLimit * pageLength; - for (int i = 1; i <= lines; i++) - { - sb.append(Integer.toString(i)); - sb.append(" I must not talk in class or feed my homework to my cat.\n"); - if (i == cutoff) - checkText = sb.toString(); - } - sb.append("\nBart\n"); - String text = sb.toString(); - checkText = (checkText == null) ? clean(text) : clean(checkText); - transformTextAndCheck(text, "UTF-8", checkText, String.valueOf(pageLimit)); - } - - private void transformTextAndCheck(String text, String encoding, String checkText, - String pageLimit) throws Exception - { - // Get a reader for the text - File sourceFile = File.createTempFile("AlfrescoTestSource_", ".txt"); - writeToFile(sourceFile, text, encoding); - - // And a temp writer - File targetFile = File.createTempFile("AlfrescoTestTarget_", ".pdf"); - - // Transform to PDF - Map parameters = new HashMap<>(); - parameters.put(PAGE_LIMIT, pageLimit); - Transformer transformer = aioTransformerRegistry.getByTransformName("textToPdf"); - transformer.transformExtractOrEmbed("textToPdf", "text/plain", "application/pdf", parameters, sourceFile, targetFile); - - // Read back in the PDF and check it - PDDocument doc = PDDocument.load(targetFile); - PDFTextStripper textStripper = new PDFTextStripper(); - StringWriter textWriter = new StringWriter(); - textStripper.writeText(doc, textWriter); - doc.close(); - - String roundTrip = clean(textWriter.toString()); - - assertEquals( - checkText, roundTrip, - "Incorrect text in PDF when starting from text in " + encoding - ); - - sourceFile.delete(); - targetFile.delete(); - } - - private String clean(String text) - { - text = text.replaceAll("\\s+\\r", ""); - text = text.replaceAll("\\s+\\n", ""); - text = text.replaceAll("\\r", ""); - text = text.replaceAll("\\n", ""); - return text; - } - -} \ No newline at end of file diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml deleted file mode 100644 index bab635de..00000000 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - alfresco-transform-imagemagick - Alfresco ImageMagick Transformer - - - alfresco-transform-core - org.alfresco - 2.6.1-SNAPSHOT - ../../pom.xml - - - - - org.alfresco - alfresco-t-engine-base - ${project.version} - - - - - - - org.codehaus.mojo - license-maven-plugin - - - - diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml deleted file mode 100644 index 89da7bcc..00000000 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - alfresco-transform-libreoffice - Alfresco LibreOffice Transformer - - - alfresco-transform-core - org.alfresco - 2.6.1-SNAPSHOT - ../../pom.xml - - - - - org.alfresco - alfresco-t-engine-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 - - - - diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml deleted file mode 100644 index 80f69d6b..00000000 --- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - 4.0.0 - alfresco-transform-misc - Alfresco Miscellaneous Transformer - - - alfresco-transform-core - org.alfresco - 2.6.1-SNAPSHOT - ../../pom.xml - - - - - org.alfresco - alfresco-t-engine-base - ${project.version} - - - - org.dom4j - dom4j - - - - - org.htmlparser - htmlparser - 2.1 - - - - - org.apache.commons - commons-compress - - - - - org.apache.pdfbox - pdfbox-tools - 2.0.25 - - - - - org.apache.poi - poi-ooxml - ${dependency.poi.version} - - - org.apache.poi - poi-ooxml-schemas - - - - - org.apache.poi - ooxml-schemas - ${dependency.ooxml-schemas.version} - - - - - com.sun.mail - javax.mail - 1.6.2 - - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - - org.codehaus.mojo - license-maven-plugin - - - - diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml deleted file mode 100644 index 5eb0dc88..00000000 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - alfresco-transform-pdf-renderer - Alfresco Pdf Renderer Transformer - - - org.alfresco - alfresco-transform-core - 2.6.1-SNAPSHOT - ../../pom.xml - - - - - org.alfresco - alfresco-t-engine-base - ${project.version} - - - - - - - org.codehaus.mojo - license-maven-plugin - - - - diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml deleted file mode 100644 index c40e621b..00000000 --- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - 4.0.0 - alfresco-transform-tika - Alfresco Tika Transformer - - - alfresco-transform-core - org.alfresco - 2.6.1-SNAPSHOT - ../../pom.xml - - - - - org.alfresco - alfresco-t-engine-base - ${project.version} - - - - - org.apache.tika - tika-core - ${dependency.tika.version} - - - org.apache.tika - tika-parsers-standard-package - ${dependency.tika.version} - - - org.bouncycastle - bcprov-jdk15on - - - org.bouncycastle - bcmail-jdk15on - - - xml-apis - xml-apis - - - - - - - joda-time - joda-time - 2.10.14 - - - - - org.bouncycastle - bcprov-jdk15on - 1.70 - - - org.bouncycastle - bcmail-jdk15on - 1.70 - - - - - org.apache.poi - poi - ${dependency.poi.version} - - - org.apache.poi - poi-ooxml - ${dependency.poi.version} - - - org.apache.poi - poi-ooxml-schemas - - - - - org.apache.poi - ooxml-schemas - ${dependency.ooxml-schemas.version} - - - org.apache.poi - poi-scratchpad - ${dependency.poi.version} - - - - - org.apache.pdfbox - pdfbox - - - - org.apache.pdfbox - pdfbox-tools - - - - org.junit.jupiter - junit-jupiter - test - - - org.mockito - mockito-junit-jupiter - test - - - - - - - org.codehaus.mojo - license-maven-plugin - - - - diff --git a/alfresco-transformer-base/README.md b/deprecated/alfresco-transformer-base/README.md similarity index 96% rename from alfresco-transformer-base/README.md rename to deprecated/alfresco-transformer-base/README.md index a99decdc..6044d549 100644 --- a/alfresco-transformer-base/README.md +++ b/deprecated/alfresco-transformer-base/README.md @@ -49,7 +49,7 @@ src/main/java/org/alfresco/transformer/Application.java ~~~ * *TransformerName*Controller.java - A [Spring Boot](https://projects.spring.io/spring-boot/) Controller that - extends AbstractTransformerController to handel requests. It implements a few methods including *transformImpl* + extends TransformController to handel requests. It implements a few methods including *transformImpl* which is intended to perform the actual transform. Generally the transform is done in a sub class of *JavaExecutor*, when a Java library is being used or *AbstractCommandExecutor*, when an external process is used. Both are sub interfaces of *Transformer*. @@ -57,7 +57,7 @@ src/main/java/org/alfresco/transformer/Application.java ~~~ ... @Controller -public class TransformerNameController extends AbstractTransformerController +public class TransformerNameController extends TransformController { private static final Logger logger = LoggerFactory.getLogger(TransformerNameController.class); @@ -149,7 +149,7 @@ public class Application } ~~~ -Transform requests are handled by the *AbstractTransformerController*, but are either: +Transform requests are handled by the *TransformController*, but are either: * POST requests (a direct http request from a client) where the transform options are passed as parameters, the source is supplied as a multipart file and the response is a file download. * POST request (a request via a message queue) where the transform options are supplied as JSON and the response is also JSON. diff --git a/alfresco-transformer-base/pom.xml b/deprecated/alfresco-transformer-base/pom.xml similarity index 99% rename from alfresco-transformer-base/pom.xml rename to deprecated/alfresco-transformer-base/pom.xml index 74eb1819..dfdcfb6f 100644 --- a/alfresco-transformer-base/pom.xml +++ b/deprecated/alfresco-transformer-base/pom.xml @@ -1,6 +1,8 @@ 4.0.0 + alfresco-transformer-base + - Deprecated Base org.alfresco @@ -8,8 +10,6 @@ 2.6.1-SNAPSHOT - alfresco-transformer-base - false diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformInterceptor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformInterceptor.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformInterceptor.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformInterceptor.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/CommandExecutor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/CommandExecutor.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/CommandExecutor.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/CommandExecutor.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/ExecParameterTokenizer.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/ExecParameterTokenizer.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/ExecParameterTokenizer.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/ExecParameterTokenizer.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/JavaExecutor.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/RuntimeExec.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/RuntimeExec.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/RuntimeExec.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/RuntimeExec.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/LogEntry.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/LogEntry.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/LogEntry.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/LogEntry.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/logging/StandardMessages.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefEntity.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefEntity.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefEntity.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefEntity.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefResponse.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefResponse.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefResponse.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/model/FileRefResponse.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/Util.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/Util.java similarity index 100% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/Util.java rename to deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/Util.java diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/deprecated/alfresco-transformer-base/src/main/resources/application.yaml similarity index 100% rename from alfresco-transformer-base/src/main/resources/application.yaml rename to deprecated/alfresco-transformer-base/src/main/resources/application.yaml diff --git a/alfresco-transformer-base/src/main/resources/engine_config.json b/deprecated/alfresco-transformer-base/src/main/resources/engine_config.json similarity index 100% rename from alfresco-transformer-base/src/main/resources/engine_config.json rename to deprecated/alfresco-transformer-base/src/main/resources/engine_config.json diff --git a/alfresco-transformer-base/src/main/resources/templates/error.html b/deprecated/alfresco-transformer-base/src/main/resources/templates/error.html similarity index 100% rename from alfresco-transformer-base/src/main/resources/templates/error.html rename to deprecated/alfresco-transformer-base/src/main/resources/templates/error.html diff --git a/alfresco-transformer-base/src/main/resources/templates/log.html b/deprecated/alfresco-transformer-base/src/main/resources/templates/log.html similarity index 100% rename from alfresco-transformer-base/src/main/resources/templates/log.html rename to deprecated/alfresco-transformer-base/src/main/resources/templates/log.html diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractQueueTransformServiceIT.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/QueueTransformServiceTest.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java similarity index 100% rename from alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java rename to deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/TestFileInfo.java diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_complete.json b/deprecated/alfresco-transformer-base/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_complete.json rename to deprecated/alfresco-transformer-base/src/test/resources/engine_config_complete.json diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_incomplete.json b/deprecated/alfresco-transformer-base/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_incomplete.json rename to deprecated/alfresco-transformer-base/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_no_transform_options.json b/deprecated/alfresco-transformer-base/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_no_transform_options.json rename to deprecated/alfresco-transformer-base/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_with_duplicates.json b/deprecated/alfresco-transformer-base/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/engine_config_with_duplicates.json rename to deprecated/alfresco-transformer-base/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/Dockerfile b/engines/aio/Dockerfile similarity index 91% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/Dockerfile rename to engines/aio/Dockerfile index 43798b5c..9e7575fb 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -29,9 +29,9 @@ ARG GROUPID=1000 ARG AIOUSERNAME=transform-all-in-one ARG USERID=33017 -COPY target/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin +COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin/alfresco-transform-core-aio-boot.jar && \ +RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ yum install -y $IMAGEMAGICK_DEP_RPM_URL && \ yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ yum install -y cairo cups-libs libSM libGLU && \ @@ -62,10 +62,10 @@ COPY src/main/resources/licenses/3rd-party/ / RUN groupadd -g ${GROUPID} ${GROUPNAME} && \ useradd -u ${USERID} -G ${GROUPNAME} ${AIOUSERNAME} && \ - chgrp -R ${GROUPNAME} /usr/bin/alfresco-transform-core-aio-boot.jar + chgrp -R ${GROUPNAME} /usr/bin/${env.project_artifactId}.jar EXPOSE 8090 USER ${AIOUSERNAME} -ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-transform-core-aio-boot.jar +ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml b/engines/aio/pom.xml similarity index 88% rename from alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml rename to engines/aio/pom.xml index 29e15982..7a284e0b 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/pom.xml +++ b/engines/aio/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - alfresco-transform-core-aio-boot - Alfresco Core All-In-One Transformer Spring Boot + alfresco-transform-core-aio + - All-In-One - org.alfresco alfresco-transform-core + org.alfresco 2.6.1-SNAPSHOT ../../pom.xml @@ -20,57 +20,12 @@ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} org.alfresco - alfresco-transform-core-aio - ${project.version} - - - org.alfresco - alfresco-t-engine-base - ${project.version} - tests - test-jar - test - - - org.alfresco - alfresco-transform-tika-boot - ${project.version} - tests - test-jar - test - - - org.alfresco - alfresco-transform-imagemagick-boot - ${project.version} - tests - test-jar - test - - - org.alfresco - alfresco-transform-pdf-renderer-boot - ${project.version} - tests - test-jar - test - - - org.alfresco - alfresco-transform-misc-boot - ${project.version} - tests - test-jar - test - - - org.alfresco - alfresco-transform-libreoffice-boot + alfresco-base-t-engine ${project.version} tests test-jar @@ -95,7 +50,80 @@ org.dom4j dom4j - + + org.alfresco + alfresco-jodconverter-core + + + org.apache.pdfbox + pdfbox + + + org.alfresco + alfresco-transform-misc + ${project.version} + + + org.alfresco + alfresco-transform-misc + ${project.version} + tests + test-jar + test + + + org.alfresco + alfresco-transform-tika + ${project.version} + + + org.alfresco + alfresco-transform-tika + ${project.version} + tests + test-jar + test + + + org.alfresco + alfresco-transform-pdf-renderer + ${project.version} + + + org.alfresco + alfresco-transform-pdf-renderer + ${project.version} + tests + test-jar + test + + + org.alfresco + alfresco-transform-libreoffice + ${project.version} + + + org.alfresco + alfresco-transform-libreoffice + ${project.version} + tests + test-jar + test + + + org.alfresco + alfresco-transform-imagemagick + ${project.version} + + + org.alfresco + alfresco-transform-imagemagick + ${project.version} + tests + test-jar + test + + diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java b/engines/aio/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java similarity index 90% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java rename to engines/aio/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java index 1eee6823..944a1adc 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java +++ b/engines/aio/src/main/java/org/alfresco/transform/coreaio/AIOTransformEngine.java @@ -33,6 +33,7 @@ import org.alfresco.transform.config.TransformConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -45,8 +46,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; @Component public class AIOTransformEngine implements TransformEngine { - @Autowired - private TransformRegistryImpl transformRegistry; +// private static String SPLIT_UP_COMMUNITY_LICENCE = Arrays.stream(COMMUNITY_LICENCE.split("\\n")); @Autowired(required = false) private List transformEngines; @@ -66,10 +66,10 @@ public class AIOTransformEngine implements TransformEngine message = transformEngines.stream() .filter(transformEngine -> transformEngine != this) .map(transformEngine -> transformEngine.getStartupMessage()) - .collect( Collectors.joining("\\n")); - message.replace(COMMUNITY_LICENCE + "\\n", ""); + .collect( Collectors.joining("\n")); + message = message.replace(COMMUNITY_LICENCE, ""); } - return COMMUNITY_LICENCE + "\\n" + message; + return COMMUNITY_LICENCE + message; } @Override diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/application-default.yaml b/engines/aio/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/application-default.yaml rename to engines/aio/src/main/resources/application-default.yaml diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/application.properties b/engines/aio/src/main/resources/application.properties similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/application.properties rename to engines/aio/src/main/resources/application.properties diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/Apache 2.0.txt b/engines/aio/src/main/resources/licenses/3rd-party/Apache 2.0.txt similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/Apache 2.0.txt rename to engines/aio/src/main/resources/licenses/3rd-party/Apache 2.0.txt diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/ImageMagick-license.txt b/engines/aio/src/main/resources/licenses/3rd-party/ImageMagick-license.txt similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/ImageMagick-license.txt rename to engines/aio/src/main/resources/licenses/3rd-party/ImageMagick-license.txt diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt b/engines/aio/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt rename to engines/aio/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/libreoffice.txt b/engines/aio/src/main/resources/licenses/3rd-party/libreoffice.txt similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/libreoffice.txt rename to engines/aio/src/main/resources/licenses/3rd-party/libreoffice.txt diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/pdfium.txt b/engines/aio/src/main/resources/licenses/3rd-party/pdfium.txt similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/licenses/3rd-party/pdfium.txt rename to engines/aio/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/quick.html b/engines/aio/src/main/resources/quick.html similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/quick.html rename to engines/aio/src/main/resources/quick.html diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/templates/transformForm.html b/engines/aio/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/resources/templates/transformForm.html rename to engines/aio/src/main/resources/templates/transformForm.html diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerHttpRequestTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerHttpRequestTest.java similarity index 94% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerHttpRequestTest.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerHttpRequestTest.java index 9ec2ff6b..7108a01f 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerHttpRequestTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerHttpRequestTest.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.base.AbstractHttpRequestTest; import org.springframework.boot.test.context.SpringBootTest; @@ -33,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class AIOControllerHttpRequestTest extends AbstractHttpRequestTest { - @Override protected String getTransformerName() { @@ -46,5 +45,4 @@ public class AIOControllerHttpRequestTest extends AbstractHttpRequestTest // Currently using same extension as ImageMagick tests return "jpg"; } - } diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerImageMagickTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerImageMagickTest.java new file mode 100644 index 00000000..db42838a --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerImageMagickTest.java @@ -0,0 +1,119 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.aio; + +import org.alfresco.transform.base.TransformRegistryImpl; +import org.alfresco.transform.config.Transformer; +import org.alfresco.transform.imagemagick.ImageMagickControllerTest; +import org.alfresco.transform.registry.AbstractTransformRegistry; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; + +import java.io.IOException; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test the AIOController ImageMagick transforms without a server. + * Super class includes tests for the TransformController. + */ +@WebMvcTest() +public class AIOControllerImageMagickTest extends ImageMagickControllerTest +{ + @Autowired TransformRegistryImpl transformRegistry; + + @BeforeEach @Override + public void before() throws IOException + { +// ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); +// ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); +// //Need to wire in the mocked commandExecutor into the controller... +// Map transformers = transformRegistry.getTransformerEngineMapping(); +// transformers.replace("imagemagick", commandExecutor); +// +// mockTransformCommand("jpg", "png", "image/jpeg", true); + } + + @Override + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, + String... params) + { + final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) + .param("targetMimetype", targetMimetype) + .param("sourceMimetype", sourceMimetype); + + return builder; + } + +// @Test +// @Override +// public void noTargetFileTest() +// { +// // Ignore the test in super class as the AIO transforms will not be selected . +// // It is the mock that returns a zero length file for other transformers, when we supply an invalid targetExtension. +// } +// +// @Test +// @Override +// public void testGetTransformConfigInfo() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetTransformConfigInfoExcludingCoreVersion() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithDuplicates() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithEmptyTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithNoTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +} diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java new file mode 100644 index 00000000..121008ae --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerLibreOfficeTest.java @@ -0,0 +1,101 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.aio; + +import org.alfresco.transform.libreoffice.LibreOfficeControllerTest; +//import org.alfresco.transform.libreoffice.transformers.LibreOfficeTransformer; +import org.alfresco.transform.registry.AbstractTransformRegistry; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; + +import java.util.Map; + +@WebMvcTest() +/** + * Test the AIOController without a server. + * Super class includes tests for the LibreOfficeController and TransformController. + */ +public class AIOControllerLibreOfficeTest extends LibreOfficeControllerTest +{ +// @Autowired AbstractTransformRegistry transformRegistry; +// +// @Override +// // Used by the super class to mock the javaExecutor, a different implementation is required here +// protected void setJavaExecutor(TransformController controller, LibreOfficeTransformer javaExecutor) +// { +// //Need to wire in the mocked javaExecutor into the controller... +// Map transformers = transformRegistry.getTransformerEngineMapping(); +// transformers.replace("libreoffice", javaExecutor); +// // No need to set the transform registry to the controller as it is @Autowired in +// } + + @Override + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, + String... params) + { + final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) + .param("targetMimetype", targetMimetype) + .param("sourceMimetype", sourceMimetype); + + return builder; + } + +// @Test +// @Override +// public void testGetTransformConfigInfo() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetTransformConfigInfoExcludingCoreVersion() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithDuplicates() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// @Test +// @Override +// public void testGetInfoFromConfigWithEmptyTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// @Test +// @Override +// public void testGetInfoFromConfigWithNoTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +} \ No newline at end of file diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerMiscTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerMiscTest.java new file mode 100644 index 00000000..98f83b98 --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerMiscTest.java @@ -0,0 +1,73 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.aio; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.alfresco.transform.misc.MiscControllerTest; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; + +@WebMvcTest() +public class AIOControllerMiscTest extends MiscControllerTest +{ +// @Test +// @Override +// public void testGetTransformConfigInfo() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetTransformConfigInfoExcludingCoreVersion() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithDuplicates() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithEmptyTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithNoTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +} \ No newline at end of file diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerPdfRendererTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerPdfRendererTest.java new file mode 100644 index 00000000..1f0ca877 --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerPdfRendererTest.java @@ -0,0 +1,103 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.aio; + +import org.alfresco.transform.pdfrenderer.AlfrescoPdfRendererControllerTest; +import org.alfresco.transform.registry.AbstractTransformRegistry; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; + +import java.util.Map; + +@WebMvcTest() +/** + * Test the AIOController PDF Renderer transforms without a server. + * Super class includes tests for the TransformController. + */ +public class AIOControllerPdfRendererTest extends AlfrescoPdfRendererControllerTest +{ + @Autowired AbstractTransformRegistry transformRegistry; + + @Override + protected void setFields() + { +// ReflectionTestUtils.setField(commandExecutor, "transformCommand", mockTransformCommand); +// ReflectionTestUtils.setField(commandExecutor, "checkCommand", mockCheckCommand); +// //Need to wire in the mocked commandExecutor into the controller... +// Map transformers = transformRegistry.getTransformerEngineMapping(); +// transformers.replace("pdfrenderer", commandExecutor); + } + + @Override + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, + String... params) + { + final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) + .param("targetMimetype", targetMimetype) + .param("sourceMimetype", sourceMimetype); + + return builder; + } + +// @Test +// @Override +// public void testGetTransformConfigInfo() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetTransformConfigInfoExcludingCoreVersion() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithDuplicates() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithEmptyTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithNoTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTest.java similarity index 74% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTest.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTest.java index eecbae55..89067b98 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOControllerTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTest.java @@ -24,60 +24,44 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; -import java.io.IOException; - -import org.alfresco.transform.aio.AIOController; -import org.alfresco.transform.aio.AIOCustomConfig; +import org.alfresco.transform.base.AbstractTransformControllerTest; import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transform.config.TransformConfig; -import org.alfresco.transformer.AbstractTransformerController; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.context.annotation.Import; import org.springframework.http.ResponseEntity; +import java.io.IOException; + import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_DEFAULT; import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_LATEST; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -@WebMvcTest(AIOController.class) -@Import(AIOCustomConfig.class) -public class AIOControllerTest //extends AbstractTransformerControllerTest +@WebMvcTest() +public class AIOControllerTest extends AbstractTransformControllerTest { @Value("${transform.core.version}") private String coreVersion; - @Autowired - AIOController aioController; - //@Override protected void mockTransformCommand(String sourceExtension, String targetExtension, String sourceMimetype, boolean readTargetFileBytes) throws IOException { // TODO Auto-generated method stub - - } - - //@Override - protected AbstractTransformerController getController() { - // TODO Auto-generated method stub - return null; } //@Override protected void updateTransformRequestWithSpecificOptions(TransformRequest transformRequest) { // TODO Auto-generated method stub - } @Test public void emptyTest() { - ResponseEntity responseEntity = aioController.info(Integer.valueOf(CONFIG_VERSION_DEFAULT)); + ResponseEntity responseEntity = controller.transformConfig(Integer.valueOf(CONFIG_VERSION_DEFAULT)); responseEntity.getBody().getTransformers().forEach(transformer -> { assertNull(transformer.getCoreVersion(), transformer.getTransformerName() + " should have had a null coreValue but was " + transformer.getCoreVersion()); @@ -87,7 +71,7 @@ public class AIOControllerTest //extends AbstractTransformerControllerTest @Test public void emptyTestWithLatestVersion() { - ResponseEntity responseEntity = aioController.info(CONFIG_VERSION_LATEST); + ResponseEntity responseEntity = controller.transformConfig(CONFIG_VERSION_LATEST); responseEntity.getBody().getTransformers().forEach(transformer -> { assertNotNull(transformer.getCoreVersion(), transformer.getTransformerName() + " should have had a coreValue but was null. Should have been " + coreVersion); diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTikaTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTikaTest.java new file mode 100644 index 00000000..4d1594e3 --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOControllerTikaTest.java @@ -0,0 +1,82 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.aio; + +import org.alfresco.transform.tika.TikaControllerTest; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; + +@WebMvcTest() +/** + * Test the AIOController Tika transforms without a server. + * Super class includes tests for the TransformController. + */ +public class AIOControllerTikaTest extends TikaControllerTest +{ +// @Test +// @Override +// public void testGetTransformConfigInfo() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetTransformConfigInfoExcludingCoreVersion() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithDuplicates() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithEmptyTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void testGetInfoFromConfigWithNoTransformOptions() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// } +// +// @Test +// @Override +// public void xlsxEmbedTest() +// { +// // Ignore the test in super class as the way the AIO transformer provides config is fundamentally different. +// // It uses the real class path rather than the test one. +// } +} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOImageMagickIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickIT.java similarity index 94% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOImageMagickIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickIT.java index 68e67919..ff85ada1 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOImageMagickIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOImageMagickIT.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.imagemagick.ImageMagickTransformationIT; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOLibreOfficeTransformationIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java similarity index 90% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOLibreOfficeTransformationIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java index b3864a62..7fef48ea 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOLibreOfficeTransformationIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOLibreOfficeTransformationIT.java @@ -24,11 +24,10 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.libreoffice.LibreOfficeTransformationIT; public class AIOLibreOfficeTransformationIT extends LibreOfficeTransformationIT { - // Tests are in LibreOfficeTransformationIT } \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOMiscMetadataExtractsIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOMiscMetadataExtractsIT.java similarity index 94% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOMiscMetadataExtractsIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOMiscMetadataExtractsIT.java index 2e4dbf3a..59101acb 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOMiscMetadataExtractsIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOMiscMetadataExtractsIT.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.misc.MiscMetadataExtractsIT; @@ -36,5 +36,4 @@ import org.alfresco.transform.misc.MiscMetadataExtractsIT; */ public class AIOMiscMetadataExtractsIT extends MiscMetadataExtractsIT { - //Tests are in MiscMetadataExtractsIT } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOMiscTransformsIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOMiscTransformsIT.java similarity index 90% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOMiscTransformsIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOMiscTransformsIT.java index fc1616bd..35d6a759 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOMiscTransformsIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOMiscTransformsIT.java @@ -24,11 +24,10 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.misc.MiscTransformsIT; public class AIOMiscTransformsIT extends MiscTransformsIT { - // Tests are in ImageMagickTransformationIT } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOPdfRendererIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOPdfRendererIT.java similarity index 84% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOPdfRendererIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOPdfRendererIT.java index 659c988f..2f53dd8c 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOPdfRendererIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOPdfRendererIT.java @@ -24,10 +24,10 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; -import org.alfresco.transform.pdfRenderer.AlfrescoPdfRendererTransformationIT; +import org.alfresco.transform.pdfrenderer.AlfrescoPdfRendererTransformationIT; -public class AIOPdfRendererIT extends AlfrescoPdfRendererTransformationIT { - // Tests are in AlfrescoPdfRendererTransformationIT +public class AIOPdfRendererIT extends AlfrescoPdfRendererTransformationIT +{ } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOQueueTransformServiceIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTransformServiceIT.java similarity index 92% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOQueueTransformServiceIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTransformServiceIT.java index 9263c753..f93e4470 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOQueueTransformServiceIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTransformServiceIT.java @@ -24,16 +24,16 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; -import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import org.alfresco.transform.base.AbstractQueueTransformServiceIT; +import org.alfresco.transform.client.model.TransformRequest; +import org.springframework.boot.test.context.SpringBootTest; import java.util.UUID; -import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractQueueTransformServiceIT; -import org.springframework.boot.test.context.SpringBootTest; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; /** * @author David Edwards diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTikaMetadataExtractsIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaMetadataExtractsIT.java similarity index 94% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTikaMetadataExtractsIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaMetadataExtractsIT.java index b553d5ec..7f06001d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTikaMetadataExtractsIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaMetadataExtractsIT.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.tika.TikaMetadataExtractsIT; @@ -36,5 +36,4 @@ import org.alfresco.transform.tika.TikaMetadataExtractsIT; */ public class AIOTikaMetadataExtractsIT extends TikaMetadataExtractsIT { - // Tests are in TikaMetadataExtractsIT } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTikaTransformationIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTransformationIT.java similarity index 90% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTikaTransformationIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTransformationIT.java index c0b1339b..cab93c9b 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transform/coreaio/AIOTikaTransformationIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTransformationIT.java @@ -24,11 +24,10 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.coreaio; +package org.alfresco.transform.aio; import org.alfresco.transform.tika.TikaTransformationIT; public class AIOTikaTransformationIT extends TikaTransformationIT { - // Tests are in ImageMagickTransformationIT } \ No newline at end of file diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTransformRegistryTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTransformRegistryTest.java new file mode 100644 index 00000000..44665b0d --- /dev/null +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTransformRegistryTest.java @@ -0,0 +1,312 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform.aio; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.registry.AbstractTransformRegistry; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.text.PDFTextStripper; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.nio.file.Files; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.alfresco.transform.common.RequestParamMap.PAGE_LIMIT; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class AIOTransformRegistryTest +{ + private static final String SOURCE_MIMETYPE = "text/html"; + private static final String TARGET_MIMETYPE = "text/plain"; + String SOURCE_ENCODING = "sourceEncoding"; + + @Autowired AbstractTransformRegistry transformRegistry; + + ObjectMapper objectMapper = new ObjectMapper(); + + + private void writeToFile(File file, String content, String encoding) throws Exception + { + try (OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream(file), encoding)) + { + ow.append(content); + } + } + + private String readFromFile(File file, final String encoding) throws Exception + { + return new String(Files.readAllBytes(file.toPath()), encoding); + } + + private TransformConfig loadConfig(String s) throws Exception + { + return objectMapper.readValue(new ClassPathResource(s).getFile(), TransformConfig.class); + } + + @Test + public void testConfigAggregation() throws Exception + { +// List expectedTransformNames = Arrays.asList("html", "string", "appleIWorks", "textToPdf", "rfc822", +// "Archive", "OutlookMsg", "PdfBox", "Office", "Poi", "OOXML", "TikaAuto", "TextMining"); +// +// List expectedTransformOptionNames = Arrays.asList("tikaOptions", "archiveOptions", "pdfboxOptions", +// "textToPdfOptions", "stringOptions", "metadataOptions"); +// +// TransformConfig miscConfig = loadConfig("misc_engine_config.json"); +// TransformConfig tikaConfig = loadConfig("tika_engine_config.json"); +// +// // check correct number of transformers +// assertEquals( +// miscConfig.getTransformers().size() + tikaConfig.getTransformers().size(), +// transformRegistry.getTransformConfig().getTransformers().size(), +// "Number of expected transformers"); +// +// List actualTransformerNames = transformRegistry.getTransformConfig().getTransformers() +// .stream().map(t -> t.getTransformerName()).collect(Collectors.toList()); +// // check all transformers are there +// for(String transformNames : expectedTransformNames) +// { +// assertTrue(actualTransformerNames.contains(transformNames),"Expected transformer missing."); +// } +// +// // check correct number of options +// long distinctOptionCount = Stream.concat( +// miscConfig.getTransformOptions().keySet().stream(), +// tikaConfig.getTransformOptions().keySet().stream()).distinct().count(); +// assertEquals( +// distinctOptionCount, +// transformRegistry.getTransformConfig().getTransformOptions().size(), +// "Number of expected transformers"); +// +// Set actualOptionNames = transformRegistry.getTransformConfig().getTransformOptions().keySet(); +// +// // check all options are there +// for (String optionName : expectedTransformOptionNames) +// { +// assertTrue(actualOptionNames.contains(optionName), "Expected transform option missing:"+optionName); +// } + } + + @Test + public void testTransformerMapping() + { +// List tikaTransforms = Arrays.asList("Archive", "OutlookMsg", "PdfBox", "Office", "Poi", "OOXML", "TikaAuto", "TextMining"); +// List miscTransforms = Arrays.asList("html", "string", "appleIWorks", "textToPdf", "rfc822"); +// +// for (String transform : tikaTransforms) +// { +// String actualId = transformRegistry.getByTransformName(transform).getTransformerId(); +// assertEquals("tika", actualId, "Wrong mapping for transform "+transform); +// } +// +// for (String transform : miscTransforms) +// { +// String actualId = transformRegistry.getByTransformName(transform).getTransformerId(); +// assertEquals("misc", actualId, "Wrong mapping for transform "+transform); +// } + } + + // Test copied from Misc (HtmlParserContentTransformerTest) See ATS-712 aioTransformerRegistry - html + @Test + public void testMiscHtml() throws Exception + { +// final String NEWLINE = System.getProperty("line.separator"); +// final String TITLE = "Testing!"; +// final String TEXT_P1 = "This is some text in English"; +// final String TEXT_P2 = "This is more text in English"; +// final String TEXT_P3 = "C'est en Fran\u00e7ais et Espa\u00f1ol"; +// String partA = "" + TITLE + "" + NEWLINE; +// String partB = "

" + TEXT_P1 + "

" + NEWLINE + +// "

" + TEXT_P2 + "

" + NEWLINE + +// "

" + TEXT_P3 + "

" + NEWLINE; +// String partC = ""; +// final String expected = TITLE + NEWLINE + TEXT_P1 + NEWLINE + TEXT_P2 + NEWLINE + TEXT_P3 + NEWLINE; +// +// File tmpS = null; +// File tmpD = null; +// +// try +// { +// // Content set to ISO 8859-1 +// tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); +// writeToFile(tmpS, partA + partB + partC, "ISO-8859-1"); +// +// tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); +// +// Map parameters = new HashMap<>(); +// parameters.put(SOURCE_ENCODING, "ISO-8859-1"); +// Transformer transformer = transformRegistry.getByTransformName("html"); +// transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); +// +// assertEquals(expected, readFromFile(tmpD, "UTF-8")); +// tmpS.delete(); +// tmpD.delete(); +// +// // Content set to UTF-8 +// tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); +// writeToFile(tmpS, partA + partB + partC, "UTF-8"); +// +// tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); +// parameters = new HashMap<>(); +// parameters.put(SOURCE_ENCODING, "UTF-8"); +// transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); +// assertEquals(expected, readFromFile(tmpD, "UTF-8")); +// tmpS.delete(); +// tmpD.delete(); +// +// // Content set to UTF-16 +// tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); +// writeToFile(tmpS, partA + partB + partC, "UTF-16"); +// +// tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); +// parameters = new HashMap<>(); +// parameters.put(SOURCE_ENCODING, "UTF-16"); +// transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); +// assertEquals(expected, readFromFile(tmpD, "UTF-8")); +// tmpS.delete(); +// tmpD.delete(); +// +// // Note - since HTML Parser 2.0 META tags specifying the +// // document encoding will ONLY be respected if the original +// // content type was set to ISO-8859-1. +// // +// // This means there is now only one test which we can perform +// // to ensure that this now-limited overriding of the encoding +// // takes effect. +// +// // Content set to ISO 8859-1, meta set to UTF-8 +// tmpS = File.createTempFile("AlfrescoTestSource_", ".html"); +// String str = partA + +// "" + +// partB + partC; +// +// writeToFile(tmpS, str, "UTF-8"); +// +// tmpD = File.createTempFile("AlfrescoTestTarget_", ".txt"); +// +// parameters = new HashMap<>(); +// parameters.put(SOURCE_ENCODING, "ISO-8859-1"); +// transformer.transformExtractOrEmbed("html", SOURCE_MIMETYPE, TARGET_MIMETYPE, parameters, tmpS, tmpD); +// assertEquals(expected, readFromFile(tmpD, "UTF-8")); +// tmpS.delete(); +// tmpD.delete(); +// +// // Note - we can't test UTF-16 with only a meta encoding, +// // because without that the parser won't know about the +// // 2 byte format so won't be able to identify the meta tag +// } +// finally +// { +// if (tmpS != null && tmpS.exists()) tmpS.delete(); +// if (tmpD != null && tmpD.exists()) tmpD.delete(); +// } + } + + // Test copied from Misc (TextToPdfContentTransformerTest) See ATS-712 aioTransformerRegistry - pdf + @Test + public void testMiscPdf() throws Exception + { + transformTextAndCheckPageLength(-1); + } + + private void transformTextAndCheckPageLength(int pageLimit) throws Exception + { + int pageLength = 32; + int lines = (pageLength + 10) * ((pageLimit > 0) ? pageLimit : 1); + StringBuilder sb = new StringBuilder(); + String checkText = null; + int cutoff = pageLimit * pageLength; + for (int i = 1; i <= lines; i++) + { + sb.append(Integer.toString(i)); + sb.append(" I must not talk in class or feed my homework to my cat.\n"); + if (i == cutoff) + checkText = sb.toString(); + } + sb.append("\nBart\n"); + String text = sb.toString(); + checkText = (checkText == null) ? clean(text) : clean(checkText); + transformTextAndCheck(text, "UTF-8", checkText, String.valueOf(pageLimit)); + } + + private void transformTextAndCheck(String text, String encoding, String checkText, + String pageLimit) throws Exception + { +// // Get a reader for the text +// File sourceFile = File.createTempFile("AlfrescoTestSource_", ".txt"); +// writeToFile(sourceFile, text, encoding); +// +// // And a temp writer +// File targetFile = File.createTempFile("AlfrescoTestTarget_", ".pdf"); +// +// // Transform to PDF +// Map parameters = new HashMap<>(); +// parameters.put(PAGE_LIMIT, pageLimit); +// Transformer transformer = transformRegistry.getByTransformName("textToPdf"); +// transformer.transformExtractOrEmbed("textToPdf", "text/plain", "application/pdf", parameters, sourceFile, targetFile); +// +// // Read back in the PDF and check it +// PDDocument doc = PDDocument.load(targetFile); +// PDFTextStripper textStripper = new PDFTextStripper(); +// StringWriter textWriter = new StringWriter(); +// textStripper.writeText(doc, textWriter); +// doc.close(); +// +// String roundTrip = clean(textWriter.toString()); +// +// assertEquals( +// checkText, roundTrip, +// "Incorrect text in PDF when starting from text in " + encoding +// ); +// +// sourceFile.delete(); +// targetFile.delete(); + } + + private String clean(String text) + { + text = text.replaceAll("\\s+\\r", ""); + text = text.replaceAll("\\s+\\n", ""); + text = text.replaceAll("\\r", ""); + text = text.replaceAll("\\n", ""); + return text; + } +} \ No newline at end of file diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/resources/misc_engine_config.json b/engines/aio/src/test/resources/misc_engine_config.json similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/resources/misc_engine_config.json rename to engines/aio/src/test/resources/misc_engine_config.json diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/resources/tika_engine_config.json b/engines/aio/src/test/resources/tika_engine_config.json similarity index 100% rename from alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/resources/tika_engine_config.json rename to engines/aio/src/test/resources/tika_engine_config.json diff --git a/t-engine-base/README.md b/engines/base/README.md similarity index 96% rename from t-engine-base/README.md rename to engines/base/README.md index e760db33..e791fcf3 100644 --- a/t-engine-base/README.md +++ b/engines/base/README.md @@ -49,7 +49,7 @@ src/main/java/org/alfresco/transformer/Application.java ~~~ * *TransformerName*Controller.java - A [Spring Boot](https://projects.spring.io/spring-boot/) Controller that - extends AbstractTransformerController to handel requests. It implements a few methods including *transformImpl* + extends TransformController to handel requests. It implements a few methods including *transformImpl* which is intended to perform the actual transform. Generally the transform is done in a sub class of *JavaExecutor*, when a Java library is being used or *AbstractCommandExecutor*, when an external process is used. Both are sub interfaces of *Transformer*. @@ -57,7 +57,7 @@ src/main/java/org/alfresco/transformer/Application.java ~~~ ... @Controller -public class TransformerNameController extends AbstractTransformerController +public class TransformerNameController extends TransformController { private static final Logger logger = LoggerFactory.getLogger(TransformerNameController.class); @@ -149,7 +149,7 @@ public class Application } ~~~ -Transform requests are handled by the *AbstractTransformerController*, but are either: +Transform requests are handled by the *TransformController*, but are either: * POST requests (a direct http request from a client) where the transform options are passed as parameters, the source is supplied as a multipart file and the response is a file download. * POST request (a request via a message queue) where the transform options are supplied as JSON and the response is also JSON. @@ -210,7 +210,7 @@ The artifacts can be obtained by: ~~~ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine 1.0 ~~~ diff --git a/t-engine-base/pom.xml b/engines/base/pom.xml similarity index 97% rename from t-engine-base/pom.xml rename to engines/base/pom.xml index 95fdb002..f9ebdc99 100644 --- a/t-engine-base/pom.xml +++ b/engines/base/pom.xml @@ -1,6 +1,8 @@ 4.0.0 + alfresco-base-t-engine + - Base org.alfresco @@ -8,8 +10,6 @@ 2.6.1-SNAPSHOT - alfresco-t-engine-base - false diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/Application.java b/engines/base/src/main/java/org/alfresco/transform/base/Application.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/Application.java rename to engines/base/src/main/java/org/alfresco/transform/base/Application.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/CustomTransformer.java b/engines/base/src/main/java/org/alfresco/transform/base/CustomTransformer.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/CustomTransformer.java rename to engines/base/src/main/java/org/alfresco/transform/base/CustomTransformer.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/QueueTransformService.java b/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/QueueTransformService.java rename to engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/TransformController.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java similarity index 96% rename from t-engine-base/src/main/java/org/alfresco/transform/base/TransformController.java rename to engines/base/src/main/java/org/alfresco/transform/base/TransformController.java index e100aa82..818fa486 100644 --- a/t-engine-base/src/main/java/org/alfresco/transform/base/TransformController.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java @@ -74,6 +74,7 @@ import java.io.IOException; import java.net.URL; import java.util.Arrays; import java.util.Collection; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -160,6 +161,12 @@ public class TransformController .filter(transformEngine -> transformEngine.getTransformConfig() == null) .findFirst() .orElse(transformEngines.get(0)); + + logger.info("TransformEngine: " + transformEngine.getTransformEngineName()); + transformEngines.stream() + .filter(te -> te != transformEngine) + .sorted(Comparator.comparing(TransformEngine::getTransformEngineName)) + .map(transformEngine -> " "+transformEngine.getTransformEngineName()).forEach(logger::info); } } @@ -175,8 +182,13 @@ public class TransformController { if (customTransformers != null) { - customTransformers.forEach(customTransformer -> customTransformersByName.put(customTransformer.getTransformerName(), - customTransformer)); + customTransformers.forEach(customTransformer -> + customTransformersByName.put(customTransformer.getTransformerName(), customTransformer)); + + logger.info("Transformers:"); + customTransformers.stream() + .sorted(Comparator.comparing(CustomTransformer::getTransformerName)) + .map(customTransformer -> " "+customTransformer.getTransformerName()).forEach(logger::info); } } @@ -187,9 +199,7 @@ public class TransformController logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); if (transformEngines != null) { - transformEngines.stream() - .map(transformEngine -> transformEngine.getStartupMessage()) - .forEach(message -> Arrays.stream(message.split("\\n")).forEach(logger::info)); + Arrays.stream(transformEngine.getStartupMessage().split("\\n")).forEach(logger::info); } logger.info("--------------------------------------------------------------------------------------------------------------------------------------------------------------"); diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/TransformEngine.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformEngine.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/TransformEngine.java rename to engines/base/src/main/java/org/alfresco/transform/base/TransformEngine.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java rename to engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java rename to engines/base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/clients/AlfrescoSharedFileStoreClient.java b/engines/base/src/main/java/org/alfresco/transform/base/clients/AlfrescoSharedFileStoreClient.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/clients/AlfrescoSharedFileStoreClient.java rename to engines/base/src/main/java/org/alfresco/transform/base/clients/AlfrescoSharedFileStoreClient.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java rename to engines/base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java b/engines/base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java rename to engines/base/src/main/java/org/alfresco/transform/base/executors/AbstractCommandExecutor.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/executors/CommandExecutor.java b/engines/base/src/main/java/org/alfresco/transform/base/executors/CommandExecutor.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/executors/CommandExecutor.java rename to engines/base/src/main/java/org/alfresco/transform/base/executors/CommandExecutor.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/executors/ExecParameterTokenizer.java b/engines/base/src/main/java/org/alfresco/transform/base/executors/ExecParameterTokenizer.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/executors/ExecParameterTokenizer.java rename to engines/base/src/main/java/org/alfresco/transform/base/executors/ExecParameterTokenizer.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java b/engines/base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java rename to engines/base/src/main/java/org/alfresco/transform/base/executors/RuntimeExec.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/fs/FileManager.java b/engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/fs/FileManager.java rename to engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/logging/LogEntry.java b/engines/base/src/main/java/org/alfresco/transform/base/logging/LogEntry.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/logging/LogEntry.java rename to engines/base/src/main/java/org/alfresco/transform/base/logging/LogEntry.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/logging/StandardMessages.java b/engines/base/src/main/java/org/alfresco/transform/base/logging/StandardMessages.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/logging/StandardMessages.java rename to engines/base/src/main/java/org/alfresco/transform/base/logging/StandardMessages.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/messaging/MessagingConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingConfig.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/messaging/MessagingConfig.java rename to engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingConfig.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java rename to engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java rename to engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java rename to engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/metadataExtractors/AbstractMetadataExtractor.java b/engines/base/src/main/java/org/alfresco/transform/base/metadataExtractors/AbstractMetadataExtractor.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/metadataExtractors/AbstractMetadataExtractor.java rename to engines/base/src/main/java/org/alfresco/transform/base/metadataExtractors/AbstractMetadataExtractor.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/model/FileRefEntity.java b/engines/base/src/main/java/org/alfresco/transform/base/model/FileRefEntity.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/model/FileRefEntity.java rename to engines/base/src/main/java/org/alfresco/transform/base/model/FileRefEntity.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/model/FileRefResponse.java b/engines/base/src/main/java/org/alfresco/transform/base/model/FileRefResponse.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/model/FileRefResponse.java rename to engines/base/src/main/java/org/alfresco/transform/base/model/FileRefResponse.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/probes/ProbeTestTransform.java b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTestTransform.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/probes/ProbeTestTransform.java rename to engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTestTransform.java diff --git a/t-engine-base/src/main/java/org/alfresco/transform/base/util/Util.java b/engines/base/src/main/java/org/alfresco/transform/base/util/Util.java similarity index 100% rename from t-engine-base/src/main/java/org/alfresco/transform/base/util/Util.java rename to engines/base/src/main/java/org/alfresco/transform/base/util/Util.java diff --git a/t-engine-base/src/main/resources/application.yaml b/engines/base/src/main/resources/application.yaml similarity index 100% rename from t-engine-base/src/main/resources/application.yaml rename to engines/base/src/main/resources/application.yaml diff --git a/t-engine-base/src/main/resources/engine_config.json b/engines/base/src/main/resources/engine_config.json similarity index 100% rename from t-engine-base/src/main/resources/engine_config.json rename to engines/base/src/main/resources/engine_config.json diff --git a/t-engine-base/src/main/resources/templates/error.html b/engines/base/src/main/resources/templates/error.html similarity index 100% rename from t-engine-base/src/main/resources/templates/error.html rename to engines/base/src/main/resources/templates/error.html diff --git a/t-engine-base/src/main/resources/templates/log.html b/engines/base/src/main/resources/templates/log.html similarity index 100% rename from t-engine-base/src/main/resources/templates/log.html rename to engines/base/src/main/resources/templates/log.html diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/AbstractHttpRequestTest.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractHttpRequestTest.java similarity index 100% rename from t-engine-base/src/test/java/org/alfresco/transform/base/AbstractHttpRequestTest.java rename to engines/base/src/test/java/org/alfresco/transform/base/AbstractHttpRequestTest.java diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java similarity index 100% rename from t-engine-base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java rename to engines/base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java similarity index 100% rename from t-engine-base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java rename to engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/AbstractTransformerControllerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractTransformControllerTest.java similarity index 99% rename from t-engine-base/src/test/java/org/alfresco/transform/base/AbstractTransformerControllerTest.java rename to engines/base/src/test/java/org/alfresco/transform/base/AbstractTransformControllerTest.java index d2dc1fc9..d51e4ca0 100644 --- a/t-engine-base/src/test/java/org/alfresco/transform/base/AbstractTransformerControllerTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/AbstractTransformControllerTest.java @@ -61,7 +61,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.alfresco.transform.base.TransformController; import org.alfresco.transform.base.probes.ProbeTestTransform; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; @@ -99,13 +98,13 @@ import com.google.common.collect.ImmutableSet; /** * Super class for testing controllers without a server. Includes tests for the Controller itself. */ -public abstract class AbstractTransformerControllerTest +public abstract class AbstractTransformControllerTest { @TempDir // added as part of ATS-702 to allow test resources to be read from the imported jar files to prevent test resource duplication public File tempDir; @Autowired - TransformController controller; + protected TransformController controller; @Autowired protected MockMvc mockMvc; diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/EngineClient.java b/engines/base/src/test/java/org/alfresco/transform/base/EngineClient.java similarity index 100% rename from t-engine-base/src/test/java/org/alfresco/transform/base/EngineClient.java rename to engines/base/src/test/java/org/alfresco/transform/base/EngineClient.java diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java b/engines/base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java similarity index 100% rename from t-engine-base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java rename to engines/base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/SourceTarget.java b/engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java similarity index 94% rename from t-engine-base/src/test/java/org/alfresco/transform/base/SourceTarget.java rename to engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java index 8a55ef7f..37fc9fda 100644 --- a/t-engine-base/src/test/java/org/alfresco/transform/base/SourceTarget.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -33,8 +33,8 @@ import java.util.Objects; */ public class SourceTarget { - final String source; - final String target; + public final String source; + public final String target; private SourceTarget(final String source, final String target) { diff --git a/t-engine-base/src/test/java/org/alfresco/transform/base/TestFileInfo.java b/engines/base/src/test/java/org/alfresco/transform/base/TestFileInfo.java similarity index 100% rename from t-engine-base/src/test/java/org/alfresco/transform/base/TestFileInfo.java rename to engines/base/src/test/java/org/alfresco/transform/base/TestFileInfo.java diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_complete.json b/engines/base/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_complete.json rename to engines/base/src/test/resources/engine_config_complete.json diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_incomplete.json b/engines/base/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_incomplete.json rename to engines/base/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_no_transform_options.json b/engines/base/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_no_transform_options.json rename to engines/base/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_with_duplicates.json b/engines/base/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/engine_config_with_duplicates.json rename to engines/base/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/.maven-dockerignore b/engines/imagemagick/.maven-dockerignore similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/.maven-dockerignore rename to engines/imagemagick/.maven-dockerignore diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/Dockerfile b/engines/imagemagick/Dockerfile similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/Dockerfile rename to engines/imagemagick/Dockerfile diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/LICENSES.md b/engines/imagemagick/LICENSES.md similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/LICENSES.md rename to engines/imagemagick/LICENSES.md diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md b/engines/imagemagick/README.md similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md rename to engines/imagemagick/README.md diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml b/engines/imagemagick/pom.xml similarity index 96% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml rename to engines/imagemagick/pom.xml index be6f79f5..99ddfd61 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/pom.xml +++ b/engines/imagemagick/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - alfresco-transform-imagemagick-boot - Alfresco ImageMagick Transformer Spring Boot + alfresco-transform-imagemagick + - ImageMagick - org.alfresco alfresco-transform-core + org.alfresco 2.6.1-SNAPSHOT ../../pom.xml @@ -20,22 +20,17 @@ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} tests test-jar test - - org.alfresco - alfresco-transform-imagemagick - ${project.version} - org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh b/engines/imagemagick/scripts/build-rpms.sh similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh rename to engines/imagemagick/scripts/build-rpms.sh diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java rename to engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickOptionsBuilder.java diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java rename to engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java rename to engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/transformers/ImageMagickTransformer.java diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/application-default.yaml b/engines/imagemagick/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/application-default.yaml rename to engines/imagemagick/src/main/resources/application-default.yaml diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/imagemagick_engine_config.json b/engines/imagemagick/src/main/resources/imagemagick_engine_config.json similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/imagemagick_engine_config.json rename to engines/imagemagick/src/main/resources/imagemagick_engine_config.json diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/3rd-party/ImageMagick-license.txt b/engines/imagemagick/src/main/resources/licenses/3rd-party/ImageMagick-license.txt similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/3rd-party/ImageMagick-license.txt rename to engines/imagemagick/src/main/resources/licenses/3rd-party/ImageMagick-license.txt diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/quick.jpg b/engines/imagemagick/src/main/resources/quick.jpg similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/quick.jpg rename to engines/imagemagick/src/main/resources/quick.jpg diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/templates/transformForm.html b/engines/imagemagick/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/resources/templates/transformForm.html rename to engines/imagemagick/src/main/resources/templates/transformForm.html diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java similarity index 94% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java rename to engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java index 76363723..97b30f1f 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickControllerTest.java @@ -59,12 +59,12 @@ import javax.annotation.PostConstruct; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transform.imagemagick.transformers.ImageMagickTransformer; -import org.alfresco.transformer.AbstractTransformerController; -import org.alfresco.transformer.AbstractTransformerControllerTest; -import org.alfresco.transformer.executors.RuntimeExec; -import org.alfresco.transformer.executors.RuntimeExec.ExecutionResult; -import org.alfresco.transformer.model.FileRefEntity; -import org.alfresco.transformer.model.FileRefResponse; +import org.alfresco.transform.base.TransformController; +import org.alfresco.transform.base.AbstractTransformControllerTest; +import org.alfresco.transform.base.executors.RuntimeExec; +import org.alfresco.transform.base.executors.RuntimeExec.ExecutionResult; +import org.alfresco.transform.base.model.FileRefEntity; +import org.alfresco.transform.base.model.FileRefResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -84,12 +84,10 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; /** * Test the ImageMagickController without a server. - * Super class includes tests for the AbstractTransformerController. + * Super class includes tests for the TransformController. */ -// Specifying class for @WebMvcTest() will break AIO tests, without specifying it will use all controllers in the application context, -// currently only ImageMagickController.class @WebMvcTest() -public class ImageMagickControllerTest extends AbstractTransformerControllerTest +public class ImageMagickControllerTest extends AbstractTransformControllerTest { private static final String ENGINE_CONFIG_NAME = "imagemagick_engine_config.json"; @@ -119,17 +117,14 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest @Value("${transform.core.imagemagick.config}") protected String CONFIG; - ImageMagickTransformer commandExecutor; + protected ImageMagickTransformer commandExecutor; @PostConstruct private void init() { - commandExecutor = new ImageMagickTransformer(EXE, DYN, ROOT, CODERS, CONFIG); + commandExecutor = new ImageMagickTransformer(); } - @Autowired - protected AbstractTransformerController controller; - @BeforeEach public void before() throws IOException { @@ -218,12 +213,6 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest when(mockExecutionResult.getStdOut()).thenReturn("STDOUT"); } - @Override - protected AbstractTransformerController getController() - { - return controller; - } - @ParameterizedTest @ValueSource(strings = {"North", "NorthEast", "East", "SouthEast", "South", "SouthWest", "West", "NorthWest", "Center"}) public void cropGravityGoodTest(String value) throws Exception diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java similarity index 96% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java rename to engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java index c7e1c28f..7e0a0392 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickHttpRequestTest.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.imagemagick; -import org.alfresco.transformer.AbstractHttpRequestTest; +import org.alfresco.transform.base.AbstractHttpRequestTest; import org.springframework.boot.test.context.SpringBootTest; /** diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java similarity index 96% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java rename to engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java index 3e9d14bd..ab24f778 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java @@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractQueueTransformServiceIT; +import org.alfresco.transform.base.AbstractQueueTransformServiceIT; import org.springframework.boot.test.context.SpringBootTest; /** diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java similarity index 98% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java rename to engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java index d2d6e6aa..0321c36e 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java @@ -30,8 +30,8 @@ import static java.text.MessageFormat.format; import static java.util.Collections.emptyMap; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static org.alfresco.transformer.EngineClient.sendTRequest; -import static org.alfresco.transformer.TestFileInfo.testFile; +import static org.alfresco.transform.base.EngineClient.sendTRequest; +import static org.alfresco.transform.base.TestFileInfo.testFile; import static org.alfresco.transform.common.Mimetype.MIMETYPE_APPLICATION_EPS; import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_BMP; import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_CGM; @@ -76,7 +76,7 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.alfresco.transformer.TestFileInfo; +import org.alfresco.transform.base.TestFileInfo; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_complete.json b/engines/imagemagick/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_complete.json rename to engines/imagemagick/src/test/resources/engine_config_complete.json diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_incomplete.json b/engines/imagemagick/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_incomplete.json rename to engines/imagemagick/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_no_transform_options.json b/engines/imagemagick/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_no_transform_options.json rename to engines/imagemagick/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_with_duplicates.json b/engines/imagemagick/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/engine_config_with_duplicates.json rename to engines/imagemagick/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.bmp b/engines/imagemagick/src/test/resources/quick.bmp similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.bmp rename to engines/imagemagick/src/test/resources/quick.bmp diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.eps b/engines/imagemagick/src/test/resources/quick.eps similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.eps rename to engines/imagemagick/src/test/resources/quick.eps diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.gif b/engines/imagemagick/src/test/resources/quick.gif similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.gif rename to engines/imagemagick/src/test/resources/quick.gif diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.jpg b/engines/imagemagick/src/test/resources/quick.jpg similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.jpg rename to engines/imagemagick/src/test/resources/quick.jpg diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.pbm b/engines/imagemagick/src/test/resources/quick.pbm similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.pbm rename to engines/imagemagick/src/test/resources/quick.pbm diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.pgm b/engines/imagemagick/src/test/resources/quick.pgm similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.pgm rename to engines/imagemagick/src/test/resources/quick.pgm diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.png b/engines/imagemagick/src/test/resources/quick.png similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.png rename to engines/imagemagick/src/test/resources/quick.png diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.pnm b/engines/imagemagick/src/test/resources/quick.pnm similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.pnm rename to engines/imagemagick/src/test/resources/quick.pnm diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.ppm b/engines/imagemagick/src/test/resources/quick.ppm similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.ppm rename to engines/imagemagick/src/test/resources/quick.ppm diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.psd b/engines/imagemagick/src/test/resources/quick.psd similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.psd rename to engines/imagemagick/src/test/resources/quick.psd diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.tiff b/engines/imagemagick/src/test/resources/quick.tiff similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.tiff rename to engines/imagemagick/src/test/resources/quick.tiff diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.xbm b/engines/imagemagick/src/test/resources/quick.xbm similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.xbm rename to engines/imagemagick/src/test/resources/quick.xbm diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.xpm b/engines/imagemagick/src/test/resources/quick.xpm similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.xpm rename to engines/imagemagick/src/test/resources/quick.xpm diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.xwd b/engines/imagemagick/src/test/resources/quick.xwd similarity index 100% rename from alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/test/resources/quick.xwd rename to engines/imagemagick/src/test/resources/quick.xwd diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/.maven-dockerignore b/engines/libreoffice/.maven-dockerignore similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/.maven-dockerignore rename to engines/libreoffice/.maven-dockerignore diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/Dockerfile b/engines/libreoffice/Dockerfile similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/Dockerfile rename to engines/libreoffice/Dockerfile diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/LICENSES.md b/engines/libreoffice/LICENSES.md similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/LICENSES.md rename to engines/libreoffice/LICENSES.md diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml b/engines/libreoffice/pom.xml similarity index 96% rename from alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml rename to engines/libreoffice/pom.xml index 9274fb46..a899533a 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/pom.xml +++ b/engines/libreoffice/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - alfresco-transform-misc-boot - Alfresco Miscellaneous Transformer Spring Boot + alfresco-transform-libreoffice + - LibreOffice - org.alfresco alfresco-transform-core + org.alfresco 2.6.1-SNAPSHOT ../../pom.xml - alfresco/alfresco-transform-misc + alfresco/alfresco-libreoffice quay.io ${project.artifactId} @@ -20,22 +20,17 @@ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} tests test-jar test - - org.alfresco - alfresco-transform-misc - ${project.version} - org.springframework.boot spring-boot-starter-thymeleaf @@ -55,6 +50,14 @@ org.dom4j dom4j + + org.alfresco + alfresco-jodconverter-core + + + org.apache.pdfbox + pdfbox + diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformEngine.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformEngine.java rename to engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java rename to engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverter.java diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java rename to engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/JodConverterSharedInstance.java diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java rename to engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeExtractMetadataTask.java diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java rename to engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/application-default.yaml b/engines/libreoffice/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/application-default.yaml rename to engines/libreoffice/src/main/resources/application-default.yaml diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/application.properties b/engines/libreoffice/src/main/resources/application.properties similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/application.properties rename to engines/libreoffice/src/main/resources/application.properties diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/libreoffice_engine_config.json b/engines/libreoffice/src/main/resources/libreoffice_engine_config.json similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/libreoffice_engine_config.json rename to engines/libreoffice/src/main/resources/libreoffice_engine_config.json diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/3rd-party/libreoffice.txt b/engines/libreoffice/src/main/resources/licenses/3rd-party/libreoffice.txt similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/3rd-party/libreoffice.txt rename to engines/libreoffice/src/main/resources/licenses/3rd-party/libreoffice.txt diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/quick.doc b/engines/libreoffice/src/main/resources/quick.doc similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/quick.doc rename to engines/libreoffice/src/main/resources/quick.doc diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/templates/transformForm.html b/engines/libreoffice/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/resources/templates/transformForm.html rename to engines/libreoffice/src/main/resources/templates/transformForm.html diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java similarity index 79% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java rename to engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java index a2a5afb0..cb12993d 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeControllerTest.java @@ -59,16 +59,14 @@ import javax.annotation.PostConstruct; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; import org.alfresco.transform.libreoffice.transformers.LibreOfficeTransformer; -import org.alfresco.transformer.AbstractTransformerController; -import org.alfresco.transformer.AbstractTransformerControllerTest; -import org.alfresco.transformer.executors.RuntimeExec.ExecutionResult; -import org.alfresco.transformer.model.FileRefEntity; -import org.alfresco.transformer.model.FileRefResponse; +import org.alfresco.transform.base.AbstractTransformControllerTest; +import org.alfresco.transform.base.executors.RuntimeExec.ExecutionResult; +import org.alfresco.transform.base.model.FileRefEntity; +import org.alfresco.transform.base.model.FileRefResponse; import org.artofsolving.jodconverter.office.OfficeException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; @@ -82,14 +80,11 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; /** * Test the LibreOfficeController without a server. - * Super class includes tests for the AbstractTransformerController. + * Super class includes tests for the TransformController. */ -// Specifying class for @WebMvcTest() will break AIO tests, without specifying it will use all controllers in the application context, -// currently only LibreOfficeController.class @WebMvcTest() -public class LibreOfficeControllerTest extends AbstractTransformerControllerTest +public class LibreOfficeControllerTest extends AbstractTransformControllerTest { - protected static final String ENGINE_CONFIG_NAME = "libreoffice_engine_config.json"; protected String targetMimetype = MIMETYPE_PDF; @@ -113,18 +108,18 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest @Value("${transform.core.libreoffice.isEnabled}") private String isEnabled; + + @Autowired + private LibreOfficeTransformer libreOfficeTransformer; protected LibreOfficeTransformer javaExecutor; @PostConstruct private void init() { - javaExecutor = Mockito.spy(new LibreOfficeTransformer(execPath, maxTasksPerProcess, timeout, portNumbers, templateProfileDir, isEnabled)); +// javaExecutor = Mockito.spy(new LibreOfficeTransformer(execPath, maxTasksPerProcess, timeout, portNumbers, templateProfileDir, isEnabled)); } - @Autowired - protected AbstractTransformerController controller; - @BeforeEach public void before() throws IOException { @@ -132,7 +127,7 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest targetExtension = "pdf"; sourceMimetype = "application/msword"; - setJavaExecutor(controller,javaExecutor); +// setJavaExecutor(controller, javaExecutor); // The following is based on super.mockTransformCommand(...) // This is because LibreOffice used JodConverter rather than a RuntimeExec @@ -172,10 +167,10 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest } - protected void setJavaExecutor(AbstractTransformerController controller, LibreOfficeTransformer javaExecutor) - { - ReflectionTestUtils.setField(controller, "javaExecutor", javaExecutor); - } +// protected void setJavaExecutor(TransformerController controller, LibreOfficeTransformer javaExecutor) +// { +// ReflectionTestUtils.setField(controller, "javaExecutor", javaExecutor); +// } @Override public String getEngineConfigName() @@ -190,12 +185,6 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest throw new IllegalStateException(); } - @Override - protected AbstractTransformerController getController() - { - return controller; - } - @Test public void badExitCodeTest() throws Exception { @@ -269,106 +258,90 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest @Test public void testOverridingExecutorPaths() { - //System test property value can me modified in the pom.xml + //System test property value can be modified in the pom.xml assertEquals(execPath, System.getProperty("LIBREOFFICE_HOME")); } @Test public void testOverridingExecutorMaxTasksPerProcess() { - //System test property value can me modified in the pom.xml + //System test property value can be modified in the pom.xml assertEquals(maxTasksPerProcess, System.getProperty("LIBREOFFICE_MAX_TASKS_PER_PROCESS")); } @Test public void testOverridingExecutorTimeout() { - //System test property value can me modified in the pom.xml + //System test property value can be modified in the pom.xml assertEquals(timeout, System.getProperty("LIBREOFFICE_TIMEOUT")); } @Test public void testOverridingExecutorPortNumbers() { - //System test property value can me modified in the pom.xml + //System test property value can be modified in the pom.xml assertEquals(portNumbers, System.getProperty("LIBREOFFICE_PORT_NUMBERS")); } @Test public void testOverridingExecutorTemplateProfileDir() { - //System test property value can me modified in the pom.xml + //System test property value can be modified in the pom.xml assertEquals(templateProfileDir, System.getProperty("LIBREOFFICE_TEMPLATE_PROFILE_DIR")); } @Test public void testOverridingExecutorIsEnabled() { - //System test property value can me modified in the pom.xml + //System test property value can be modified in the pom.xml assertEquals(isEnabled, System.getProperty("LIBREOFFICE_IS_ENABLED")); } @Test public void testInvalidExecutorMaxTasksPerProcess() { - String errorMessage = ""; - try - { - new LibreOfficeTransformer(execPath, "INVALID", timeout, portNumbers, templateProfileDir, isEnabled); - } - catch (IllegalArgumentException e) - { - errorMessage = e.getMessage(); - } - - assertEquals("LibreOfficeTransformer MAX_TASKS_PER_PROCESS must have a numeric value", errorMessage); + testInvalidValue("maxTasksPerProcess", "INVALID", maxTasksPerProcess, + "LibreOfficeTransformer MAX_TASKS_PER_PROCESS must have a numeric value"); } @Test public void testInvalidExecutorTimeout() { - String errorMessage = ""; - try - { - new LibreOfficeTransformer(execPath, maxTasksPerProcess, "INVALID", portNumbers, templateProfileDir, isEnabled); - } - catch (IllegalArgumentException e) - { - errorMessage = e.getMessage(); - } - - assertEquals("LibreOfficeTransformer TIMEOUT must have a numeric value", errorMessage); + testInvalidValue("timeout", "INVALID", timeout, + "LibreOfficeTransformer TIMEOUT must have a numeric value"); } @Test public void testInvalidExecutorPortNumbers() { - String errorMessage = ""; - try - { - new LibreOfficeTransformer(execPath, maxTasksPerProcess, timeout, null, templateProfileDir, isEnabled); - } - catch (IllegalArgumentException e) - { - errorMessage = e.getMessage(); - } - - assertEquals("LibreOfficeTransformer PORT variable cannot be null or empty", errorMessage); + testInvalidValue("portNumbers", null, portNumbers, + "LibreOfficeTransformer PORT variable cannot be null or empty"); } @Test public void testInvalidExecutorIsEnabled() + { + testInvalidValue("isEnabled", "INVALID", isEnabled, + "LibreOfficeTransformer IS_ENABLED variable must be set to true/false"); + } + + private void testInvalidValue(String fieldName, String invalidValue, String validValue, String expectedErrorMessage) { String errorMessage = ""; try { - new LibreOfficeTransformer(execPath, maxTasksPerProcess, timeout, portNumbers, templateProfileDir, "INVALID"); + ReflectionTestUtils.setField(libreOfficeTransformer, fieldName, invalidValue); + ReflectionTestUtils.invokeMethod(libreOfficeTransformer, "createJodConverter"); } catch (IllegalArgumentException e) { errorMessage = e.getMessage(); } + finally + { + ReflectionTestUtils.setField(libreOfficeTransformer, fieldName, validValue); + } - assertEquals("LibreOfficeTransformer IS_ENABLED variable must be set to true/false", errorMessage); + assertEquals(expectedErrorMessage, errorMessage); } } diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java similarity index 96% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java rename to engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java index d366e2c0..d8ba9d0f 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeHttpRequestTest.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.libreoffice; -import org.alfresco.transformer.AbstractHttpRequestTest; +import org.alfresco.transform.base.AbstractHttpRequestTest; import org.springframework.boot.test.context.SpringBootTest; /** diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java similarity index 96% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java rename to engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java index e211729b..e680991d 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java @@ -31,7 +31,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCES import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractQueueTransformServiceIT; +import org.alfresco.transform.base.AbstractQueueTransformServiceIT; import org.springframework.boot.test.context.SpringBootTest; /** diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java similarity index 98% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java rename to engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java index 4513e624..1999831b 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeTransformationIT.java @@ -29,8 +29,8 @@ package org.alfresco.transform.libreoffice; import static java.text.MessageFormat.format; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static org.alfresco.transformer.EngineClient.sendTRequest; -import static org.alfresco.transformer.TestFileInfo.testFile; +import static org.alfresco.transform.base.EngineClient.sendTRequest; +import static org.alfresco.transform.base.TestFileInfo.testFile; import static org.alfresco.transform.common.Mimetype.MIMETYPE_EXCEL; import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_SVG; @@ -71,7 +71,7 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableSet; -import org.alfresco.transformer.TestFileInfo; +import org.alfresco.transform.base.TestFileInfo; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_complete.json b/engines/libreoffice/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_complete.json rename to engines/libreoffice/src/test/resources/engine_config_complete.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_incomplete.json b/engines/libreoffice/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_incomplete.json rename to engines/libreoffice/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_no_transform_options.json b/engines/libreoffice/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_no_transform_options.json rename to engines/libreoffice/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_with_duplicates.json b/engines/libreoffice/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/engine_config_with_duplicates.json rename to engines/libreoffice/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/people.csv b/engines/libreoffice/src/test/resources/people.csv similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/people.csv rename to engines/libreoffice/src/test/resources/people.csv diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.dita b/engines/libreoffice/src/test/resources/quick.dita similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.dita rename to engines/libreoffice/src/test/resources/quick.dita diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.doc b/engines/libreoffice/src/test/resources/quick.doc similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.doc rename to engines/libreoffice/src/test/resources/quick.doc diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.docx b/engines/libreoffice/src/test/resources/quick.docx similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.docx rename to engines/libreoffice/src/test/resources/quick.docx diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.html b/engines/libreoffice/src/test/resources/quick.html similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.html rename to engines/libreoffice/src/test/resources/quick.html diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.odg b/engines/libreoffice/src/test/resources/quick.odg similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.odg rename to engines/libreoffice/src/test/resources/quick.odg diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.odp b/engines/libreoffice/src/test/resources/quick.odp similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.odp rename to engines/libreoffice/src/test/resources/quick.odp diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ods b/engines/libreoffice/src/test/resources/quick.ods similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ods rename to engines/libreoffice/src/test/resources/quick.ods diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.odt b/engines/libreoffice/src/test/resources/quick.odt similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.odt rename to engines/libreoffice/src/test/resources/quick.odt diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.otp b/engines/libreoffice/src/test/resources/quick.otp similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.otp rename to engines/libreoffice/src/test/resources/quick.otp diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.pdf b/engines/libreoffice/src/test/resources/quick.pdf similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.pdf rename to engines/libreoffice/src/test/resources/quick.pdf diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ppsm b/engines/libreoffice/src/test/resources/quick.ppsm similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ppsm rename to engines/libreoffice/src/test/resources/quick.ppsm diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ppsx b/engines/libreoffice/src/test/resources/quick.ppsx similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ppsx rename to engines/libreoffice/src/test/resources/quick.ppsx diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ppt b/engines/libreoffice/src/test/resources/quick.ppt similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.ppt rename to engines/libreoffice/src/test/resources/quick.ppt diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.pptx b/engines/libreoffice/src/test/resources/quick.pptx similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.pptx rename to engines/libreoffice/src/test/resources/quick.pptx diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.stc b/engines/libreoffice/src/test/resources/quick.stc similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.stc rename to engines/libreoffice/src/test/resources/quick.stc diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.sti b/engines/libreoffice/src/test/resources/quick.sti similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.sti rename to engines/libreoffice/src/test/resources/quick.sti diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.stw b/engines/libreoffice/src/test/resources/quick.stw similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.stw rename to engines/libreoffice/src/test/resources/quick.stw diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.sxc b/engines/libreoffice/src/test/resources/quick.sxc similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.sxc rename to engines/libreoffice/src/test/resources/quick.sxc diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.sxi b/engines/libreoffice/src/test/resources/quick.sxi similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.sxi rename to engines/libreoffice/src/test/resources/quick.sxi diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.txt b/engines/libreoffice/src/test/resources/quick.txt similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.txt rename to engines/libreoffice/src/test/resources/quick.txt diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.vdx b/engines/libreoffice/src/test/resources/quick.vdx similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.vdx rename to engines/libreoffice/src/test/resources/quick.vdx diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.vsd b/engines/libreoffice/src/test/resources/quick.vsd similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.vsd rename to engines/libreoffice/src/test/resources/quick.vsd diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.wpd b/engines/libreoffice/src/test/resources/quick.wpd similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.wpd rename to engines/libreoffice/src/test/resources/quick.wpd diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xls b/engines/libreoffice/src/test/resources/quick.xls similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xls rename to engines/libreoffice/src/test/resources/quick.xls diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xlsx b/engines/libreoffice/src/test/resources/quick.xlsx similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xlsx rename to engines/libreoffice/src/test/resources/quick.xlsx diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xltm b/engines/libreoffice/src/test/resources/quick.xltm similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xltm rename to engines/libreoffice/src/test/resources/quick.xltm diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xml b/engines/libreoffice/src/test/resources/quick.xml similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/quick.xml rename to engines/libreoffice/src/test/resources/quick.xml diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/sample.rtf b/engines/libreoffice/src/test/resources/sample.rtf similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/sample.rtf rename to engines/libreoffice/src/test/resources/sample.rtf diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/sample.tsv b/engines/libreoffice/src/test/resources/sample.tsv similarity index 100% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/test/resources/sample.tsv rename to engines/libreoffice/src/test/resources/sample.tsv diff --git a/alfresco-transform-misc/alfresco-transform-misc/.maven-dockerignore b/engines/misc/.maven-dockerignore similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/.maven-dockerignore rename to engines/misc/.maven-dockerignore diff --git a/alfresco-transform-misc/alfresco-transform-misc/Dockerfile b/engines/misc/Dockerfile similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/Dockerfile rename to engines/misc/Dockerfile diff --git a/alfresco-transform-misc/alfresco-transform-misc/LICENSES.md b/engines/misc/LICENSES.md similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/LICENSES.md rename to engines/misc/LICENSES.md diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml b/engines/misc/pom.xml similarity index 87% rename from alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml rename to engines/misc/pom.xml index e6545925..d4113b21 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/pom.xml +++ b/engines/misc/pom.xml @@ -1,18 +1,18 @@ 4.0.0 - alfresco-transform-libreoffice-boot - Alfresco LibreOffice Transformer Spring Boot + alfresco-transform-misc + - Misc - org.alfresco alfresco-transform-core + org.alfresco 2.6.1-SNAPSHOT ../../pom.xml - alfresco/alfresco-libreoffice + alfresco/alfresco-transform-misc quay.io ${project.artifactId} @@ -20,21 +20,73 @@ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} + org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} tests test-jar test + - org.alfresco - alfresco-transform-libreoffice - ${project.version} + org.dom4j + dom4j + + + + + org.htmlparser + htmlparser + 2.1 + + + + + org.apache.commons + commons-compress + + + + + org.apache.pdfbox + pdfbox-tools + 2.0.25 + + + + + org.apache.poi + poi-ooxml + ${dependency.poi.version} + + + org.apache.poi + poi-ooxml-schemas + + + + + org.apache.poi + ooxml-schemas + ${dependency.ooxml-schemas.version} + + + + + com.sun.mail + javax.mail + 1.6.2 + + + + org.junit.jupiter + junit-jupiter-engine + test org.springframework.boot @@ -55,18 +107,6 @@ org.dom4j dom4j - - org.alfresco - alfresco-jodconverter-core - - - org.apache.pdfbox - pdfbox - - - org.apache.commons - commons-lang3 - diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java b/engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java similarity index 94% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java index f24f965f..4de32439 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java +++ b/engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java @@ -63,9 +63,8 @@ public class MiscTransformEngine implements TransformEngine { return COMMUNITY_LICENCE + "This transformer uses libraries from Apache. " + - "See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\\\ 2.0.txt\\n" + - "Additional libraries used:\n" + - "* htmlparser http://htmlparser.sourceforge.net/license.html"; + "See the license at http://www.apache.org/licenses/LICENSE-2.0. or in /Apache\\\\ 2.0.txt\n" + + "This transformer uses htmlparser. See the license at http://htmlparser.sourceforge.net/license.html"; } @Override diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/AppleIWorksContentTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/AppleIWorksContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/AppleIWorksContentTransformer.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/transformers/AppleIWorksContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/EMLTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/EMLTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/EMLTransformer.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/transformers/EMLTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformer.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/OOXMLThumbnailContentTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/OOXMLThumbnailContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/OOXMLThumbnailContentTransformer.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/transformers/OOXMLThumbnailContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/StringExtractingContentTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/StringExtractingContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/StringExtractingContentTransformer.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/transformers/StringExtractingContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformer.java rename to engines/misc/src/main/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/HtmlMetadataExtractor_metadata_extract.properties b/engines/misc/src/main/resources/HtmlMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/HtmlMetadataExtractor_metadata_extract.properties rename to engines/misc/src/main/resources/HtmlMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/RFC822MetadataExtractor_metadata_extract.properties b/engines/misc/src/main/resources/RFC822MetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/RFC822MetadataExtractor_metadata_extract.properties rename to engines/misc/src/main/resources/RFC822MetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/application-default.yaml b/engines/misc/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/application-default.yaml rename to engines/misc/src/main/resources/application-default.yaml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/3rd-party/Apache 2.0.txt b/engines/misc/src/main/resources/licenses/3rd-party/Apache 2.0.txt similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/3rd-party/Apache 2.0.txt rename to engines/misc/src/main/resources/licenses/3rd-party/Apache 2.0.txt diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/misc_engine_config.json b/engines/misc/src/main/resources/misc_engine_config.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/misc_engine_config.json rename to engines/misc/src/main/resources/misc_engine_config.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/quick.html b/engines/misc/src/main/resources/quick.html similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/quick.html rename to engines/misc/src/main/resources/quick.html diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/templates/transformForm.html b/engines/misc/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/main/resources/templates/transformForm.html rename to engines/misc/src/main/resources/templates/transformForm.html diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java similarity index 94% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java index 5e83e721..8dced835 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscControllerTest.java @@ -26,6 +26,21 @@ */ package org.alfresco.transform.misc; +import org.alfresco.transform.base.AbstractTransformControllerTest; +import org.alfresco.transform.client.model.TransformRequest; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.text.PDFTextStripper; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; + +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.nio.file.Files; + import static java.nio.charset.StandardCharsets.UTF_8; import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; @@ -43,31 +58,9 @@ import static org.springframework.http.HttpStatus.OK; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.nio.file.Files; - -import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractTransformerController; -import org.alfresco.transformer.AbstractTransformerControllerTest; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.text.PDFTextStripper; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; - -// Specifying class for @WebMvcTest() will break AIO tests, without specifying it will use all controllers in the application context, -// currently only MiscController.class @WebMvcTest() -public class MiscControllerTest extends AbstractTransformerControllerTest +public class MiscControllerTest extends AbstractTransformControllerTest { - @Autowired - protected AbstractTransformerController controller; - protected final String sourceEncoding = "UTF-8"; protected final String targetEncoding = "UTF-8"; protected final String targetMimetype = MIMETYPE_TEXT_PLAIN; @@ -101,12 +94,6 @@ public class MiscControllerTest extends AbstractTransformerControllerTest { } - @Override - protected AbstractTransformerController getController() - { - return controller; - } - @Override protected void updateTransformRequestWithSpecificOptions(TransformRequest transformRequest) { diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java similarity index 93% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java index a9d7ab4b..a8bcac49 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java @@ -29,12 +29,12 @@ package org.alfresco.transform.misc; import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; import static org.alfresco.transform.common.Mimetype.MIMETYPE_RFC822; import static org.alfresco.transform.common.Mimetype.MIMETYPE_XHTML; -import static org.alfresco.transformer.TestFileInfo.testFile; +import static org.alfresco.transform.base.TestFileInfo.testFile; import java.util.stream.Stream; -import org.alfresco.transformer.AbstractMetadataExtractsIT; -import org.alfresco.transformer.TestFileInfo; +import org.alfresco.transform.base.AbstractMetadataExtractsIT; +import org.alfresco.transform.base.TestFileInfo; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -46,7 +46,6 @@ import org.junit.jupiter.params.provider.MethodSource; */ public class MiscMetadataExtractsIT extends AbstractMetadataExtractsIT { - @ParameterizedTest @MethodSource("engineTransformations") @Override @@ -68,7 +67,6 @@ public class MiscMetadataExtractsIT extends AbstractMetadataExtractsIT // ====================================== testFile(MIMETYPE_RFC822, "eml", "quick.spanish.eml"), testFile(MIMETYPE_HTML, "html", "quick.japanese.html") - ); } } diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java similarity index 94% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java index 4be40772..d870f552 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java @@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractQueueTransformServiceIT; +import org.alfresco.transform.base.AbstractQueueTransformServiceIT; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformerHttpRequestTest.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java similarity index 97% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java index 9dcf6174..adb895e5 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java @@ -54,8 +54,8 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_MEDIAWIKI; import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML; -import static org.alfresco.transformer.EngineClient.sendTRequest; -import static org.alfresco.transformer.TestFileInfo.testFile; +import static org.alfresco.transform.base.EngineClient.sendTRequest; +import static org.alfresco.transform.base.TestFileInfo.testFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.springframework.http.HttpStatus.OK; @@ -63,8 +63,8 @@ import static org.springframework.http.HttpStatus.OK; import java.util.Map; import java.util.stream.Stream; -import org.alfresco.transformer.SourceTarget; -import org.alfresco.transformer.TestFileInfo; +import org.alfresco.transform.base.SourceTarget; +import org.alfresco.transform.base.TestFileInfo; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformerTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformerTest.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformerTest.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/transformers/HtmlParserContentTransformerTest.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformerTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformerTest.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformerTest.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/transformers/TextToPdfContentTransformerTest.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/Sample.java.txt b/engines/misc/src/test/resources/Sample.java.txt similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/Sample.java.txt rename to engines/misc/src/test/resources/Sample.java.txt diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/misc_engine_config.json b/engines/misc/src/test/resources/misc_engine_config.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/misc_engine_config.json rename to engines/misc/src/test/resources/misc_engine_config.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/people.csv b/engines/misc/src/test/resources/people.csv similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/people.csv rename to engines/misc/src/test/resources/people.csv diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.alternative.eml b/engines/misc/src/test/resources/quick.alternative.eml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.alternative.eml rename to engines/misc/src/test/resources/quick.alternative.eml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.attachment.eml b/engines/misc/src/test/resources/quick.attachment.eml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.attachment.eml rename to engines/misc/src/test/resources/quick.attachment.eml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.docx b/engines/misc/src/test/resources/quick.docx similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.docx rename to engines/misc/src/test/resources/quick.docx diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.eml b/engines/misc/src/test/resources/quick.eml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.eml rename to engines/misc/src/test/resources/quick.eml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.eml_metadata.json b/engines/misc/src/test/resources/quick.eml_metadata.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.eml_metadata.json rename to engines/misc/src/test/resources/quick.eml_metadata.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.html b/engines/misc/src/test/resources/quick.html similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.html rename to engines/misc/src/test/resources/quick.html diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.htmlChars.eml b/engines/misc/src/test/resources/quick.htmlChars.eml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.htmlChars.eml rename to engines/misc/src/test/resources/quick.htmlChars.eml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.html_metadata.json b/engines/misc/src/test/resources/quick.html_metadata.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.html_metadata.json rename to engines/misc/src/test/resources/quick.html_metadata.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.japanese.html b/engines/misc/src/test/resources/quick.japanese.html similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.japanese.html rename to engines/misc/src/test/resources/quick.japanese.html diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.japanese.html_metadata.json b/engines/misc/src/test/resources/quick.japanese.html_metadata.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.japanese.html_metadata.json rename to engines/misc/src/test/resources/quick.japanese.html_metadata.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.key b/engines/misc/src/test/resources/quick.key similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.key rename to engines/misc/src/test/resources/quick.key diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.nested.alternative.eml b/engines/misc/src/test/resources/quick.nested.alternative.eml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.nested.alternative.eml rename to engines/misc/src/test/resources/quick.nested.alternative.eml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.numbers b/engines/misc/src/test/resources/quick.numbers similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.numbers rename to engines/misc/src/test/resources/quick.numbers diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.pages b/engines/misc/src/test/resources/quick.pages similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.pages rename to engines/misc/src/test/resources/quick.pages diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.spanish.eml b/engines/misc/src/test/resources/quick.spanish.eml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.spanish.eml rename to engines/misc/src/test/resources/quick.spanish.eml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.spanish.eml_metadata.json b/engines/misc/src/test/resources/quick.spanish.eml_metadata.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.spanish.eml_metadata.json rename to engines/misc/src/test/resources/quick.spanish.eml_metadata.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.xhtml.alf b/engines/misc/src/test/resources/quick.xhtml.alf similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.xhtml.alf rename to engines/misc/src/test/resources/quick.xhtml.alf diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.xhtml.alf_metadata.json b/engines/misc/src/test/resources/quick.xhtml.alf_metadata.json similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.xhtml.alf_metadata.json rename to engines/misc/src/test/resources/quick.xhtml.alf_metadata.json diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.xml b/engines/misc/src/test/resources/quick.xml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick.xml rename to engines/misc/src/test/resources/quick.xml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick2.txt b/engines/misc/src/test/resources/quick2.txt similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quick2.txt rename to engines/misc/src/test/resources/quick2.txt diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quickConcept.dita b/engines/misc/src/test/resources/quickConcept.dita similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/quickConcept.dita rename to engines/misc/src/test/resources/quickConcept.dita diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.etx b/engines/misc/src/test/resources/sample.etx similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.etx rename to engines/misc/src/test/resources/sample.etx diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.ics b/engines/misc/src/test/resources/sample.ics similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.ics rename to engines/misc/src/test/resources/sample.ics diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.jsp.txt b/engines/misc/src/test/resources/sample.jsp.txt similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.jsp.txt rename to engines/misc/src/test/resources/sample.jsp.txt diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.md b/engines/misc/src/test/resources/sample.md similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.md rename to engines/misc/src/test/resources/sample.md diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.mw b/engines/misc/src/test/resources/sample.mw similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.mw rename to engines/misc/src/test/resources/sample.mw diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.rtf b/engines/misc/src/test/resources/sample.rtf similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.rtf rename to engines/misc/src/test/resources/sample.rtf diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.sgml b/engines/misc/src/test/resources/sample.sgml similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.sgml rename to engines/misc/src/test/resources/sample.sgml diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.tsv b/engines/misc/src/test/resources/sample.tsv similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/sample.tsv rename to engines/misc/src/test/resources/sample.tsv diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/script.js b/engines/misc/src/test/resources/script.js similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/script.js rename to engines/misc/src/test/resources/script.js diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/resources/style.css b/engines/misc/src/test/resources/style.css similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc/src/test/resources/style.css rename to engines/misc/src/test/resources/style.css diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/.maven-dockerignore b/engines/pdfrenderer/.maven-dockerignore similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/.maven-dockerignore rename to engines/pdfrenderer/.maven-dockerignore diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/Dockerfile b/engines/pdfrenderer/Dockerfile similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/Dockerfile rename to engines/pdfrenderer/Dockerfile diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/LICENSES.md b/engines/pdfrenderer/LICENSES.md similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/LICENSES.md rename to engines/pdfrenderer/LICENSES.md diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml b/engines/pdfrenderer/pom.xml similarity index 96% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml rename to engines/pdfrenderer/pom.xml index bacc8c7e..31372790 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/pom.xml +++ b/engines/pdfrenderer/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - alfresco-transform-pdf-renderer-boot - Alfresco Pdf Renderer Spring Boot + alfresco-transform-pdf-renderer + - PdfRenderer org.alfresco @@ -20,22 +20,17 @@ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} tests test-jar test - - org.alfresco - alfresco-transform-pdf-renderer - ${project.version} - org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/PdfRendererOptionsBuilder.java b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererOptionsBuilder.java similarity index 96% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/PdfRendererOptionsBuilder.java rename to engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererOptionsBuilder.java index 5df54811..e3631d6e 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/PdfRendererOptionsBuilder.java +++ b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererOptionsBuilder.java @@ -26,8 +26,8 @@ */ package org.alfresco.transform.pdfrenderer; -import static org.alfresco.transformer.util.Util.stringToBoolean; -import static org.alfresco.transformer.util.Util.stringToInteger; +import static org.alfresco.transform.base.util.Util.stringToBoolean; +import static org.alfresco.transform.base.util.Util.stringToInteger; import java.util.StringJoiner; diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/PdfRendererTransformEngine.java b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererTransformEngine.java similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/PdfRendererTransformEngine.java rename to engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererTransformEngine.java diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/transformers/PdfRendererTransformer.java b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/transformers/PdfRendererTransformer.java similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transform/pdfRenderer/transformers/PdfRendererTransformer.java rename to engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/transformers/PdfRendererTransformer.java diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/application-default.yaml b/engines/pdfrenderer/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/application-default.yaml rename to engines/pdfrenderer/src/main/resources/application-default.yaml diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/3rd-party/pdfium.txt b/engines/pdfrenderer/src/main/resources/licenses/3rd-party/pdfium.txt similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/3rd-party/pdfium.txt rename to engines/pdfrenderer/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/pdfrenderer_engine_config.json b/engines/pdfrenderer/src/main/resources/pdfrenderer_engine_config.json similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/pdfrenderer_engine_config.json rename to engines/pdfrenderer/src/main/resources/pdfrenderer_engine_config.json diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/quick.pdf b/engines/pdfrenderer/src/main/resources/quick.pdf similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/quick.pdf rename to engines/pdfrenderer/src/main/resources/quick.pdf diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/templates/transformForm.html b/engines/pdfrenderer/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/resources/templates/transformForm.html rename to engines/pdfrenderer/src/main/resources/templates/transformForm.html diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java similarity index 92% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java rename to engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java index 1ef2fe1f..a6b3eba3 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererControllerTest.java @@ -59,13 +59,13 @@ import javax.annotation.PostConstruct; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractTransformerController; -import org.alfresco.transformer.AbstractTransformerControllerTest; -import org.alfresco.transform.pdfRenderer.transformers.PdfRendererCommandExecutor; -import org.alfresco.transformer.executors.RuntimeExec; -import org.alfresco.transformer.executors.RuntimeExec.ExecutionResult; -import org.alfresco.transformer.model.FileRefEntity; -import org.alfresco.transformer.model.FileRefResponse; +import org.alfresco.transform.base.TransformController; +import org.alfresco.transform.base.AbstractTransformControllerTest; +import org.alfresco.transform.pdfrenderer.transformers.PdfRendererTransformer; +import org.alfresco.transform.base.executors.RuntimeExec; +import org.alfresco.transform.base.executors.RuntimeExec.ExecutionResult; +import org.alfresco.transform.base.model.FileRefEntity; +import org.alfresco.transform.base.model.FileRefResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -83,14 +83,11 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; /** * Test the AlfrescoPdfRendererController without a server. - * Super class includes tests for the AbstractTransformerController. + * Super class includes tests for the TransformController. */ -// Specifying class for @WebMvcTest() will break AIO tests, without specifying it will use all controllers in the application context, -// currently only AlfrescoPdfRendererController.class @WebMvcTest() -public class AlfrescoPdfRendererControllerTest extends AbstractTransformerControllerTest +public class AlfrescoPdfRendererControllerTest extends AbstractTransformControllerTest { - private static final String ENGINE_CONFIG_NAME = "pdfrenderer_engine_config.json"; @Mock @@ -105,17 +102,14 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro @Value("${transform.core.pdfrenderer.exe}") protected String execPath; - protected PdfRendererCommandExecutor commandExecutor; + protected PdfRendererTransformer commandExecutor; @PostConstruct private void init() { - commandExecutor = new PdfRendererCommandExecutor(execPath); + commandExecutor = new PdfRendererTransformer(); } - @Autowired - protected AbstractTransformerController controller; - @BeforeEach public void before() throws IOException { @@ -212,12 +206,6 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro when(mockExecutionResult.getStdOut()).thenReturn("STDOUT"); } - @Override - protected AbstractTransformerController getController() - { - return controller; - } - @Test public void optionsTest() throws Exception { diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java similarity index 96% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java rename to engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java index fd8a46a9..0a97a767 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererHttpRequestTest.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.pdfrenderer; -import org.alfresco.transformer.AbstractHttpRequestTest; +import org.alfresco.transform.base.AbstractHttpRequestTest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java similarity index 96% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java rename to engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java index 7f96a457..d5a42590 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java @@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transformer.AbstractQueueTransformServiceIT; +import org.alfresco.transform.base.AbstractQueueTransformServiceIT; import org.springframework.boot.test.context.SpringBootTest; /** diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java similarity index 94% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java rename to engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java index de90d174..5adc3f34 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererTransformationIT.java @@ -29,8 +29,8 @@ package org.alfresco.transform.pdfrenderer; import static java.text.MessageFormat.format; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static org.alfresco.transformer.EngineClient.sendTRequest; -import static org.alfresco.transformer.TestFileInfo.testFile; +import static org.alfresco.transform.base.EngineClient.sendTRequest; +import static org.alfresco.transform.base.TestFileInfo.testFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.springframework.http.HttpStatus.OK; @@ -38,7 +38,7 @@ import static org.springframework.http.HttpStatus.OK; import java.util.Map; import java.util.stream.Stream; -import org.alfresco.transformer.TestFileInfo; +import org.alfresco.transform.base.TestFileInfo; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; diff --git a/alfresco-transformer-base/src/test/resources/engine_config_complete.json b/engines/pdfrenderer/src/test/resources/engine_config_complete.json similarity index 100% rename from alfresco-transformer-base/src/test/resources/engine_config_complete.json rename to engines/pdfrenderer/src/test/resources/engine_config_complete.json diff --git a/alfresco-transformer-base/src/test/resources/engine_config_incomplete.json b/engines/pdfrenderer/src/test/resources/engine_config_incomplete.json similarity index 100% rename from alfresco-transformer-base/src/test/resources/engine_config_incomplete.json rename to engines/pdfrenderer/src/test/resources/engine_config_incomplete.json diff --git a/alfresco-transformer-base/src/test/resources/engine_config_no_transform_options.json b/engines/pdfrenderer/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from alfresco-transformer-base/src/test/resources/engine_config_no_transform_options.json rename to engines/pdfrenderer/src/test/resources/engine_config_no_transform_options.json diff --git a/alfresco-transformer-base/src/test/resources/engine_config_with_duplicates.json b/engines/pdfrenderer/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from alfresco-transformer-base/src/test/resources/engine_config_with_duplicates.json rename to engines/pdfrenderer/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/pdfrenderer_engine_config.json b/engines/pdfrenderer/src/test/resources/pdfrenderer_engine_config.json similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/pdfrenderer_engine_config.json rename to engines/pdfrenderer/src/test/resources/pdfrenderer_engine_config.json diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quick.pdf b/engines/pdfrenderer/src/test/resources/quick.pdf similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quick.pdf rename to engines/pdfrenderer/src/test/resources/quick.pdf diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quick.png b/engines/pdfrenderer/src/test/resources/quick.png similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quick.png rename to engines/pdfrenderer/src/test/resources/quick.png diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quickCS3.ai b/engines/pdfrenderer/src/test/resources/quickCS3.ai similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quickCS3.ai rename to engines/pdfrenderer/src/test/resources/quickCS3.ai diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quickCS5.ai b/engines/pdfrenderer/src/test/resources/quickCS5.ai similarity index 100% rename from alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/test/resources/quickCS5.ai rename to engines/pdfrenderer/src/test/resources/quickCS5.ai diff --git a/alfresco-transform-tika/alfresco-transform-tika/.maven-dockerignore b/engines/tika/.maven-dockerignore similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/.maven-dockerignore rename to engines/tika/.maven-dockerignore diff --git a/alfresco-transform-tika/alfresco-transform-tika/Dockerfile b/engines/tika/Dockerfile similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/Dockerfile rename to engines/tika/Dockerfile diff --git a/alfresco-transform-tika/alfresco-transform-tika/LICENSES.md b/engines/tika/LICENSES.md similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/LICENSES.md rename to engines/tika/LICENSES.md diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml b/engines/tika/pom.xml similarity index 96% rename from alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml rename to engines/tika/pom.xml index 5f62c9f0..4e971952 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/pom.xml +++ b/engines/tika/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - alfresco-transform-tika-boot - Alfresco Tika Transformer Spring Boot + alfresco-transform-tika + - Tika - org.alfresco alfresco-transform-core + org.alfresco 2.6.1-SNAPSHOT ../../pom.xml @@ -20,22 +20,17 @@ org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} org.alfresco - alfresco-t-engine-base + alfresco-base-t-engine ${project.version} tests test-jar test - - org.alfresco - alfresco-transform-tika - ${project.version} - org.springframework.boot spring-boot-starter-thymeleaf @@ -135,10 +130,22 @@ org.apache.pdfbox pdfbox + org.apache.pdfbox pdfbox-tools + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-junit-jupiter + test + diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java b/engines/tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/AbstractTikaMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/AbstractTikaMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/AbstractTikaMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/AbstractTikaMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/DWGMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/DWGMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/DWGMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/DWGMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MP3MetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MP3MetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MP3MetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MP3MetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MailMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MailMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MailMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/MailMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OfficeMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OfficeMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OfficeMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OfficeMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OpenDocumentMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OpenDocumentMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OpenDocumentMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/OpenDocumentMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PdfBoxMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PdfBoxMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PdfBoxMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PdfBoxMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PoiMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PoiMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PoiMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/PoiMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAudioMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAudioMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAudioMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAudioMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAutoMetadataExtractor.java b/engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAutoMetadataExtractor.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAutoMetadataExtractor.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/metadataExtractors/TikaAutoMetadataExtractor.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/parsers/ExifToolParser.java b/engines/tika/src/main/java/org/alfresco/transform/tika/parsers/ExifToolParser.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/parsers/ExifToolParser.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/parsers/ExifToolParser.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/parsers/TikaOfficeDetectParser.java b/engines/tika/src/main/java/org/alfresco/transform/tika/parsers/TikaOfficeDetectParser.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/parsers/TikaOfficeDetectParser.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/parsers/TikaOfficeDetectParser.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/ArchiveTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/ArchiveTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/ArchiveTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/ArchiveTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/GenericTikaTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/GenericTikaTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/GenericTikaTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/GenericTikaTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/OOXMLTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/OOXMLTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/OOXMLTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/OOXMLTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/OfficeTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/OfficeTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/OfficeTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/OfficeTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/OutlookMsgTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/OutlookMsgTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/OutlookMsgTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/OutlookMsgTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/PdfBoxTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/PdfBoxTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/PdfBoxTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/PdfBoxTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/PoiTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/PoiTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/PoiTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/PoiTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/TextMiningTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/TextMiningTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/TextMiningTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/TextMiningTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/Tika.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/TikaAutoTransformer.java b/engines/tika/src/main/java/org/alfresco/transform/tika/transformers/TikaAutoTransformer.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transform/tika/transformers/TikaAutoTransformer.java rename to engines/tika/src/main/java/org/alfresco/transform/tika/transformers/TikaAutoTransformer.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/DWGMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/DWGMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/DWGMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/DWGMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/IPTCMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/MP3MetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/MP3MetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/MP3MetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/MP3MetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/MailMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/MailMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/MailMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/MailMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/OfficeMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/OfficeMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/OfficeMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/OfficeMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/OpenDocumentMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/OpenDocumentMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/OpenDocumentMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/OpenDocumentMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/PdfBoxMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/PdfBoxMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/PdfBoxMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/PdfBoxMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/PoiMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/PoiMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/PoiMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/PoiMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/TikaAudioMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/TikaAudioMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/TikaAudioMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/TikaAudioMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/TikaAutoMetadataExtractor_metadata_extract.properties b/engines/tika/src/main/resources/TikaAutoMetadataExtractor_metadata_extract.properties similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/TikaAutoMetadataExtractor_metadata_extract.properties rename to engines/tika/src/main/resources/TikaAutoMetadataExtractor_metadata_extract.properties diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/application-default.yaml b/engines/tika/src/main/resources/application-default.yaml similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/application-default.yaml rename to engines/tika/src/main/resources/application-default.yaml diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/3rd-party/Apache 2.0.txt b/engines/tika/src/main/resources/licenses/3rd-party/Apache 2.0.txt similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/3rd-party/Apache 2.0.txt rename to engines/tika/src/main/resources/licenses/3rd-party/Apache 2.0.txt diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/3rd-party/Perl-Artistic-license.txt b/engines/tika/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/3rd-party/Perl-Artistic-license.txt rename to engines/tika/src/main/resources/licenses/3rd-party/Perl-Artistic-license.txt diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/parsers/external/config/exiftool-parser.xml b/engines/tika/src/main/resources/parsers/external/config/exiftool-parser.xml similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/parsers/external/config/exiftool-parser.xml rename to engines/tika/src/main/resources/parsers/external/config/exiftool-parser.xml diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/quick.pdf b/engines/tika/src/main/resources/quick.pdf similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/quick.pdf rename to engines/tika/src/main/resources/quick.pdf diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/templates/transformForm.html b/engines/tika/src/main/resources/templates/transformForm.html similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/templates/transformForm.html rename to engines/tika/src/main/resources/templates/transformForm.html diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika-config.xml b/engines/tika/src/main/resources/tika-config.xml similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika-config.xml rename to engines/tika/src/main/resources/tika-config.xml diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika_engine_config.json b/engines/tika/src/main/resources/tika_engine_config.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/main/resources/tika_engine_config.json rename to engines/tika/src/main/resources/tika_engine_config.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java similarity index 97% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java index 64b82d6a..62d26a3c 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaControllerTest.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.tika; -import org.alfresco.transform.base.AbstractTransformerControllerTest; +import org.alfresco.transform.base.AbstractTransformControllerTest; import org.alfresco.transform.base.TransformController; import org.alfresco.transform.base.executors.RuntimeExec; import org.alfresco.transform.base.model.FileRefEntity; @@ -51,6 +51,7 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; @@ -112,18 +113,14 @@ import static org.springframework.http.HttpStatus.OK; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.http.MediaType.APPLICATION_PDF_VALUE; import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.util.StringUtils.getFilenameExtension; /** * Test the TikaController without a server. - * Super class includes tests for the AbstractTransformerController. + * Super class includes tests for the TransformController. */ -// Specifying class for @WebMvcTest() will break AIO tests, without specifying it will use all controllers in the application context, -// currently only TikaController.class @WebMvcTest() -public class TikaControllerTest extends AbstractTransformerControllerTest +public class TikaControllerTest extends AbstractTransformControllerTest { private static final String ENGINE_CONFIG_NAME = "tika_engine_config.json"; private static final String EXPECTED_XHTML_CONTENT_CONTAINS = "

The quick brown fox jumps over the lazy dog

"; diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaHttpRequestTest.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java similarity index 99% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java index 61068b72..669ff3b7 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTransformationIT.java @@ -38,6 +38,7 @@ import java.util.stream.Stream; import com.google.common.collect.ImmutableMap; +import org.alfresco.transform.base.EngineClient; import org.apache.commons.lang3.tuple.Triple; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractorTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractorTest.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractorTest.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/metadataExtractors/IPTCMetadataExtractorTest.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/parsers/ExifToolParserTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/parsers/ExifToolParserTest.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/parsers/ExifToolParserTest.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/parsers/ExifToolParserTest.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/transformers/GenericTikaTransformerTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/transformers/GenericTikaTransformerTest.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/java/org/alfresco/transform/tika/transformers/GenericTikaTransformerTest.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/transformers/GenericTikaTransformerTest.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW b/engines/tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW rename to engines/tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW_metadata.json b/engines/tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW_metadata.json rename to engines/tika/src/test/resources/20140614_163822_Photogrpahy_Class.ARW_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140629_145035_Flower.RW2 b/engines/tika/src/test/resources/20140629_145035_Flower.RW2 similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140629_145035_Flower.RW2 rename to engines/tika/src/test/resources/20140629_145035_Flower.RW2 diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140629_145035_Flower.RW2_metadata.json b/engines/tika/src/test/resources/20140629_145035_Flower.RW2_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20140629_145035_Flower.RW2_metadata.json rename to engines/tika/src/test/resources/20140629_145035_Flower.RW2_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20141227_134519_Palace.CR2 b/engines/tika/src/test/resources/20141227_134519_Palace.CR2 similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20141227_134519_Palace.CR2 rename to engines/tika/src/test/resources/20141227_134519_Palace.CR2 diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20141227_134519_Palace.CR2_metadata.json b/engines/tika/src/test/resources/20141227_134519_Palace.CR2_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20141227_134519_Palace.CR2_metadata.json rename to engines/tika/src/test/resources/20141227_134519_Palace.CR2_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20150408_074941_Bush.NEF b/engines/tika/src/test/resources/20150408_074941_Bush.NEF similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20150408_074941_Bush.NEF rename to engines/tika/src/test/resources/20150408_074941_Bush.NEF diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20150408_074941_Bush.NEF_metadata.json b/engines/tika/src/test/resources/20150408_074941_Bush.NEF_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20150408_074941_Bush.NEF_metadata.json rename to engines/tika/src/test/resources/20150408_074941_Bush.NEF_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20160502_190928_London_Underground.RAF b/engines/tika/src/test/resources/20160502_190928_London_Underground.RAF similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20160502_190928_London_Underground.RAF rename to engines/tika/src/test/resources/20160502_190928_London_Underground.RAF diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20160502_190928_London_Underground.RAF_metadata.json b/engines/tika/src/test/resources/20160502_190928_London_Underground.RAF_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/20160502_190928_London_Underground.RAF_metadata.json rename to engines/tika/src/test/resources/20160502_190928_London_Underground.RAF_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/dmsu1332-reproduced.xlsx b/engines/tika/src/test/resources/dmsu1332-reproduced.xlsx similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/dmsu1332-reproduced.xlsx rename to engines/tika/src/test/resources/dmsu1332-reproduced.xlsx diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/dmsu1332-reproduced.xlsx_metadata.json b/engines/tika/src/test/resources/dmsu1332-reproduced.xlsx_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/dmsu1332-reproduced.xlsx_metadata.json rename to engines/tika/src/test/resources/dmsu1332-reproduced.xlsx_metadata.json diff --git a/t-engine-base/src/test/resources/engine_config_complete.json b/engines/tika/src/test/resources/engine_config_complete.json similarity index 100% rename from t-engine-base/src/test/resources/engine_config_complete.json rename to engines/tika/src/test/resources/engine_config_complete.json diff --git a/t-engine-base/src/test/resources/engine_config_incomplete.json b/engines/tika/src/test/resources/engine_config_incomplete.json similarity index 100% rename from t-engine-base/src/test/resources/engine_config_incomplete.json rename to engines/tika/src/test/resources/engine_config_incomplete.json diff --git a/t-engine-base/src/test/resources/engine_config_no_transform_options.json b/engines/tika/src/test/resources/engine_config_no_transform_options.json similarity index 100% rename from t-engine-base/src/test/resources/engine_config_no_transform_options.json rename to engines/tika/src/test/resources/engine_config_no_transform_options.json diff --git a/t-engine-base/src/test/resources/engine_config_with_duplicates.json b/engines/tika/src/test/resources/engine_config_with_duplicates.json similarity index 100% rename from t-engine-base/src/test/resources/engine_config_with_duplicates.json rename to engines/tika/src/test/resources/engine_config_with_duplicates.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/problemFootnotes2.docx b/engines/tika/src/test/resources/problemFootnotes2.docx similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/problemFootnotes2.docx rename to engines/tika/src/test/resources/problemFootnotes2.docx diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3g2 b/engines/tika/src/test/resources/quick.3g2 similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3g2 rename to engines/tika/src/test/resources/quick.3g2 diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3g2_metadata.json b/engines/tika/src/test/resources/quick.3g2_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3g2_metadata.json rename to engines/tika/src/test/resources/quick.3g2_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3gp b/engines/tika/src/test/resources/quick.3gp similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3gp rename to engines/tika/src/test/resources/quick.3gp diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3gp_metadata.json b/engines/tika/src/test/resources/quick.3gp_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.3gp_metadata.json rename to engines/tika/src/test/resources/quick.3gp_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ai b/engines/tika/src/test/resources/quick.ai similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ai rename to engines/tika/src/test/resources/quick.ai diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ai_metadata.json b/engines/tika/src/test/resources/quick.ai_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ai_metadata.json rename to engines/tika/src/test/resources/quick.ai_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.bmp b/engines/tika/src/test/resources/quick.bmp similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.bmp rename to engines/tika/src/test/resources/quick.bmp diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.bmp_metadata.json b/engines/tika/src/test/resources/quick.bmp_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.bmp_metadata.json rename to engines/tika/src/test/resources/quick.bmp_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.csv b/engines/tika/src/test/resources/quick.csv similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.csv rename to engines/tika/src/test/resources/quick.csv diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.doc b/engines/tika/src/test/resources/quick.doc similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.doc rename to engines/tika/src/test/resources/quick.doc diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.doc_metadata.json b/engines/tika/src/test/resources/quick.doc_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.doc_metadata.json rename to engines/tika/src/test/resources/quick.doc_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.docx b/engines/tika/src/test/resources/quick.docx similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.docx rename to engines/tika/src/test/resources/quick.docx diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.docx_metadata.json b/engines/tika/src/test/resources/quick.docx_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.docx_metadata.json rename to engines/tika/src/test/resources/quick.docx_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.flv b/engines/tika/src/test/resources/quick.flv similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.flv rename to engines/tika/src/test/resources/quick.flv diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.flv_metadata.json b/engines/tika/src/test/resources/quick.flv_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.flv_metadata.json rename to engines/tika/src/test/resources/quick.flv_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.gif b/engines/tika/src/test/resources/quick.gif similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.gif rename to engines/tika/src/test/resources/quick.gif diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.gif_metadata.json b/engines/tika/src/test/resources/quick.gif_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.gif_metadata.json rename to engines/tika/src/test/resources/quick.gif_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.html b/engines/tika/src/test/resources/quick.html similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.html rename to engines/tika/src/test/resources/quick.html diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.jar b/engines/tika/src/test/resources/quick.jar similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.jar rename to engines/tika/src/test/resources/quick.jar diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.java b/engines/tika/src/test/resources/quick.java similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.java rename to engines/tika/src/test/resources/quick.java diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.jpg b/engines/tika/src/test/resources/quick.jpg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.jpg rename to engines/tika/src/test/resources/quick.jpg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.jpg_metadata.json b/engines/tika/src/test/resources/quick.jpg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.jpg_metadata.json rename to engines/tika/src/test/resources/quick.jpg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.key b/engines/tika/src/test/resources/quick.key similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.key rename to engines/tika/src/test/resources/quick.key diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.key_metadata.json b/engines/tika/src/test/resources/quick.key_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.key_metadata.json rename to engines/tika/src/test/resources/quick.key_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4a b/engines/tika/src/test/resources/quick.m4a similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4a rename to engines/tika/src/test/resources/quick.m4a diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4a_metadata.json b/engines/tika/src/test/resources/quick.m4a_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4a_metadata.json rename to engines/tika/src/test/resources/quick.m4a_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4v b/engines/tika/src/test/resources/quick.m4v similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4v rename to engines/tika/src/test/resources/quick.m4v diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4v_metadata.json b/engines/tika/src/test/resources/quick.m4v_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.m4v_metadata.json rename to engines/tika/src/test/resources/quick.m4v_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mov b/engines/tika/src/test/resources/quick.mov similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mov rename to engines/tika/src/test/resources/quick.mov diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mov_metadata.json b/engines/tika/src/test/resources/quick.mov_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mov_metadata.json rename to engines/tika/src/test/resources/quick.mov_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp3 b/engines/tika/src/test/resources/quick.mp3 similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp3 rename to engines/tika/src/test/resources/quick.mp3 diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp3_metadata.json b/engines/tika/src/test/resources/quick.mp3_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp3_metadata.json rename to engines/tika/src/test/resources/quick.mp3_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp4 b/engines/tika/src/test/resources/quick.mp4 similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp4 rename to engines/tika/src/test/resources/quick.mp4 diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp4_metadata.json b/engines/tika/src/test/resources/quick.mp4_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.mp4_metadata.json rename to engines/tika/src/test/resources/quick.mp4_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.msg b/engines/tika/src/test/resources/quick.msg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.msg rename to engines/tika/src/test/resources/quick.msg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.msg_metadata.json b/engines/tika/src/test/resources/quick.msg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.msg_metadata.json rename to engines/tika/src/test/resources/quick.msg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.numbers b/engines/tika/src/test/resources/quick.numbers similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.numbers rename to engines/tika/src/test/resources/quick.numbers diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.numbers_metadata.json b/engines/tika/src/test/resources/quick.numbers_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.numbers_metadata.json rename to engines/tika/src/test/resources/quick.numbers_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odf b/engines/tika/src/test/resources/quick.odf similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odf rename to engines/tika/src/test/resources/quick.odf diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odf_metadata.json b/engines/tika/src/test/resources/quick.odf_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odf_metadata.json rename to engines/tika/src/test/resources/quick.odf_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odg b/engines/tika/src/test/resources/quick.odg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odg rename to engines/tika/src/test/resources/quick.odg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odg_metadata.json b/engines/tika/src/test/resources/quick.odg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odg_metadata.json rename to engines/tika/src/test/resources/quick.odg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odp b/engines/tika/src/test/resources/quick.odp similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odp rename to engines/tika/src/test/resources/quick.odp diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odp_metadata.json b/engines/tika/src/test/resources/quick.odp_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odp_metadata.json rename to engines/tika/src/test/resources/quick.odp_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ods b/engines/tika/src/test/resources/quick.ods similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ods rename to engines/tika/src/test/resources/quick.ods diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ods_metadata.json b/engines/tika/src/test/resources/quick.ods_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ods_metadata.json rename to engines/tika/src/test/resources/quick.ods_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odt b/engines/tika/src/test/resources/quick.odt similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odt rename to engines/tika/src/test/resources/quick.odt diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odt_metadata.json b/engines/tika/src/test/resources/quick.odt_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.odt_metadata.json rename to engines/tika/src/test/resources/quick.odt_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ogg b/engines/tika/src/test/resources/quick.ogg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ogg rename to engines/tika/src/test/resources/quick.ogg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ogg_metadata.json b/engines/tika/src/test/resources/quick.ogg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ogg_metadata.json rename to engines/tika/src/test/resources/quick.ogg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ogv b/engines/tika/src/test/resources/quick.ogv similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ogv rename to engines/tika/src/test/resources/quick.ogv diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otg b/engines/tika/src/test/resources/quick.otg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otg rename to engines/tika/src/test/resources/quick.otg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otg_metadata.json b/engines/tika/src/test/resources/quick.otg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otg_metadata.json rename to engines/tika/src/test/resources/quick.otg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otp b/engines/tika/src/test/resources/quick.otp similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otp rename to engines/tika/src/test/resources/quick.otp diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otp_metadata.json b/engines/tika/src/test/resources/quick.otp_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.otp_metadata.json rename to engines/tika/src/test/resources/quick.otp_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ots b/engines/tika/src/test/resources/quick.ots similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ots rename to engines/tika/src/test/resources/quick.ots diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ots_metadata.json b/engines/tika/src/test/resources/quick.ots_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ots_metadata.json rename to engines/tika/src/test/resources/quick.ots_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ott b/engines/tika/src/test/resources/quick.ott similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ott rename to engines/tika/src/test/resources/quick.ott diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ott_metadata.json b/engines/tika/src/test/resources/quick.ott_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ott_metadata.json rename to engines/tika/src/test/resources/quick.ott_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pages b/engines/tika/src/test/resources/quick.pages similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pages rename to engines/tika/src/test/resources/quick.pages diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pages_metadata.json b/engines/tika/src/test/resources/quick.pages_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pages_metadata.json rename to engines/tika/src/test/resources/quick.pages_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pdf b/engines/tika/src/test/resources/quick.pdf similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pdf rename to engines/tika/src/test/resources/quick.pdf diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pdf_metadata.json b/engines/tika/src/test/resources/quick.pdf_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pdf_metadata.json rename to engines/tika/src/test/resources/quick.pdf_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.png b/engines/tika/src/test/resources/quick.png similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.png rename to engines/tika/src/test/resources/quick.png diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.png_metadata.json b/engines/tika/src/test/resources/quick.png_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.png_metadata.json rename to engines/tika/src/test/resources/quick.png_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ppt b/engines/tika/src/test/resources/quick.ppt similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ppt rename to engines/tika/src/test/resources/quick.ppt diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ppt_metadata.json b/engines/tika/src/test/resources/quick.ppt_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.ppt_metadata.json rename to engines/tika/src/test/resources/quick.ppt_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pptx b/engines/tika/src/test/resources/quick.pptx similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pptx rename to engines/tika/src/test/resources/quick.pptx diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pptx_metadata.json b/engines/tika/src/test/resources/quick.pptx_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.pptx_metadata.json rename to engines/tika/src/test/resources/quick.pptx_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.rar b/engines/tika/src/test/resources/quick.rar similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.rar rename to engines/tika/src/test/resources/quick.rar diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.sxw b/engines/tika/src/test/resources/quick.sxw similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.sxw rename to engines/tika/src/test/resources/quick.sxw diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.sxw_metadata.json b/engines/tika/src/test/resources/quick.sxw_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.sxw_metadata.json rename to engines/tika/src/test/resources/quick.sxw_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tar b/engines/tika/src/test/resources/quick.tar similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tar rename to engines/tika/src/test/resources/quick.tar diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tar.gz b/engines/tika/src/test/resources/quick.tar.gz similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tar.gz rename to engines/tika/src/test/resources/quick.tar.gz diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tar_metadata.json b/engines/tika/src/test/resources/quick.tar_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tar_metadata.json rename to engines/tika/src/test/resources/quick.tar_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tiff b/engines/tika/src/test/resources/quick.tiff similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tiff rename to engines/tika/src/test/resources/quick.tiff diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tiff_metadata.json b/engines/tika/src/test/resources/quick.tiff_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.tiff_metadata.json rename to engines/tika/src/test/resources/quick.tiff_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.txt b/engines/tika/src/test/resources/quick.txt similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.txt rename to engines/tika/src/test/resources/quick.txt diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.txt_metadata.json b/engines/tika/src/test/resources/quick.txt_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.txt_metadata.json rename to engines/tika/src/test/resources/quick.txt_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.vsd b/engines/tika/src/test/resources/quick.vsd similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.vsd rename to engines/tika/src/test/resources/quick.vsd diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.vsd_metadata.json b/engines/tika/src/test/resources/quick.vsd_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.vsd_metadata.json rename to engines/tika/src/test/resources/quick.vsd_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xls b/engines/tika/src/test/resources/quick.xls similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xls rename to engines/tika/src/test/resources/quick.xls diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xls_metadata.json b/engines/tika/src/test/resources/quick.xls_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xls_metadata.json rename to engines/tika/src/test/resources/quick.xls_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xlsx b/engines/tika/src/test/resources/quick.xlsx similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xlsx rename to engines/tika/src/test/resources/quick.xlsx diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xlsx_metadata.json b/engines/tika/src/test/resources/quick.xlsx_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xlsx_metadata.json rename to engines/tika/src/test/resources/quick.xlsx_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xml b/engines/tika/src/test/resources/quick.xml similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xml rename to engines/tika/src/test/resources/quick.xml diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xml_metadata.json b/engines/tika/src/test/resources/quick.xml_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xml_metadata.json rename to engines/tika/src/test/resources/quick.xml_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xslx b/engines/tika/src/test/resources/quick.xslx similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.xslx rename to engines/tika/src/test/resources/quick.xslx diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.z b/engines/tika/src/test/resources/quick.z similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.z rename to engines/tika/src/test/resources/quick.z diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.zip b/engines/tika/src/test/resources/quick.zip similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.zip rename to engines/tika/src/test/resources/quick.zip diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.zip_metadata.json b/engines/tika/src/test/resources/quick.zip_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick.zip_metadata.json rename to engines/tika/src/test/resources/quick.zip_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick2010CustomProps.dwg b/engines/tika/src/test/resources/quick2010CustomProps.dwg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick2010CustomProps.dwg rename to engines/tika/src/test/resources/quick2010CustomProps.dwg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick2010CustomProps.dwg_metadata.json b/engines/tika/src/test/resources/quick2010CustomProps.dwg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quick2010CustomProps.dwg_metadata.json rename to engines/tika/src/test/resources/quick2010CustomProps.dwg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-EXT.jpg b/engines/tika/src/test/resources/quickIPTC-EXT.jpg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-EXT.jpg rename to engines/tika/src/test/resources/quickIPTC-EXT.jpg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-EXT.jpg_metadata.json b/engines/tika/src/test/resources/quickIPTC-EXT.jpg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-EXT.jpg_metadata.json rename to engines/tika/src/test/resources/quickIPTC-EXT.jpg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-multi-creator.jpg b/engines/tika/src/test/resources/quickIPTC-multi-creator.jpg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-multi-creator.jpg rename to engines/tika/src/test/resources/quickIPTC-multi-creator.jpg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-multi-creator.jpg_metadata.json b/engines/tika/src/test/resources/quickIPTC-multi-creator.jpg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC-multi-creator.jpg_metadata.json rename to engines/tika/src/test/resources/quickIPTC-multi-creator.jpg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.gif b/engines/tika/src/test/resources/quickIPTC.gif similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.gif rename to engines/tika/src/test/resources/quickIPTC.gif diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.gif_metadata.json b/engines/tika/src/test/resources/quickIPTC.gif_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.gif_metadata.json rename to engines/tika/src/test/resources/quickIPTC.gif_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.png b/engines/tika/src/test/resources/quickIPTC.png similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.png rename to engines/tika/src/test/resources/quickIPTC.png diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.png_metadata.json b/engines/tika/src/test/resources/quickIPTC.png_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/quickIPTC.png_metadata.json rename to engines/tika/src/test/resources/quickIPTC.png_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/sample.rss b/engines/tika/src/test/resources/sample.rss similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/sample.rss rename to engines/tika/src/test/resources/sample.rss diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/sample.rtf b/engines/tika/src/test/resources/sample.rtf similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/sample.rtf rename to engines/tika/src/test/resources/sample.rtf diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/sample.xhtml.txt b/engines/tika/src/test/resources/sample.xhtml.txt similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/sample.xhtml.txt rename to engines/tika/src/test/resources/sample.xhtml.txt diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/testJPEG_IPTC_EXT.jpg b/engines/tika/src/test/resources/testJPEG_IPTC_EXT.jpg similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/testJPEG_IPTC_EXT.jpg rename to engines/tika/src/test/resources/testJPEG_IPTC_EXT.jpg diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json b/engines/tika/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json rename to engines/tika/src/test/resources/testJPEG_IPTC_EXT.jpg_metadata.json diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/test/resources/tika_engine_config.json b/engines/tika/src/test/resources/tika_engine_config.json similarity index 100% rename from alfresco-transform-tika/alfresco-transform-tika/src/test/resources/tika_engine_config.json rename to engines/tika/src/test/resources/tika_engine_config.json diff --git a/alfresco-transform-model/README.md b/model/README.md similarity index 100% rename from alfresco-transform-model/README.md rename to model/README.md diff --git a/alfresco-transform-model/pom.xml b/model/pom.xml similarity index 99% rename from alfresco-transform-model/pom.xml rename to model/pom.xml index 9657f819..8e60a033 100644 --- a/alfresco-transform-model/pom.xml +++ b/model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - Alfresco Transform Model + - Model org.alfresco alfresco-transform-model diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java b/model/src/main/java/org/alfresco/transform/client/model/InternalContext.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java rename to model/src/main/java/org/alfresco/transform/client/model/InternalContext.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java b/model/src/main/java/org/alfresco/transform/client/model/MultiStep.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java rename to model/src/main/java/org/alfresco/transform/client/model/MultiStep.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java b/model/src/main/java/org/alfresco/transform/client/model/TransformReply.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java rename to model/src/main/java/org/alfresco/transform/client/model/TransformReply.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java b/model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java rename to model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/ExtensionService.java b/model/src/main/java/org/alfresco/transform/common/ExtensionService.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/ExtensionService.java rename to model/src/main/java/org/alfresco/transform/common/ExtensionService.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/Mimetype.java b/model/src/main/java/org/alfresco/transform/common/Mimetype.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/Mimetype.java rename to model/src/main/java/org/alfresco/transform/common/Mimetype.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java b/model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java rename to model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java b/model/src/main/java/org/alfresco/transform/common/RequestParamMap.java similarity index 96% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java rename to model/src/main/java/org/alfresco/transform/common/RequestParamMap.java index dae135de..dc487527 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java +++ b/model/src/main/java/org/alfresco/transform/common/RequestParamMap.java @@ -65,7 +65,7 @@ public interface RequestParamMap String NOT_EXTRACT_BOOKMARKS_TEXT = "notExtractBookmarksText"; String PAGE_LIMIT = "pageLimit"; - // Parameters interpreted by the AbstractTransformerController + // Parameters interpreted by the TransformController String DIRECT_ACCESS_URL = "directAccessUrl"; // An optional parameter (defaults to 1) to be included in the request to the t-engine {@code /transform/config} diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformConfigResourceReader.java b/model/src/main/java/org/alfresco/transform/common/TransformConfigResourceReader.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformConfigResourceReader.java rename to model/src/main/java/org/alfresco/transform/common/TransformConfigResourceReader.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformException.java b/model/src/main/java/org/alfresco/transform/common/TransformException.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformException.java rename to model/src/main/java/org/alfresco/transform/common/TransformException.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformerDebug.java b/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformerDebug.java rename to model/src/main/java/org/alfresco/transform/common/TransformerDebug.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java b/model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java rename to model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/AddSupported.java b/model/src/main/java/org/alfresco/transform/config/AddSupported.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/AddSupported.java rename to model/src/main/java/org/alfresco/transform/config/AddSupported.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreFunction.java b/model/src/main/java/org/alfresco/transform/config/CoreFunction.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreFunction.java rename to model/src/main/java/org/alfresco/transform/config/CoreFunction.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java b/model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java similarity index 99% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java rename to model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java index 7140deec..6d016447 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java +++ b/model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java @@ -41,7 +41,7 @@ import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL; * *

Since alfresco-transform-core 5.2.7, the config returned by T-Engines and T-Router via their * {@code "/transform/config"} endpoint has been decorated with an {@code coreVersion} element, indicating what core - * functionality is provided by each transformer as a result of extending the {@code AbstractTransformerController} in + * functionality is provided by each transformer as a result of extending the {@code TransformController} in * the {@code alfresco-transform-base}. This is automatically added, so need not be specified by the T-Engine developer. * It was originally added to indicate that it was possible to use Direct Access URLs (DAU).

* diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/OverrideSupported.java b/model/src/main/java/org/alfresco/transform/config/OverrideSupported.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/OverrideSupported.java rename to model/src/main/java/org/alfresco/transform/config/OverrideSupported.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/RemoveSupported.java b/model/src/main/java/org/alfresco/transform/config/RemoveSupported.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/RemoveSupported.java rename to model/src/main/java/org/alfresco/transform/config/RemoveSupported.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java b/model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java rename to model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java b/model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java rename to model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformConfig.java b/model/src/main/java/org/alfresco/transform/config/TransformConfig.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformConfig.java rename to model/src/main/java/org/alfresco/transform/config/TransformConfig.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOption.java b/model/src/main/java/org/alfresco/transform/config/TransformOption.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOption.java rename to model/src/main/java/org/alfresco/transform/config/TransformOption.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java b/model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java rename to model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java b/model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java rename to model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformStep.java b/model/src/main/java/org/alfresco/transform/config/TransformStep.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformStep.java rename to model/src/main/java/org/alfresco/transform/config/TransformStep.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/Transformer.java b/model/src/main/java/org/alfresco/transform/config/Transformer.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/Transformer.java rename to model/src/main/java/org/alfresco/transform/config/Transformer.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java b/model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java rename to model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java b/model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java rename to model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/config/Types.java b/model/src/main/java/org/alfresco/transform/config/Types.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/config/Types.java rename to model/src/main/java/org/alfresco/transform/config/Types.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java b/model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java rename to model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformStack.java b/model/src/main/java/org/alfresco/transform/messages/TransformStack.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformStack.java rename to model/src/main/java/org/alfresco/transform/messages/TransformStack.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java b/model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java rename to model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java b/model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java rename to model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Defaults.java b/model/src/main/java/org/alfresco/transform/registry/Defaults.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Defaults.java rename to model/src/main/java/org/alfresco/transform/registry/Defaults.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Origin.java b/model/src/main/java/org/alfresco/transform/registry/Origin.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Origin.java rename to model/src/main/java/org/alfresco/transform/registry/Origin.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java b/model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java rename to model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformCache.java b/model/src/main/java/org/alfresco/transform/registry/TransformCache.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformCache.java rename to model/src/main/java/org/alfresco/transform/registry/TransformCache.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java b/model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java rename to model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java b/model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java rename to model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java b/model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java similarity index 100% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java rename to model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java b/model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java rename to model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java b/model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java rename to model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java b/model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java rename to model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java b/model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java rename to model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java b/model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java rename to model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java rename to model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java b/model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java rename to model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java b/model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java rename to model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java rename to model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java similarity index 100% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java rename to model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java diff --git a/pom.xml b/pom.xml index 90671a1c..b1ff7c46 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,7 @@ 4.0.0 org.alfresco alfresco-transform-core + Alfresco Transform Core 2.6.1-SNAPSHOT pom @@ -41,90 +42,72 @@ true - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-imagemagick/alfresco-transform-imagemagick - alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot - alfresco-transform-libreoffice/alfresco-transform-libreoffice - alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot - alfresco-transform-misc/alfresco-transform-misc - alfresco-transform-misc/alfresco-transform-misc-boot - alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer - alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot - alfresco-transform-tika/alfresco-transform-tika - alfresco-transform-tika/alfresco-transform-tika-boot - alfresco-transform-core-aio/alfresco-transform-core-aio - alfresco-transform-core-aio/alfresco-transform-core-aio-boot + model + engines/base + engines/imagemagick + engines/libreoffice + engines/misc + engines/pdfrenderer + engines/tika + engines/aio + deprecated/alfresco-transformer-base base - alfresco-transform-model - alfresco-transformer-base - t-engine-base + model + engines/base + deprecated/alfresco-transformer-base imagemagick - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-imagemagick/alfresco-transform-imagemagick - alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot + model + engines/base + engines/imagemagick libreoffice - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-libreoffice/alfresco-transform-libreoffice - alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot + model + engines/base + engines/libreoffice misc - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-misc/alfresco-transform-misc - alfresco-transform-misc/alfresco-transform-misc-boot + model + engines/base + engines/misc pdf-renderer - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer - alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot + model + engines/base + engines/pdfrenderer tika - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-tika/alfresco-transform-tika - alfresco-transform-tika/alfresco-transform-tika-boot + model + engines/base + engines/tika aio-test - alfresco-transform-model - alfresco-transformer-base - t-engine-base - alfresco-transform-core-aio/alfresco-transform-core-aio - alfresco-transform-core-aio/alfresco-transform-core-aio-boot + model + engines/base + engines/aio