This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit ed4f968872c827938bb78d5cca1925359b91d3da Author: tballison <[email protected]> AuthorDate: Tue Nov 19 15:37:06 2019 -0500 TIKA-2989 -- add xml root detection for .xdp --- .../src/main/resources/org/apache/tika/mime/tika-mimetypes.xml | 2 ++ tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java | 6 ++++++ tika-parsers/src/test/resources/test-documents/testXDP.xdp | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml index d8a8d47..b2d6ec0 100644 --- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml +++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml @@ -954,6 +954,8 @@ <glob pattern="*.aet"/> </mime-type> <mime-type type="application/vnd.adobe.xdp+xml"> + <sub-class-of type="application/xml"/> + <root-XML localName="xdp" namespaceURI="http://ns.adobe.com/xdp/"; /> <glob pattern="*.xdp"/> </mime-type> <mime-type type="application/vnd.adobe.xfdf"> diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java index 2e82e99..3c67edf 100644 --- a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java +++ b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java @@ -187,6 +187,12 @@ public class TestMimeTypes { } @Test + public void testXDP() throws Exception { + assertTypeDetection("testXDP.xdp", + "application/vnd.adobe.xdp+xml"); + } + + @Test public void testHFATypes() throws Exception { assertTypeByData("application/x-erdas-hfa","testHFA.hfa"); } diff --git a/tika-parsers/src/test/resources/test-documents/testXDP.xdp b/tika-parsers/src/test/resources/test-documents/testXDP.xdp new file mode 100644 index 0000000..649f77b --- /dev/null +++ b/tika-parsers/src/test/resources/test-documents/testXDP.xdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xfa generator="XFA2_0" APIVersion="1.4.3062.0"?> +<xdp:xdp xmlns:xdp="http://ns.adobe.com/xdp/";> +<config xmlns="http://www.xfa.org/schema/xci/1.0/"; xmlns:xfa="http://www.xfa.org/schema/xci/1.0/"; +></config></xdp:xdp>
