Author: nick
Date: Tue Aug 19 16:08:23 2014
New Revision: 1618890
URL: http://svn.apache.org/r1618890
Log:
AxCrypt mimetype, test file and test TIKA-1399
Added:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT-tika.axx
(with props)
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1618890&r1=1618889&r2=1618890&view=diff
==============================================================================
---
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
(original)
+++
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
Tue Aug 19 16:08:23 2014
@@ -2395,6 +2395,17 @@
<glob pattern="*.ace"/>
</mime-type>
+ <mime-type type="application/x-axcrypt">
+ <_comment>AxCrypt</_comment>
+ <glob pattern="*.axx" />
+ <magic priority="60">
+ <!-- AxCrypt block header, skip length field, then Header of type
Preamble -->
+ <match value="0xc0b9072e4f93f146a015792ca1d9e821" type="string"
offset="0">
+ <match value="2" type="big32" offset="17" />
+ </match>
+ </magic>
+ </mime-type>
+
<mime-type type="application/x-adobe-indesign">
<acronym>INDD</acronym>
<_comment>Adobe InDesign document</_comment>
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1618890&r1=1618889&r2=1618890&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
(original)
+++
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Tue Aug 19 16:08:23 2014
@@ -728,6 +728,12 @@ public class TestMimeTypes {
}
@Test
+ public void testAxCrypt() throws Exception {
+ // test-TXT.txt encrypted with a key of "tika"
+ assertTypeDetection("testTXT-tika.axx", "application/x-axcrypt");
+ }
+
+ @Test
public void testMatroskaDetection() throws Exception {
assertType("video/x-matroska", "testMKV.mkv");
// TODO: Need custom detector data detection, see TIKA-1180
Added:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT-tika.axx
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT-tika.axx?rev=1618890&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT-tika.axx
------------------------------------------------------------------------------
svn:executable = *
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testTXT-tika.axx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
