Return-Path: 
 <commits-return-10565-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 25211 invoked from network); 23 Nov 2010 14:18:10 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 23 Nov 2010 14:18:10 -0000
Received: (qmail 56837 invoked by uid 500); 23 Nov 2010 14:18:42 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 56746 invoked by uid 500); 23 Nov 2010 14:18:42 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 56739 invoked by uid 99); 23 Nov 2010 14:18:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 14:18:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 14:18:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4499C23889B1; Tue, 23 Nov 2010 14:17:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1038125 -
 /jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml
Date: Tue, 23 Nov 2010 14:17:06 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101123141706.4499C23889B1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Tue Nov 23 14:17:05 2010
New Revision: 1038125

URL: http://svn.apache.org/viewvc?rev=1038125&view=rev
Log:
JCR-2642: JackrabbitParser and tika parser

Use the new DefaultParser class in Tika 0.8 to automatically pick up new parser plugins while still allowing our custom tika-config.xml file to disable extraction from selected file formats.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml

Modified: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml?rev=1038125&r1=1038124&r2=1038125&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml Tue Nov 23 14:17:05 2010
@@ -19,129 +19,29 @@
 
 <properties>
 
-  <mimeTypeRepository resource="/org/apache/tika/mime/tika-mimetypes.xml" magic="false"/>
-
   <parsers>
 
-    <parser name="parse-dcxml" class="org.apache.tika.parser.xml.DcXMLParser">
-      <mime>application/xml</mime>
-      <mime>image/svg+xml</mime>
-    </parser>
-
-    <parser name="parse-office" class="org.apache.tika.parser.microsoft.OfficeParser">
-      <mime>application/x-tika-msoffice</mime>
-      <mime>application/msword</mime>
-      <mime>application/vnd.ms-excel</mime>
-      <mime>application/vnd.ms-excel.sheet.binary.macroenabled.12</mime>
-      <mime>application/vnd.ms-powerpoint</mime>
-      <mime>application/vnd.visio</mime>
-      <mime>application/vnd.ms-outlook</mime>
-    </parser>
-
-    <parser name="parse-ooxml" class="org.apache.tika.parser.microsoft.ooxml.OOXMLParser">
-      <mime>application/x-tika-ooxml</mime>
-      <mime>application/vnd.openxmlformats-package.core-properties+xml</mime>
-      <mime>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</mime>
-      <mime>application/vnd.openxmlformats-officedocument.spreadsheetml.template</mime>
-      <mime>application/vnd.ms-excel.sheet.macroenabled.12</mime>
-      <mime>application/vnd.ms-excel.template.macroenabled.12</mime>
-      <mime>application/vnd.ms-excel.addin.macroenabled.12</mime>
-      <mime>application/vnd.openxmlformats-officedocument.presentationml.presentation</mime>
-      <mime>application/vnd.openxmlformats-officedocument.presentationml.template</mime>
-      <mime>application/vnd.openxmlformats-officedocument.presentationml.slideshow</mime>
-      <mime>application/vnd.ms-powerpoint.presentation.macroenabled.12</mime>
-      <mime>application/vnd.ms-powerpoint.slideshow.macroenabled.12</mime>
-      <mime>application/vnd.ms-powerpoint.addin.macroenabled.12</mime>
-      <mime>application/vnd.openxmlformats-officedocument.wordprocessingml.document</mime>
-      <mime>application/vnd.openxmlformats-officedocument.wordprocessingml.template</mime>
-      <mime>application/vnd.ms-word.document.macroenabled.12</mime>
-      <mime>application/vnd.ms-word.template.macroenabled.12</mime>
-    </parser>
-
-    <parser name="parse-html" class="org.apache.tika.parser.html.HtmlParser">
-      <mime>text/html</mime>
-      <mime>application/xhtml+xml</mime>
-      <mime>application/vnd.wap.xhtml+xml</mime>
-      <mime>application/x-asp</mime>
-    </parser>
-
-    <parser mame="parse-rtf" class="org.apache.tika.parser.rtf.RTFParser">
-      <mime>application/rtf</mime>
-    </parser>
-
-    <parser name="parse-pdf" class="org.apache.tika.parser.pdf.PDFParser">
-      <mime>application/pdf</mime>
-    </parser>
-
-    <parser name="parse-txt" class="org.apache.tika.parser.txt.TXTParser">
-      <mime>text/plain</mime>
-    </parser>
-
-    <parser name="parse-openoffice" class="org.apache.tika.parser.opendocument.OpenOfficeParser">
-      <mime>application/vnd.sun.xml.writer</mime>
-      <mime>application/vnd.oasis.opendocument.text</mime>
-      <mime>application/vnd.oasis.opendocument.graphics</mime>
-      <mime>application/vnd.oasis.opendocument.presentation</mime>
-      <mime>application/vnd.oasis.opendocument.spreadsheet</mime>
-      <mime>application/vnd.oasis.opendocument.chart</mime>
-      <mime>application/vnd.oasis.opendocument.image</mime>
-      <mime>application/vnd.oasis.opendocument.formula</mime>
-      <mime>application/vnd.oasis.opendocument.text-master</mime>
-      <mime>application/vnd.oasis.opendocument.text-web</mime>
-      <mime>application/vnd.oasis.opendocument.text-template</mime>
-      <mime>application/vnd.oasis.opendocument.graphics-template</mime>
-      <mime>application/vnd.oasis.opendocument.presentation-template</mime>
-      <mime>application/vnd.oasis.opendocument.spreadsheet-template</mime>
-      <mime>application/vnd.oasis.opendocument.chart-template</mime>
-      <mime>application/vnd.oasis.opendocument.image-template</mime>
-      <mime>application/vnd.oasis.opendocument.formula-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.text</mime>
-      <mime>application/x-vnd.oasis.opendocument.graphics</mime>
-      <mime>application/x-vnd.oasis.opendocument.presentation</mime>
-      <mime>application/x-vnd.oasis.opendocument.spreadsheet</mime>
-      <mime>application/x-vnd.oasis.opendocument.chart</mime>
-      <mime>application/x-vnd.oasis.opendocument.image</mime>
-      <mime>application/x-vnd.oasis.opendocument.formula</mime>
-      <mime>application/x-vnd.oasis.opendocument.text-master</mime>
-      <mime>application/x-vnd.oasis.opendocument.text-web</mime>
-      <mime>application/x-vnd.oasis.opendocument.text-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.graphics-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.presentation-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.spreadsheet-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.chart-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.image-template</mime>
-      <mime>application/x-vnd.oasis.opendocument.formula-template</mime>
-    </parser>
-
-    <parser name="parse-class" class="org.apache.tika.parser.asm.ClassParser">
-      <mime>application/java-vm</mime>
-    </parser>
-
-    <parser name="parse-mp3" class="org.apache.tika.parser.mp3.Mp3Parser">
-      <mime>audio/mpeg</mime>
-    </parser>
-
-    <parser name="parse-midi" class="org.apache.tika.parser.audio.MidiParser">
-      <mime>application/x-midi</mime>
-      <mime>audio/midi</mime>
-    </parser>
-
-    <parser name="parse-audio" class="org.apache.tika.parser.audio.AudioParser">
-      <mime>audio/basic</mime>
-      <mime>audio/x-wav</mime>
-      <mime>audio/x-aiff</mime>
-    </parser>
-
-    <parser name="parse-mbox" class="org.apache.tika.parser.mbox.MboxParser">
-      <mime>application/mbox</mime>
-    </parser>
-
-    <parser name="parse-epub" class="org.apache.tika.parser.epub.EpubParser">
-      <mime>application/epub+zip</mime>
-    </parser>
+    <parser class="org.apache.tika.parser.DefaultParser"/>
 
-    <parser name="parse-flv" class="org.apache.tika.parser.video.FLVParser">
-      <mime>video/x-flv</mime>
+    <parser class="org.apache.tika.parser.EmptyParser">
+      <!-- Disable package extraction as it's too resource-intensive -->
+      <mime>application/x-archive</mime>
+      <mime>application/x-bzip</mime>
+      <mime>application/x-bzip2</mime>
+      <mime>application/x-cpio</mime>
+      <mime>application/x-gtar</mime>
+      <mime>application/x-gzip</mime>
+      <mime>application/x-tar</mime>
+      <mime>application/zip</mime>
+      <!-- Disable image extraction as there's no text to be found -->
+      <mime>image/bmp</mime>
+      <mime>image/gif</mime>
+      <mime>image/jpeg</mime>
+      <mime>image/png</mime>
+      <mime>image/vnd.wap.wbmp</mime>
+      <mime>image/x-icon</mime>
+      <mime>image/x-psd</mime>
+      <mime>image/x-xcf</mime>
     </parser>
 
   </parsers>