Author: nick
Date: Thu Jan 10 12:20:56 2013
New Revision: 1431316

URL: http://svn.apache.org/viewvc?rev=1431316&view=rev
Log:
Remove three duplicated mimetype entries (keeping the one with more information 
in the definition each time), from Karel Zacek in TIKA-1052, and add a change 
entry for TIKA-1055

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

Modified: tika/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1431316&r1=1431315&r2=1431316&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Thu Jan 10 12:20:56 2013
@@ -1,5 +1,8 @@
 Release 1.3 - Current Development
 
+  * Mimetype definitions added for more common programming languages,
+    including common extensions, but not magic patterns. (TIKA-1055)
+
   * MS Word: When a Word (.doc) document contains embedded files or
     links to external documents, Tika now places a <div
     class="embedded" id="_XXX"/> placeholder into the XHTML so you can

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=1431316&r1=1431315&r2=1431316&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 
Thu Jan 10 12:20:56 2013
@@ -1350,11 +1350,6 @@
     <sub-class-of type="application/x-tika-ooxml"/>
   </mime-type>
 
-  <mime-type type="application/vnd.ms-excel.template.macroenabled.12">
-    <glob pattern="*.xltm"/>
-    <sub-class-of type="application/x-tika-ooxml"/>
-  </mime-type>
-
   <mime-type type="application/vnd.ms-fontobject">
     <glob pattern="*.eot"/>
   </mime-type>
@@ -1797,11 +1792,6 @@
     <sub-class-of type="application/x-tika-ooxml"/>
   </mime-type>
 
-  <mime-type 
type="application/vnd.openxmlformats-officedocument.presentationml.slideshow">
-    <glob pattern="*.ppsx"/>
-    <sub-class-of type="application/x-tika-ooxml"/>
-  </mime-type>
-
   <mime-type 
type="application/vnd.openxmlformats-officedocument.presentationml.template">
     <_comment>Office Open XML Presentation Template</_comment>
     <glob pattern="*.potx"/>
@@ -5142,10 +5132,6 @@
     <glob pattern="*.m2v"/>
   </mime-type>
 
-  <mime-type type="video/vnd.mpegurl">
-    <glob pattern="*.mxu"/>
-  </mime-type>
-
   <mime-type type="video/mpeg4-generic"/>
   <mime-type type="video/mpv"/>
   <mime-type type="video/nv"/>


Reply via email to