diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml b/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml index 4bf68400..ae28af5e 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml +++ b/alfresco-transform-misc/alfresco-transform-misc-spring/pom.xml @@ -32,6 +32,12 @@ test-jar test + + org.alfresco + alfresco-transform-misc + ${project.version} + + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/alfresco-transform-misc/alfresco-transform-misc/pom.xml b/alfresco-transform-misc/alfresco-transform-misc/pom.xml index 09e1b383..ce039381 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/pom.xml +++ b/alfresco-transform-misc/alfresco-transform-misc/pom.xml @@ -2,15 +2,103 @@ + + 4.0.0 + alfresco-transform-misc + Alfresco Miscellaneous Transformers + jar + alfresco-transform-core org.alfresco 2.1.2-SNAPSHOT ../../pom.xml - 4.0.0 - alfresco-transform-misc + + + org.alfresco + alfresco-transformer-base + ${project.version} + + + org.alfresco + alfresco-transformer-base + ${project.version} + tests + test-jar + test + + + + + org.dom4j + dom4j + + + + + org.htmlparser + htmlparser + 2.1 + + + + + org.apache.commons + commons-compress + + + + + org.apache.pdfbox + pdfbox-tools + 2.0.19 + + + + + org.apache.poi + poi-ooxml + ${dependency.poi.version} + + + + + com.sun.mail + javax.mail + 1.6.2 + + + org.apache.poi + poi-ooxml + 4.1.1 + + + + junit + junit + 4.13 + test + + + + + + + org.codehaus.mojo + license-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + \ No newline at end of file diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/OOXMLThumbnailContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectableTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java similarity index 97% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java index e0e9f93f..7f562e13 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/SelectingTransformer.java @@ -47,7 +47,6 @@ import com.google.common.collect.ImmutableMap; * * @author eknizat */ -@Component public class SelectingTransformer { private static final Logger logger = LoggerFactory.getLogger(SelectingTransformer.class); diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java similarity index 100% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java rename to alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json b/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json new file mode 100644 index 00000000..5948332f --- /dev/null +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/resources/engine_config.json @@ -0,0 +1,80 @@ +{ + "transformOptions": { + "textToPdfOptions": [ + {"value": {"name": "pageLimit"}}, + {"value": {"name": "sourceEncoding"}} + ], + "stringOptions": [ + {"value": {"name": "sourceEncoding"}}, + {"value": {"name": "targetEncoding"}} + ], + "htmlOptions": [ + {"value": {"name": "sourceEncoding"}} + ] + }, + "transformers": [ + { + "transformerName": "html", + "supportedSourceAndTargetList": [ + {"sourceMediaType": "text/html", "targetMediaType": "text/plain"} + ], + "transformOptions": [ + "htmlOptions" + ] + }, + { + "transformerName": "string", + "supportedSourceAndTargetList": [ + {"sourceMediaType": "text/plain", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/mediawiki", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/css", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/csv", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/xml", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/html", "priority": 55, "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/richtext", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/sgml", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/tab-separated-values", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/x-setext", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/x-java-source", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/x-jsp", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/x-markdown", "targetMediaType": "text/plain"}, + {"sourceMediaType": "text/calendar", "targetMediaType": "text/plain"}, + {"sourceMediaType": "application/x-javascript", "targetMediaType": "text/plain"}, + {"sourceMediaType": "application/dita+xml", "targetMediaType": "text/plain"} + ], + "transformOptions": [ + "stringOptions" + ] + }, + { + "transformerName": "appleIWorks", + "supportedSourceAndTargetList": [ + {"sourceMediaType": "application/vnd.apple.keynote", "targetMediaType": "image/jpeg"}, + {"sourceMediaType": "application/vnd.apple.numbers", "targetMediaType": "image/jpeg"}, + {"sourceMediaType": "application/vnd.apple.pages", "targetMediaType": "image/jpeg"} + ], + "transformOptions": [ + ] + }, + { + "transformerName": "textToPdf", + "supportedSourceAndTargetList": [ + {"sourceMediaType": "text/plain", "priority": 55, "targetMediaType": "application/pdf"}, + {"sourceMediaType": "text/csv", "targetMediaType": "application/pdf"}, + {"sourceMediaType": "application/dita+xml", "targetMediaType": "application/pdf"}, + {"sourceMediaType": "text/xml", "targetMediaType": "application/pdf"} + ], + "transformOptions": [ + "textToPdfOptions" + ] + }, + { + "transformerName": "rfc822", + "supportedSourceAndTargetList": [ + {"sourceMediaType": "message/rfc822", "targetMediaType": "text/plain"} + ], + "transformOptions": [ + ] + } + ] +} \ No newline at end of file diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java similarity index 94% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java rename to alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java index 3141e96c..b75fc053 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java @@ -26,8 +26,11 @@ */ package org.alfresco.transformer.transformers; -import static org.alfresco.transformer.transformers.StringExtractingContentTransformer.SOURCE_ENCODING; -import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Import; +//import org.springframework.test.context.junit4.SpringRunner; import java.io.File; import java.io.FileOutputStream; @@ -36,21 +39,18 @@ import java.nio.file.Files; import java.util.HashMap; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.junit4.SpringRunner; +import static org.alfresco.transformer.transformers.StringExtractingContentTransformer.SOURCE_ENCODING; +import static org.junit.Assert.assertEquals; -@RunWith(SpringRunner.class) -@Import(HtmlParserContentTransformer.class) +//@RunWith(SpringRunner.class) +//@Import(HtmlParserContentTransformer.class) public class HtmlParserContentTransformerTest { private static final String SOURCE_MIMETYPE = "text/html"; private static final String TARGET_MIMETYPE = "text/plain"; - @Autowired - HtmlParserContentTransformer transformer; +// @Autowired + HtmlParserContentTransformer transformer = new HtmlParserContentTransformer(); /** * Checks that we correctly handle text in different encodings, diff --git a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java similarity index 96% rename from alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java rename to alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java index 70acf5e8..ab5c3204 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-spring/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java @@ -26,8 +26,14 @@ */ package org.alfresco.transformer.transformers; -import static org.alfresco.transformer.transformers.TextToPdfContentTransformer.PAGE_LIMIT; -import static org.junit.Assert.assertEquals; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.text.PDFTextStripper; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Import; + import java.io.File; import java.io.FileOutputStream; @@ -36,21 +42,15 @@ import java.io.StringWriter; import java.util.HashMap; import java.util.Map; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.text.PDFTextStripper; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.junit4.SpringRunner; +import static org.alfresco.transformer.transformers.TextToPdfContentTransformer.PAGE_LIMIT; +import static org.junit.Assert.assertEquals; -@RunWith(SpringRunner.class) -@Import(TextToPdfContentTransformer.class) +//@RunWith(SpringRunner.class) +//@Import(TextToPdfContentTransformer.class) public class TextToPdfContentTransformerTest { - @Autowired - TextToPdfContentTransformer transformer; +// @Autowired + TextToPdfContentTransformer transformer = new TextToPdfContentTransformer(); @Before public void setUp()