From 9925ac28956d7da3cc92add874840a559c0f4e7d Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 5 Jan 2024 15:30:20 -0700 Subject: [PATCH] DRYD-1251: UCB ImageMagick Config Contrib (#381) Co-authored-by: Richard Millet Co-authored-by: Ray Lee --- .../nuxeo-platform-collectionspace/build.xml | 1 + .../nuxeo-platform-collectionspace/pom.xml | 18 +++++ .../src/main/resources/META-INF/MANIFEST.MF | 6 +- .../commandline-imagemagick-contrib.xml | 68 ++++++++++++++++++ ...r => nuxeo-platform-convert-9.10-HF30.jar} | Bin 48033 -> 48347 bytes build.properties | 5 ++ 6 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/commandline-imagemagick-contrib.xml rename 3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/{nuxeo-platform-convert-9.10-HF28.jar => nuxeo-platform-convert-9.10-HF30.jar} (85%) diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml index 91b1cab0f..1c580e54a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml @@ -61,6 +61,7 @@ + diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml index f494fbb83..e393ad5ae 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml @@ -13,7 +13,25 @@ Nuxeo CollectionSpace core extension Nuxeo Enterprise Platform: CS extensions + + + + + + + ../../../build.properties + + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF index e5cac9795..556b93e2c 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF @@ -8,12 +8,14 @@ Bundle-Vendor: Nuxeo Require-Bundle: org.nuxeo.runtime, org.nuxeo.ecm.core.api, org.nuxeo.ecm.core, - org.nuxeo.ecm.webapp.core + org.nuxeo.ecm.webapp.core, + org.nuxeo.ecm.platform.commandline.executor.service.defaultContrib Provide-Package: org.collectionspace.shared Nuxeo-Component: OSGI-INF/core-types-contrib.xml, OSGI-INF/default-life-cycle-contrib.xml, OSGI-INF/ecm-types-contrib.xml, OSGI-INF/layouts-contrib.xml, - OSGI-INF/querymodel-contrib.xml + OSGI-INF/querymodel-contrib.xml, + OSGI-INF/commandline-imagemagick-contrib.xml diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/commandline-imagemagick-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/commandline-imagemagick-contrib.xml new file mode 100644 index 000000000..88f4d4661 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/commandline-imagemagick-contrib.xml @@ -0,0 +1,68 @@ + + + + + org.nuxeo.ecm.platform.commandline.executor.service.defaultContrib + + + + + ${cspace.im.root}identify + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -ping -format '%m %w %h %z %[colorspace]' #{inputFilePath}[0] + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -ping -format "%m %w %h %z %[colorspace]" #{inputFilePath}[0] + You need to install ImageMagick. + + + + ${cspace.im.root}stream + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -map rgb -storage-type char -extract #{tileWidth}x#{tileHeight}+#{offsetX}+#{offsetY} #{inputFilePath}[0] - | convert -depth 8 -size #{tileWidth}x#{tileHeight} rgb:- #{outputFilePath} + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -map rgb -storage-type char -extract #{tileWidth}x#{tileHeight}+#{offsetX}+#{offsetY} #{inputFilePath}[0] - | convert -depth 8 -size #{tileWidth}x#{tileHeight} rgb:- #{outputFilePath} + You need to install ImageMagick. + + + + ${cspace.im.root}convert + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -depth #{targetDepth} #{inputFilePath}[0] jpg:- | convert - -resize #{targetWidth}x#{targetHeight} #{outputFilePath} + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -depth #{targetDepth} #{inputFilePath}[0] -resize #{targetWidth}x#{targetHeight} #{outputFilePath} + You need to install ImageMagick. + + + + ${cspace.im.root}convert + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -depth #{targetDept h} #{inputFilePath}[0] -coalesce -resize #{targetWidth}x#{targetHeight} -deconstruct #{outputFilePath} + You need to install ImageMagick. + + + + ${cspace.im.root}convert + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -background white -flatten -depth #{targetDepth} #{inputFilePath}[0] jpg:- | convert - -resize #{targetWidth}x#{targetHeight} #{outputFilePath} + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -background white -flatten -depth #{targetDepth} #{inputFilePath}[0] -resize #{targetWidth}x#{targetHeight} #{outputFilePath} + You need to install ImageMagick. + + + + ${cspace.im.root}convert + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet #{inputFilePath}[0] -rotate #{angle} #{outputFilePath} + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet #{inputFilePath}[0] -rotate #{angle} #{outputFilePath} + You need to install ImageMagick. + + + + ${cspace.im.root}stream + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet -map #{mapComponents} -storage-type char -extract #{tileWidth}x#{tileHeight}+#{offsetX}+#{offsetY} #{inputFilePath}[0] - | convert -depth 8 -size #{tileWidth}x#{tileHeight} -resize #{targetWidth}x#{targetHeight}! #{mapComponents}:- #{outputFilePath} + You need to install ImageMagick. + + + + ${cspace.im.root}convert + -define registry:temporary-path=#{nuxeo.tmp.dir} -quiet #{inputFilePath}[0] -crop #{tileWidth}x#{tileHeight} +repage #{outputFilePath} + You need to install ImageMagick. + + + + + diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF28.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF30.jar similarity index 85% rename from 3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF28.jar rename to 3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF30.jar index c46e04b879520fa3b56e3c30f42c428cdba82c98..bcbf498366c0e9507bc2172634f95b97d5969e87 100644 GIT binary patch delta 3610 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 delta 3170 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