Commit Graph
85 Commits
Author SHA1 Message Date
alandavis 6bbde4756c [release] 2.6.0 2022-04-20 16:02:43 +01:00
alandavis 5695032c8e [release] 2.6.0 2022-04-20 15:47:49 +01:00
alandavis 3905c929c3 [release] 2.6.0-A3 2022-04-13 14:30:07 +01:00
alandavis fb2248c409 ACS-2767 Switch to using [release} rather than [trigger release]
Switch has been made in t-service (ATS) and AIS projects

[skip ci]
2022-04-13 14:29:05 +01:00
alandavis b415835178 ACS-2767 Switch to using [release} rather than [trigger release]
Switch has been made in t-service (ATS) and AIS projects

[skip ci]
2022-04-13 14:28:33 +01:00
alandavis 5f8dfd0f1e [trigger release] 2.6.0-A2 2022-04-06 10:25:55 +01:00
Alan Davis 64742a619e ACS-2718 Streamline ATS t-model/t-core (#586)
* Merge alfresco-transform-model project into alfresco-transform-core - WITHOUT the git history
* Simplify Maven dependencies and build project
* Unify release process of combined t-model and t-core
2022-04-05 17:36:43 +01:00
alandavis 9bdf7264b9 [trigger release] 2.6.0-A1
The next version should be major as the LibreOffice version changed
2022-03-16 17:22:48 +00:00
alandavis baf64e45a6 [trigger release] 2.5.8-A1 2022-03-16 15:52:11 +00:00
alandavis c3b7dec53c [trigger release] 2.5.8-A1
* T-Model 1.4.16
2022-03-16 14:30:27 +00:00
alandavis 088f12e4b6 Release T-Core (T-Engines) 5.2.7 [trigger release] 2022-03-10 10:56:23 +00:00
alandavis aff1bc144b ACS-2641 truncate Direct Access URLs in TransformerDebug
[trigger release] 2.5.7-A10
2022-03-07 18:29:35 +00:00
alandavis f24969199c ACS-2002 T-Engine debug should include direct access url
[trigger release] 2.5.7-A9
2022-03-06 06:52:33 +00:00
alandavis 90fd2d55af ACS-2002 T-Engine debug should include direct access url
[trigger release] 2.5.7-A8
2022-03-05 12:01:51 +00:00
alandavis d1c6015913 ACS-2002 Add T-Engine debug for local transforms
[trigger release] 2.5.7-A7
2022-03-05 10:19:45 +00:00
alandavis e931cd2156 [trigger release] 2.5.7-A5 2022-03-02 11:20:22 +00:00
Alan Davis 88cc6c7b3b ACS-2494 sourceReference may now be null with direct access urls (#547)
* Pick up t-model 1.4.12 which has the check for this field

[trigger release] 2.5.7-A5
2022-03-01 21:23:10 +00:00
alandavis 27b04ee049 ACS-2587 Fix test failure
[trigger release] 2.5.7-A4
2022-02-24 00:01:56 +00:00
Alan Davis 61c1f802ef ACS-2587 Include directAccessUrl in T-Config if supported (#539)
The t-config returned by the T-Router & T-Engines should include directAccessUrl as an optional transform option when the T-engine supports it.

[trigger release] 2.5.7-A4
2022-02-23 23:51:10 +00:00
alandavis ea7acd4d06 [trigger release] 2.5.7-A3 2022-02-21 14:02:09 +00:00
Alan Davis 44d34ce3f2 ATS-981 Avoid CVE-2022-23181 with spring-boot-starter-web 2.6.3 (#537)
[trigger release] 2.5.7-A3
2022-02-21 13:16:50 +00:00
alandavis 583023d81d [trigger release] 2.5.7-A2 2022-02-18 15:11:50 +00:00
Alan Davis f05b54dea3 ACS-2497 Rework httpTransformRequestUsingDirectAccessUrlTest so it can be used in AI and Aspose (#535) 2022-02-18 14:08:18 +00:00
alandavis 64669eebd2 [trigger release] 2.5.7-A1 2022-02-14 11:59:15 +00:00
Alan Davis a89e161004 ACS-2498 Switch to using a configVersion parameter on the /transform/config endpoint (#530)
* Fixed the config returned by the AIO as it did not include the coreVersion even though the individual ones did.
2022-02-10 23:50:19 +00:00
Alan Davis df519cfd6f ACS-2498 Add coreVersion to T-Engine config (#526)
The bulk of the changes in this PR are to do with adding a coreVersion element to the transform element in the T-Engine config. For more detail see the class header of CoreVersionDecorator.

* Support the use of coreVersion so that it is possible to upgrade pods in any order
* Moved the majority of the RequestParamMap static finals to alfresco-transform-model and added a new one: "includeCoreVersion" parameter.
2022-02-09 22:39:40 +00:00
Alan Davis e76da6878c ACS-2479 AI Transformers do not start if built using ATS 1.5.0 components (#522)
[trigger release] 2.5.6

* Changes just tidy up white space and pick up the modified T-Model
2022-01-27 18:29:28 +00:00
Alan Davis 167c77fb2c ATS-973 [trigger release] 2.5.5 (#521) 2022-01-26 17:51:00 +00:00
Alan Davis ec49e323ff [trigger release] 2.5.5-A2 (#518) 2022-01-13 21:52:51 +00:00
alandavis aca1c3c231 [trigger release] 2.5.5-A2 2022-01-13 18:08:26 +00:00
Alan Davis 59325bc38a Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1 (#516)
* Repeat Bump dependency.tika.version from 2.1.0 to 2.2.1

Original PR https://github.com/Alfresco/alfresco-transform-core/pull/506 was merged to master where it failed. There had been no build of the PR before the merge, which is why this branch has been created.

* Use non deprecated TikaCoreProperties.SUBJECT with tika 2.2.1.

The deprecated OfficeOpenXMLCore.SUBJECT value worked in 2.2.0 but not 2.2.1

* With the upgrade of Tika from 2.2.0 to 2.2.1, the deprecated OfficeOpenXMLCore.SUBJECT metadata value became being null and the replacement TikaCoreProperties.SUBJECT became a multi value in a few of our test cases. For backward compatibility with very old versions of Alfresco, we have historically been added a number of extra values including "subject" and "description" back into the raw metadata, before mapping them onto Alfresco properties. These values existed in the original version of Tika used by Alfresco, so it is possible there are custom mappings out there that using them.

To complicate matters a little, out standard mappings for some types put the raw "subject" value into cm:description property. What makes it interesting is that the extra "description" value is not used but has the value originally in our expected metadata extarct data. That is why the quick_*_json files have been modified.
2022-01-13 17:25:56 +00:00
Alan Davis 4f7364f7a4 Bump alfresco-transform-model from 1.4.5 to 1.4.6 (#513) 2022-01-07 10:50:27 +00:00
alandavis 1cd673de63 Restore ATS-969 Tika upgrade 1.x -> 2.x (#493)
This reverts commit 9776577a45.

Was not possible to perform the release of 2.5.5-A1 with this upgrade of Tika.
Possibly related to it forcing a change in the following files, which were then deleted in the build:
D	alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties
D	alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties
D	alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties
D	alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties
2022-01-05 21:56:41 +00:00
Alan Davis 9776577a45 [trigger release] 2.5.5-A1 (#511)
Revert ATS-969 Tika upgrade 1.x -> 2.x (#493)

As the build is deleting the following, resulting in the release job failure
D	alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/license/THIRD-PARTY.properties
D	alfresco-transform-core-aio/alfresco-transform-core-aio/src/license/THIRD-PARTY.properties
D	alfresco-transform-tika/alfresco-transform-tika-boot/src/license/THIRD-PARTY.properties
D	alfresco-transform-tika/alfresco-transform-tika/src/license/THIRD-PARTY.properties
2022-01-05 20:26:04 +00:00
alandavis b18798f313 [trigger release] 2.5.5-A1
- missing bit of useful debug included
2022-01-05 16:04:20 +00:00
alandavis 48c77e2d0c Revert "Bump dependency.tika.version from 2.1.0 to 2.2.1"
[trigger release] 2.5.5-A1

This reverts commit b6d02f2c0c.

The build failed. There was no build on the PR as far as I can see and none in the history.
2022-01-05 12:57:31 +00:00
Alan Davis a98f937b4a ACS-2002 Enhance T-Router debug (#507)
[trigger release] 2.5.5-A1

By default T-Engines now provide the more readable TransformerDebug DEBUG messages, rather than the original detailed request and reply messages, which are still available as TRACE.
2022-01-05 12:17:17 +00:00
Alan Davis 0c5b497a53 ACS-2270 Read T-Engine config in alphabetical order (#485)
* T-Engines config need to be combined in the same predefined order in the all-in-one transformer,
  T-Router and the Content Repository with individual T-Engines.
2021-11-22 12:59:09 +00:00
alandavis 90a0d5138f Revert "ACS-2270 Read T-Engine config in alphabetical order"
Wrong branch [skip ci]

This reverts commit fa69e48e52.
2021-11-18 14:09:16 +00:00
alandavis fa69e48e52 ACS-2270 Read T-Engine config in alphabetical order
* T-Engines config need to be combined in the same predefined order in the all-in-one transformer,
  T-Router and the Content Repository with individual T-Engines.
2021-11-18 14:05:14 +00:00
Alan Davis 00c8fc7b34 ACS-1998 Enhance the transform config (#484) 2021-11-13 11:29:21 +00:00
Alan Davis 509acf4760 ACS-1778 Common transform routing code for Repo and t-router (#453)
* Addition of logWarn method
* Pick up new alfresco-transform-model tag 1.4.0
2021-08-19 17:58:10 +01:00
Alan Davis 0ac0477652 ACS-813 "UpdateDocMode", UpdateDocMode.NO_UPDATE (#342)
* Include alfresco-jodconverter-core.version:3.0.1.12
2021-02-18 14:55:38 +00:00
Alan Davis 2766c23431 MNT-20626 XML files having UTF-16LE and UTF-16BE can't be previewed (#331)
* Introduce more flexible reading of UTF-16 data, where there may be a BOM, but the
   spec says there should not be one, or the BOM is clearly wrong when looking at the
   following characters. The https://en.wikipedia.org/wiki/UTF-16 write up is nice and clear.
* Includes identical correction in data setup in AIOTransformRegistryTest and
   MicsControllerTest for a problem found in TextToPdfContentTransformerTest.
 * Includes upgrade to latest pdfbox: 2.0.22
2021-02-09 19:04:34 +00:00
Alan Davis 2fd11d5aed REPO-5191 Bug: T-Engine should provide mapping rather than the repo. (#316)
Bug found while reviewing documents on how to create a custom metadata extractor. The original refactor had left the repo doing the mapping. It should have been passing the fully qualified repo properties to the T-Engine to do the mapping.

Linked to:
    Alfresco/alfresco-community-repo#227
    Alfresco/acs-packaging#1826
2021-01-06 22:25:40 +00:00
Alan Davis 00fbb6405a ATS-829 Release T-Engines 2.3.6 (#307)
ATS-829: Release T-Core (T-Engines) 2.3.6 [trigger release]

Linked to REPO-5219 Allow AGS AMP to specify metadata extract mapping

Added an extractMapping transform option to all metadata extractors to override the default one.

3rd party libraries to get a green build.
* Upgrade cxf-rt-transports-http and woodstox-core to avoid issues
* Upgrade to org.springframework.boot:spring-boot-starter-parent:2.3.5.RELEASE to avoid problem in org.springframework:spring-web
* Upgrade to activemq 5.15.13 to avoid problem in activemq-broker 5.15.12
2020-11-19 18:35:22 +00:00
Alan Davis 38f7a8cc9c REPO-5201 Update README on how to create a T-Engine (#261)
Reflects changes to AbstractTransformerController that simplify the number of methods that need to be implemented.
2020-06-17 13:00:33 +01:00
Alan DavisandJan Vonka d495459b9b ATS-777 / REPO-4334: Move metadata extraction into T-Engines (#256)
* REPO-4334 Move metadata extraction into T-Engines
- new "transformImpl" required (processTransform deprecated)
- JavaDoc

Co-authored-by: Jan Vonka <jan.vonka@alfresco.com>
2020-06-16 14:41:49 +01:00
Alan Davis 06109dee75 REPO-4334 Move metadata extraction into T-Engines (#247)
* Metadata extract code added to T-Engines
* Required a refactor of duplicate code to avoid 3x more duplication:
        - try catches used to return return exit codes
        - calls to java libraries or commands to external processes
        - building of transform options in controllers, adaptors
* integration tests based on current extracts performed in the repo
* included extract code for libreoffice, and embed code even though not used out of the box any more. There may well be custom extracts using them that move to T-Engines
* removal of unused imports
* minor autoOrient / allowEnlargement bug fixes that were not included in Paddington on the T-Engine side.
2020-06-11 20:20:22 +01:00
Alan Davis b538b809d7 REPO-5188 SourceEncoding should not be used to select transforms as i… (#249)
* REPO-5188 SourceEncoding should not be used to select transforms as it is always provided to T-Engines

* Fix test. Now that SourceEncoding is in the options but is not used to select the transformer, we need to add another
option to force the use of the textToPdf transform rather than libreoffice.
2020-06-01 14:30:10 +01:00
alandavis c9743063f5 REPO-4452 Add local transformer pipelines (#121)
Set priorities on 5 Tika transform routes so they are not used if LibreOffice is available. This currently has no impact on the Transform Service (priorities are not used for routing), but does on repository LocalTransforms as the wrong T-Engine is selected.
2019-09-20 12:01:49 +03:00
alandavis d6777b58eb REPO-4639 Content conversion failed using Tika (#108)
* REPO-4639: Split tika engine_config.json into separate transformers.

* WIP: REPO-4639 Content conversion failed using Tika

The Tika T-Engine "transform" option does not exist when called via the Transform Service or Local transforms, which resulted in no transforms taking place. However this value is really not be needed as the T-Engine should be able to read its own engine_config.xml to work out which sub transform to use. Transforms only worked via Legacy transforms, which used a T-Engine.

This code is based on tried and tested ACS repository code. It has been further simplified.

TODO:
- replace the ConfigFileFinder class just added with something that uses Spring to read the JSON. i.e. simplify it.
- replace the CombinedConfig class just added with something that does not need the InLineTransformer. i.e. simplify it.
- create tests based on the repo tests
- remove the source and target mimetype checks in Tika as a check against engine_config.xml is cleaner.
- repeat the process for the Misc T-Engine as it has similar code checking source and target mimetypes.
- remove the transform option passed by the legacy transforms.

* Removed CombindConfig and ConfigFileFnder classes.

* Extracted AbstractTransformRegistry so that it may be used in the ACS repository too.

TODO AbstractTransformRegistry and AbstractTransformRegistry need to be moved to the alfresco-transform-model pakage

* tidy up only

* REPO-4639: Add priority to duplicate transforms.

* REPO-4639: Refactor TikaTransformationIT to use the new Tika /transform specifications
Changes AbstractTransformerControllerTest as the engine_config is now loaded in TransformRegistryImpl instead of AbstractTransformerController

* Rename to TransformServiceRegistry, so we don't have to change the repo code.

* Added the baseUrl parameter to the register method and fixed the missed rename in the last commit.

* Javadoc change only

* Moved common classes (with repo) AbbstractTransformRegistry and TransformServiceRegistry to alfresco-transform-model

* Replace (simplify) all the isTransformable calls with a check against the JSON.
- Tests now only pass targetEncoding to the 'string' transformer.

* Fix failing tests.

* Revert port change

* REPO-4639 : Add priorities to misc engine_config

* REPO-4639 : Add priorities to pdf-renderer and  imagemagick engine_config

* Remove test that is @Ignored

* Pick up alfresco-transformer-model 1.0.2.7-REPO-4639-1

* REPO-4639 : Add priorities to libreoffice engine_config

* REPO-4639 : Add priorities to tika engine_config

* REPO-4639 : Remove all priorities with value equal to 50 (default) from engine_config

* Switch over to using TransformServiceRegistry in org.alfresco.transform.client.registry
Reintroduce the noExtensionSourceFilenameTest having removed @Ignore.

* New whitesource issue on commons-compress 1.18. Upgrading to 1.19.

* Removed the text/javascript -> text/plain test as this is not supported

* Modifications as a result of changes to method names in alfresco-transform-model

* Pick up alfresco-transform-model 1.0.2.7-ATS545-2

* Remove unused imports
2019-09-12 15:34:42 +03:00
Alan Davis afe31b73e3 MNT-20337/REPO-4534/ATS-484 LibreOffice 6.1.6 2019-07-17 12:57:57 +01:00
Alan Davis 7d69dd6003 REPO-3720, MNT-19825 ImageMagick docker transformer does not take arbitrary command line options. 2018-07-24 11:13:50 +01:00
Alan Davis ec5e0d0663 REPO-3720, MNT-19825 ImageMagick docker transformer does not take arbitrary command line options. 2018-07-24 11:13:50 +01:00
Alan Davis 608282743f REPO-3425 Transformers: Tika based transformers 2018-06-28 13:25:01 +01:00
Alan Davis 82c5e3e96a REPO-3425 Transformers: Tika based transformers 2018-06-28 13:25:01 +01:00
Alan Davis b04fdd4ef1 REPO-3505 Addition of liveness and readiness probes for transformers. 2018-05-23 15:36:56 +01:00
Alan Davis 7de82a3541 Feature/repo 3505 probes 2018-05-23 15:36:56 +01:00
Alan Davis a20840c5b8 REPO-3504 Typos in javadoc 2018-05-16 12:11:51 +01:00
Alan Davis 11042027e5 REPO-3449 Pickup ch.qos.logback 1.2.3, jackson-databind 2.8.11.1 and enhance logging 2018-04-20 18:12:19 +01:00
Alan Davis 93ab9ad92f REPO-3449 Pickup ch.qos.logback 1.2.3 and enhance logging 2018-04-20 18:12:19 +01:00
Alan Davis 73af441ab3 REPO-3424 More unit tests and pick up latest alfresco-core (7.2) 2018-04-16 23:22:18 +01:00
Alan Davis f7f6525950 REPO-3439 LibreOffice now only creates the jodconverter on the 1st request so the correct timeout is used. 2018-04-16 17:23:43 +01:00
Alan Davis fd655e928e REPO-3439 fix lost version in pom 2018-04-16 16:34:17 +01:00
Alan Davis 601dfd2e47 REPO-3424 Unit tests for docker transformers 2018-04-16 16:24:48 +01:00
Alan Davis 0b1ffe9f29 REPO-3424 Unit tests for docker transformers 2018-04-16 16:24:09 +01:00
Alan Davis a0dd60d6a6 REPO-3422 Startup check for LibreOffice
Also included the transformer name on the log and error pages.
2018-04-09 06:57:53 +01:00
Alan Davis 419d71bfbf REPO-3264 Typo correction LiberOffice -> LibreOffice 2018-04-03 16:27:37 +01:00
Alan Davis b4fc6c0097 REPO-3299,REPO-3436,REPO-3437: Typo in license message 2018-03-28 14:40:22 +01:00
Alan Davis 89e906be6b REPO-3299,REPO-3437,REPO-3436: Switch to Enterprise license. 2018-03-28 14:12:59 +01:00
Alan Davis 413bd8e7df REPO-3299,REPO-3436,REPO-3437: Tidy up license messages 2018-03-27 13:34:28 +01:00
Alan Davis 47f805e306 REPO-3299,REPO-3436,REPO-3437: License infor for PDFium, LibreOffice and ImageMagick 2018-03-26 18:30:10 +01:00
Alan Davis a526b5f71c REPO-3299 Reference ImageMagick and LibreOffice install kits from Nexus
This is to protect ourselves from the downloaded version being removed.
2018-03-26 15:51:41 +01:00
Alan Davis afedb11da3 REPO-3299 Reference ImageMagick and LibreOffice install kits from Nexus
This is to protect ourselves from the downloaded version being removed.
2018-03-26 15:22:03 +01:00
Alan Davis 8d338d1b55 REPO-3335 Enterprise Docker and docker-compose simplified by pulling in transformer images 2018-03-17 12:27:55 +00:00
Alan Davis 2d6fafaf1c REPO-3264 Fix startup of transformers 2018-03-16 07:29:20 +00:00
Alan Davis f77c0a3727 REPO-3264 Remove maven warning message 2018-03-15 23:10:12 +00:00
Alan Davis 4116551125 Put the enterpriseDocker and communityDocker profiles back into the poms. 2018-03-14 17:01:22 +00:00
Alan Davis 0cd0a6309d REPO-3264 reordered properties 2018-03-14 13:53:44 +00:00
Alan Davis 9762f998be REPO-3264 enterpriseDocker profile to build local docker images 2018-03-14 13:51:35 +00:00
Alan Davis 425e6db240 REPO-3264 use properties for versions 2018-03-14 11:47:32 +00:00
Alan Davis 293bf7e2ae REPO-3337 change scm section to allow for release 2018-03-12 11:04:58 +00:00
Alan Davis a2b90f127c REPO-3264 Tidy up README files. 2018-03-07 14:59:32 +00:00
Alan Davis 42e7e192b5 Initial commit 2018-03-07 14:39:07 +00:00