Author: jukka
Date: Sun Sep 27 17:17:31 2009
New Revision: 819349

URL: http://svn.apache.org/viewvc?rev=819349&view=rev
Log:
TIKA-285: Update media type registry to the latest httpd mime type database

Merge tar/gtar and bzip/bzip2 types to avoid complexity in package parsing.

Modified:
    
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml

Modified: 
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=819349&r1=819348&r2=819349&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
 (original)
+++ 
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
 Sun Sep 27 17:17:31 2009
@@ -2094,14 +2094,10 @@
       <match value="BZh" type="string" offset="0"/>
     </magic>
     <glob pattern="*.bz"/>
-    <glob pattern="*.tbz"/>
-  </mime-type>
-
-  <mime-type type="application/x-bzip2">
     <glob pattern="*.bz2"/>
     <glob pattern="*.tbz2"/>
     <glob pattern="*.boz"/>
-    <sub-class-of type="application/x-bzip"/>
+    <glob pattern="*.tbz"/>
   </mime-type>
 
   <mime-type type="application/x-cdlink">
@@ -2224,15 +2220,6 @@
     <glob pattern="*.gnumeric"/>
   </mime-type>
 
-  <mime-type type="application/x-gtar">
-    <magic priority="40">
-      <!-- GNU tar archive -->
-      <match value="ustar  \0" type="string" offset="257" />
-    </magic>
-    <glob pattern="*.gtar"/>
-    <sub-class-of type="application/x-tar"/>
-  </mime-type>
-
   <mime-type type="application/x-gzip">
     <magic priority="40">
       <match value="\037\213" type="string" offset="0" />
@@ -2446,8 +2433,11 @@
     <magic priority="40">
       <!-- POSIX tar archive -->
       <match value="ustar\0" type="string" offset="257" />
+      <!-- GNU tar archive -->
+      <match value="ustar  \0" type="string" offset="257" />
     </magic>
     <glob pattern="*.tar"/>
+    <glob pattern="*.gtar"/>
   </mime-type>
 
   <mime-type type="application/x-tcl">


Reply via email to