TIKA-2989 -- add xml root detection for .xdp

nddipiazza · Nov 19, 2019 · 9800dac · 9800dac
1 parent cacfe64
commit 9800dac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
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
@@ -982,6 +982,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
@@ -187,6 +187,12 @@ public void testDigiliteFDF() throws Exception {
                 "testDigilite.fdf");
     }
 
+    @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
@@ -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>