Index: src/test/java/org/apache/tika/TestParsers.java
===================================================================
--- src/test/java/org/apache/tika/TestParsers.java	(Revision 642624)
+++ src/test/java/org/apache/tika/TestParsers.java	(Arbeitskopie)
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.List;
 
 import junit.framework.TestCase;
@@ -37,33 +38,12 @@
 
     private TikaConfig tc;
 
-    private File testFilesBaseDir;
-
     public void setUp() throws Exception {
-        /*
-         * FIXME the old mechanism does not work anymore when running the tests
-         * with Maven - need a resource-based one, but this means more changes
-         * to classes which rely on filenames.
-         * 
-         * String sep = File.separator; StringTokenizer st = new
-         * StringTokenizer(System.getProperty( "java.class.path"),
-         * File.pathSeparator);
-         * 
-         * classDir = new File(st.nextToken());
-         * 
-         * config = classDir.getParent() + sep + "config" + sep + "config.xml";
-         * 
-         * String log4j = classDir.getParent() + sep + "Config" + sep + "log4j" +
-         * sep + "log4j.properties";
-         */
-
-        testFilesBaseDir = new File("src/test/resources/test-documents");
-
         tc = TikaConfig.getDefaultConfig();
     }
 
     public void testPDFExtraction() throws Exception {
-        File file = getTestFile("testPDF.pdf");
+        File file = getResourceAsFile("/test-documents/testPDF.pdf");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "application/pdf");
         String s3 = ParseUtils.getStringContent(file, TikaConfig
@@ -73,28 +53,28 @@
     }
 
     public void testTXTExtraction() throws Exception {
-        File file = getTestFile("testTXT.txt");
+        File file = getResourceAsFile("/test-documents/testTXT.txt");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "text/plain");
         assertEquals(s1, s2);
     }
 
     public void testRTFExtraction() throws Exception {
-        File file = getTestFile("testRTF.rtf");
+        File file = getResourceAsFile("/test-documents/testRTF.rtf");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "application/rtf");
         assertEquals(s1, s2);
     }
 
     public void testXMLExtraction() throws Exception {
-        File file = getTestFile("testXML.xml");
+        File file = getResourceAsFile("/test-documents/testXML.xml");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "application/xml");
         assertEquals(s1, s2);
     }
 
     public void testPPTExtraction() throws Exception {
-        File file = getTestFile("testPPT.ppt");
+        File file = getResourceAsFile("/test-documents/testPPT.ppt");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(
                 file, tc, "application/vnd.ms-powerpoint");
@@ -111,7 +91,7 @@
     }
 
     public void testWORDxtraction() throws Exception {
-        File file = getTestFile("testWORD.doc");
+        File file = getResourceAsFile("/test-documents/testWORD.doc");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "application/msword");
         assertEquals(s1, s2);
@@ -128,7 +108,7 @@
 
     public void testEXCELExtraction() throws Exception {
         final String expected = "Numbers and their Squares";
-        File file = getTestFile("testEXCEL.xls");
+        File file = getResourceAsFile("/test-documents/testEXCEL.xls");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "application/vnd.ms-excel");
         assertEquals(s1, s2);
@@ -146,7 +126,7 @@
     }
 
     public void testOOExtraction() throws Exception {
-        File file = getTestFile("testOpenOffice2.odt");
+        File file = getResourceAsFile("/test-documents/testOpenOffice2.odt");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc,
         "application/vnd.oasis.opendocument.text");
@@ -154,7 +134,7 @@
     }
 
     public void testHTMLExtraction() throws Exception {
-        File file = getTestFile("testHTML.html");
+        File file = getResourceAsFile("/test-documents/testHTML.html");
         String s1 = ParseUtils.getStringContent(file, tc);
         String s2 = ParseUtils.getStringContent(file, tc, "text/html");
         assertEquals(s1, s2);
@@ -164,7 +144,7 @@
     }
 
     public void testZipExtraction() throws Exception {
-        File zip = getTestFile("test-documents.zip");
+        File zip = getResourceAsFile("/test-documents/test-documents.zip");
         List<Parser> parsers = ParseUtils.getParsersFromZip(zip, tc);
         List<File> zipFiles = Utils.unzip(new FileInputStream(zip));
         for (int i = 0; i < parsers.size(); i++) {
@@ -188,8 +168,37 @@
         }
     }
 
-    private File getTestFile(String filename) {
-        return new File(testFilesBaseDir, filename);
+	/**
+	 * This method will give you back
+	 * the filename incl. the absolute path name
+	 * to the resource. 
+	 * If the resource does not exist it will give
+	 * you back the resource name incl. the path.
+	 * 
+	 * It will give you back an absolute path
+	 * incl. the name which is in the same directory 
+	 * as the the class you've called it from.
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public String getFileResource(String name) {
+		URL url = this.getClass().getResource(name);
+		if (url != null) {
+			return url.getFile();
+		} else {
+			//We have a file which does not exists
+			//We got the path
+			url = this.getClass().getResource(".");
+			return url.getFile() + name;
+		}
+	}
+
+    public File getResourceAsFile(String filename) {
+    	return new File(getFileResource(filename));
     }
+	public InputStream getResourceAsStream(String name) {
+		return this.getClass().getResourceAsStream(name);
+	}
 
 }
Index: src/test/resources/org/apache/tika/tika-config.xml
===================================================================
--- src/test/resources/org/apache/tika/tika-config.xml	(Revision 0)
+++ src/test/resources/org/apache/tika/tika-config.xml	(Revision 0)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<properties>
+
+    <mimeTypeRepository resource="/org/apache/tika/mime/tika-mimetypes.xml" magic="false"/>
+
+    <parsers>
+
+        <parser name="text-xml" class="org.apache.tika.parser.xml.DcXMLParser">
+                <mime>application/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-powerpoint</mime>
+                <mime>application/vnd.visio</mime>
+        </parser>
+
+        <parser name="parse-html" class="org.apache.tika.parser.html.HtmlParser">
+                <mime>text/html</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>
+
+    </parsers>
+
+</properties>
\ Kein Zeilenvorschub am Ende der Datei
Index: src/main/resources/mime/tika-mimetypes.xml
===================================================================
--- src/main/resources/mime/tika-mimetypes.xml	(Revision 642624)
+++ src/main/resources/mime/tika-mimetypes.xml	(Arbeitskopie)
@@ -1,649 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements.  See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You under the Apache License, Version 2.0
-	(the "License"); you may not use this file except in compliance with
-	the License.  You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-	
-	Description: This xml file defines the valid mime types used by Tika.
-	The mime types within this file are based on the types in the mime-types.xml 
-	file available in Apache Nutch.
--->
-
-<mime-info>
-
-	<mime-type type="text/plain">
-		<magic priority="50">
-			<match value="This is TeX," type="string" offset="0" />
-			<match value="This is METAFONT," type="string" offset="0" />
-		</magic>
-		<glob pattern="*.txt" />
-		<glob pattern="*.asc" />
-
-		<!-- TIKA-85: http://www.apache.org/dev/svn-eol-style.txt -->
-		<glob pattern="INSTALL" />
-		<glob pattern="KEYS" />
-		<glob pattern="Makefile" />
-		<glob pattern="README" />
-		<glob pattern="abs-linkmap" />
-		<glob pattern="abs-menulinks" />
-		<glob pattern="*.aart" />
-		<glob pattern="*.ac" />
-		<glob pattern="*.am" />
-		<glob pattern="*.bat" />
-		<glob pattern="*.c" />
-		<glob pattern="*.cat" />
-		<glob pattern="*.cgi" />
-		<glob pattern="*.classpath" />
-		<glob pattern="*.cmd" />
-		<glob pattern="*.conf" />
-		<glob pattern="*.config" />
-		<glob pattern="*.cpp" />
-		<glob pattern="*.css" />
-		<glob pattern="*.cwiki" />
-		<glob pattern="*.data" />
-		<glob pattern="*.dcl" />
-		<glob pattern="*.dtd" />
-		<glob pattern="*.egrm" />
-		<glob pattern="*.ent" />
-		<glob pattern="*.ft" />
-		<glob pattern="*.fn" />
-		<glob pattern="*.fv" />
-		<glob pattern="*.grm" />
-		<glob pattern="*.g" />
-		<glob pattern="*.h" />
-		<glob pattern=".htaccess" />
-		<glob pattern="*.ihtml" />
-		<glob pattern="*.in" />
-		<glob pattern="*.java" />
-		<glob pattern="*.jmx" />
-		<glob pattern="*.jsp" />
-		<glob pattern="*.js" />
-		<glob pattern="*.junit" />
-		<glob pattern="*.jx" />
-		<glob pattern="*.manifest" />
-		<glob pattern="*.m4" />
-		<glob pattern="*.mf" />
-		<glob pattern="*.MF" />
-		<glob pattern="*.meta" />
-		<glob pattern="*.mod" />
-		<glob pattern="*.n3" />
-		<glob pattern="*.pen" />
-		<glob pattern="*.pl" />
-		<glob pattern="*.pm" />
-		<glob pattern="*.pod" />
-		<glob pattern="*.pom" />
-		<glob pattern="*.project" />
-		<glob pattern="*.properties" />
-		<glob pattern="*.py" />
-		<glob pattern="*.rb" />
-		<glob pattern="*.rdf" />
-		<glob pattern="*.rnc" />
-		<glob pattern="*.rng" />
-		<glob pattern="*.rnx" />
-		<glob pattern="*.roles" />
-		<glob pattern="*.sh" />
-		<glob pattern="*.sql" />
-		<glob pattern="*.svg" />
-		<glob pattern="*.tld" />
-		<glob pattern="*.types" />
-		<glob pattern="*.vm" />
-		<glob pattern="*.vsl" />
-		<glob pattern="*.wsdd" />
-		<glob pattern="*.wsdl" />
-		<glob pattern="*.xargs" />
-		<glob pattern="*.xcat" />
-		<glob pattern="*.xconf" />
-		<glob pattern="*.xegrm" />
-		<glob pattern="*.xgrm" />
-		<glob pattern="*.xlex" />
-		<glob pattern="*.xlog" />
-		<glob pattern="*.xmap" />
-		<glob pattern="*.xroles" />
-		<glob pattern="*.xsamples" />
-		<glob pattern="*.xsd" />
-		<glob pattern="*.xsl" />
-		<glob pattern="*.xslt" />
-		<glob pattern="*.xsp" />
-		<glob pattern="*.xul" />
-		<glob pattern="*.xweb" />
-		<glob pattern="*.xwelcome" />
-	</mime-type>
-
-	<mime-type type="text/html">
-		<magic priority="50">
-			<match value="&lt;!DOCTYPE HTML" type="string"
-				offset="0:64" />
-			<match value="&lt;!doctype html" type="string"
-				offset="0:64" />
-			<match value="&lt;HEAD" type="string" offset="0:64" />
-			<match value="&lt;head" type="string" offset="0:64" />
-			<match value="&lt;TITLE" type="string" offset="0:64" />
-			<match value="&lt;title" type="string" offset="0:64" />
-			<match value="&lt;html" type="string" offset="0:64" />
-			<match value="&lt;HTML" type="string" offset="0:64" />
-			<match value="&lt;BODY" type="string" offset="0" />
-			<match value="&lt;body" type="string" offset="0" />
-			<match value="&lt;TITLE" type="string" offset="0" />
-			<match value="&lt;title" type="string" offset="0" />
-			<match value="&lt;!--" type="string" offset="0" />
-			<match value="&lt;h1" type="string" offset="0" />
-			<match value="&lt;H1" type="string" offset="0" />
-			<match value="&lt;!doctype HTML" type="string" offset="0" />
-			<match value="&lt;!DOCTYPE html" type="string" offset="0" />
-		</magic>
-		<glob pattern="*.html" />
-		<glob pattern="*.htm" />
-	</mime-type>
-
-	<mime-type type="application/xhtml+xml">
-		<sub-class-of type="application/xml" />
-		<glob pattern="*.xhtml" />
-		<root-XML namespaceURI='http://www.w3.org/1999/xhtml'
-			localName='html' />
-	</mime-type>
-
-
-        <mime-type type="application/x-tika-msoffice">
-                <magic>
-                        <match value="0xd0cf11e0a1b11ae1" type="string" offset="0:8"/>
-                </magic>
-        </mime-type>
-
-        <!-- http://www.iana.org/assignments/media-types/application/vnd.visio -->
-        <mime-type type="application/vnd.visio">
-                <glob pattern="*.vsd"/>
-                <glob pattern="*.vst"/>
-                <glob pattern="*.vsw"/>
-                <glob pattern="*.vss"/>
-        </mime-type>
-
-	<mime-type type="application/vnd.ms-powerpoint">
-		<glob pattern="*.ppz" />
-		<glob pattern="*.ppt" />
-		<glob pattern="*.pps" />
-		<glob pattern="*.pot" />
-	</mime-type>
-
-	<mime-type type="application/vnd.ms-excel">
-		<glob pattern="*.xls" />
-		<glob pattern="*.xlc" />
-		<glob pattern="*.xll" />
-		<glob pattern="*.xlm" />
-		<glob pattern="*.xlw" />
-		<glob pattern="*.xla" />
-		<glob pattern="*.xlt" />
-		<glob pattern="*.xld" />
-		<alias type="application/msexcel" />
-	</mime-type>
-
-<!-- ===================================================================== -->
-<!-- Open Document Format for Office Applications (OpenDocument) v1.0      -->
-<!-- http://www.oasis-open.org/specs/index.php#opendocumentv1.0            -->
-<!-- ===================================================================== -->
-
-	<mime-type type="application/vnd.oasis.opendocument.text">
-		<comment>OpenDocument v1.0: Text document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.text" />
-		<glob pattern="*.odt" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.text" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.text-template">
-		<comment>OpenDocument v1.0: Text document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.text-template" />
-		<glob pattern="*.ott" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.text-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.graphics">
-		<comment>OpenDocument v1.0: Graphics document (Drawing)</comment>
-		<alias type="application/x-vnd.oasis.opendocument.graphics" />
-		<glob pattern="*.odg" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.graphics" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.graphics-template">
-		<comment>OpenDocument v1.0: Graphics document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.graphics-template" />
-		<glob pattern="*.otg" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.graphics-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.presentation">
-		<comment>OpenDocument v1.0: Presentation document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.presentation" />
-		<glob pattern="*.odp" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.presentation" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.presentation-template">
-		<comment>OpenDocument v1.0: Presentation document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.presentation-template" />
-		<glob pattern="*.otp" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.presentation-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.spreadsheet">
-		<comment>OpenDocument v1.0: Spreadsheet document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.spreadsheet" />
-		<glob pattern="*.ods" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.spreadsheet" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.spreadsheet-template">
-		<comment>OpenDocument v1.0: Spreadsheet document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.spreadsheet-template" />
-		<glob pattern="*.ots" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.spreadsheet-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.chart">
-		<comment>OpenDocument v1.0: Chart document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.chart" />
-		<glob pattern="*.odc" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.chart" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.chart-template">
-		<comment>OpenDocument v1.0: Chart document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.chart-template" />
-		<glob pattern="*.otc" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.chart-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.image">
-		<comment>OpenDocument v1.0: Image document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.image" />
-		<glob pattern="*.odi" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.image" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.image-template">
-		<comment>OpenDocument v1.0: Image document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.image-template" />
-		<glob pattern="*.oti" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.image-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.formula">
-		<comment>OpenDocument v1.0: Formula document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.formula" />
-		<glob pattern="*.odf" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.formula" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.formula-template">
-		<comment>OpenDocument v1.0: Formula document used as template</comment>
-		<alias type="application/x-vnd.oasis.opendocument.formula-template" />
-		<glob pattern="*.otf" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.formula-template" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.text-master">
-		<comment>OpenDocument v1.0: Global Text document</comment>
-		<alias type="application/x-vnd.oasis.opendocument.text-master" />
-		<glob pattern="*.odm" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.text-master" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/vnd.oasis.opendocument.text-web">
-		<comment>OpenDocument v1.0: Text document used as template for HTML documents</comment>
-		<alias type="application/x-vnd.oasis.opendocument.text-web" />
-		<glob pattern="*.oth" />
-		<magic>
-			<match type="string" offset="0" value="PK">
-				<match type="string" offset="30"
-					value="mimetypeapplication/vnd.oasis.opendocument.text-web" />
-			</match>
-		</magic>
-	</mime-type>
-
-	<mime-type type="application/zip">
-		<alias type="application/x-zip-compressed" />
-		<magic priority="40">
-			<match value="PK\003\004" type="string" offset="0" />
-		</magic>
-		<glob pattern="*.zip" />
-	</mime-type>
-
-	<mime-type type="application/msword">
-		<glob pattern="*.doc" />
-		<alias type="application/vnd.ms-word" />
-	</mime-type>
-
-	<mime-type type="application/octet-stream">
-		<magic priority="50">
-			<match value="\037\036" type="string" offset="0" />
-			<match value="017437" type="host16" offset="0" />
-			<match value="0x1fff" type="host16" offset="0" />
-			<match value="\377\037" type="string" offset="0" />
-			<match value="0145405" type="host16" offset="0" />
-		</magic>
-		<glob pattern="*.bin" />
-	</mime-type>
-
-	<mime-type type="application/pdf">
-		<magic priority="50">
-			<match value="%PDF-" type="string" offset="0" />
-		</magic>
-		<glob pattern="*.pdf" />
-		<alias type="application/x-pdf" />
-	</mime-type>
-
-	<mime-type type="application/atom+xml">
-		<root-XML localName="feed"
-			namespaceURI="http://purl.org/atom/ns#" />
-	</mime-type>
-
-	<mime-type type="application/mac-binhex40">
-		<glob pattern="*.hqx" />
-	</mime-type>
-
-	<mime-type type="application/mac-compactpro">
-		<glob pattern="*.cpt" />
-	</mime-type>
-
-	<mime-type type="application/rtf">
-                <magic priority="50">
-                        <match value="{\rtf" type="string" offset="0" />
-                </magic>
-	    <glob pattern="*.rtf"/>
-		<alias type="text/rtf" />
-	</mime-type>
-
-	<mime-type type="application/rss+xml">
-		<alias type="text/rss" />
-		<root-XML localName="rss" />
-		<root-XML namespaceURI="http://purl.org/rss/1.0/" />
-		<glob pattern="*.rss" />
-	</mime-type>
-
-	<!--  added in by mattmann -->
-	<mime-type type="application/xml">
-		<alias type="text/xml" />
-		<glob pattern="*.xml" />
-	</mime-type>
-
-	<mime-type type="application/x-mif">
-		<alias type="application/vnd.mif" />
-	</mime-type>
-
-	<mime-type type="application/vnd.wap.wbxml">
-		<glob pattern="*.wbxml" />
-	</mime-type>
-
-	<mime-type type="application/vnd.wap.wmlc">
-		<_comment>Compiled WML Document</_comment>
-		<glob pattern="*.wmlc" />
-	</mime-type>
-
-	<mime-type type="application/vnd.wap.wmlscriptc">
-		<_comment>Compiled WML Script</_comment>
-		<glob pattern="*.wmlsc" />
-	</mime-type>
-
-	<mime-type type="text/vnd.wap.wmlscript">
-		<_comment>WML Script</_comment>
-		<glob pattern="*.wmls" />
-	</mime-type>
-
-	<mime-type type="application/x-bzip">
-		<alias type="application/x-bzip2" />
-	</mime-type>
-
-	<mime-type type="application/x-bzip-compressed-tar">
-		<glob pattern="*.tbz" />
-		<glob pattern="*.tbz2" />
-	</mime-type>
-
-	<mime-type type="application/x-cdlink">
-		<_comment>Virtual CD-ROM CD Image File</_comment>
-		<glob pattern="*.vcd" />
-	</mime-type>
-
-	<mime-type type="application/x-director">
-		<_comment>Shockwave Movie</_comment>
-		<glob pattern="*.dcr" />
-		<glob pattern="*.dir" />
-		<glob pattern="*.dxr" />
-	</mime-type>
-
-	<mime-type type="application/x-futuresplash">
-		<_comment>Macromedia FutureSplash File</_comment>
-		<glob pattern="*.spl" />
-	</mime-type>
-
-	<mime-type type="application/x-java">
-		<alias type="application/java" />
-	</mime-type>
-
-	<mime-type type="application/x-koan">
-		<_comment>SSEYO Koan File</_comment>
-		<glob pattern="*.skp" />
-		<glob pattern="*.skd" />
-		<glob pattern="*.skt" />
-		<glob pattern="*.skm" />
-	</mime-type>
-
-	<mime-type type="application/x-latex">
-		<_comment>LaTeX Source Document</_comment>
-		<glob pattern="*.latex" />
-	</mime-type>
-
-	<!-- JC CHANGED
-		<mime-type type="application/x-mif">
-		<_comment>FrameMaker MIF document</_comment>
-		<glob pattern="*.mif"/>
-		</mime-type> -->
-
-	<mime-type type="application/x-ms-dos-executable">
-		<alias type="application/x-dosexec" />
-	</mime-type>
-
-	<mime-type type="application/ogg">
-		<alias type="application/x-ogg" />
-	</mime-type>
-
-	<mime-type type="application/x-rar">
-		<alias type="application/x-rar-compressed" />
-	</mime-type>
-
-	<mime-type type="application/x-shellscript">
-		<alias type="application/x-sh" />
-	</mime-type>
-
-	<mime-type type="application/xhtml+xml">
-		<glob pattern="*.xht" />
-	</mime-type>
-
-	<mime-type type="audio/midi">
-		<glob pattern="*.kar" />
-	</mime-type>
-
-	<mime-type type="audio/x-pn-realaudio">
-		<alias type="audio/x-realaudio" />
-	</mime-type>
-
-	<mime-type type="image/tiff">
-		<magic priority="50">
-			<match value="0x4d4d2a00" type="string" offset="0" />
-			<match value="0x49492a00" type="string" offset="0" />
-		</magic>
-	</mime-type>
-
-	<mime-type type="message/rfc822">
-		<magic priority="50">
-			<match type="string" value="Relay-Version:" offset="0" />
-			<match type="string" value="#! rnews" offset="0" />
-			<match type="string" value="N#! rnews" offset="0" />
-			<match type="string" value="Forward to" offset="0" />
-			<match type="string" value="Pipe to" offset="0" />
-			<match type="string" value="Return-Path:" offset="0" />
-			<match type="string" value="From:" offset="0" />
-			<match type="string" value="Message-ID:" offset="0" />
-			<match type="string" value="Date:" offset="0" />
-		</magic>
-	</mime-type>
-
-	<mime-type type="image/vnd.wap.wbmp">
-		<_comment>Wireless Bitmap File Format</_comment>
-		<glob pattern="*.wbmp" />
-	</mime-type>
-
-	<mime-type type="image/x-psd">
-		<alias type="image/photoshop" />
-	</mime-type>
-
-	<mime-type type="image/x-xcf">
-		<alias type="image/xcf" />
-		<magic priority="50">
-			<match type="string" value="gimp xcf " offset="0" />
-		</magic>
-	</mime-type>
-
-	<mime-type type="model/iges">
-		<_comment>
-			Initial Graphics Exchange Specification Format
-		</_comment>
-		<glob pattern="*.igs" />
-		<glob pattern="*.iges" />
-	</mime-type>
-
-	<mime-type type="model/mesh">
-		<glob pattern="*.msh" />
-		<glob pattern="*.mesh" />
-		<glob pattern="*.silo" />
-	</mime-type>
-
-	<mime-type type="model/vrml">
-		<glob pattern="*.vrml" />
-	</mime-type>
-
-	<mime-type type="text/x-tcl">
-		<alias type="application/x-tcl" />
-	</mime-type>
-
-	<mime-type type="text/x-tex">
-		<alias type="application/x-tex" />
-	</mime-type>
-
-	<mime-type type="text/x-texinfo">
-		<alias type="application/x-texinfo" />
-	</mime-type>
-
-	<mime-type type="text/x-troff-me">
-		<alias type="application/x-troff-me" />
-	</mime-type>
-
-	<mime-type type="video/vnd.mpegurl">
-		<glob pattern="*.mxu" />
-	</mime-type>
-
-	<mime-type type="x-conference/x-cooltalk">
-		<_comment>Cooltalk Audio</_comment>
-		<glob pattern="*.ice" />
-	</mime-type>
-
-<!-- ===================================================================== -->
-<!-- TIKA-85: http://www.apache.org/dev/svn-eol-style.txt                  -->
-<!-- ===================================================================== -->
-
-	<mime-type type="image/x-icon">
-		<glob pattern="*.ico" />
-	</mime-type>
-
-	<mime-type type="image/jpeg">
-		<glob pattern="*.jpg" />
-	</mime-type>
-
-	<mime-type type="image/png">
-		<glob pattern="*.png" />
-	</mime-type>
-
-</mime-info>
Index: src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
===================================================================
--- src/main/resources/org/apache/tika/mime/tika-mimetypes.xml	(Revision 0)
+++ src/main/resources/org/apache/tika/mime/tika-mimetypes.xml	(Revision 0)
@@ -0,0 +1,649 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	contributor license agreements.  See the NOTICE file distributed with
+	this work for additional information regarding copyright ownership.
+	The ASF licenses this file to You under the Apache License, Version 2.0
+	(the "License"); you may not use this file except in compliance with
+	the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
+	Description: This xml file defines the valid mime types used by Tika.
+	The mime types within this file are based on the types in the mime-types.xml 
+	file available in Apache Nutch.
+-->
+
+<mime-info>
+
+	<mime-type type="text/plain">
+		<magic priority="50">
+			<match value="This is TeX," type="string" offset="0" />
+			<match value="This is METAFONT," type="string" offset="0" />
+		</magic>
+		<glob pattern="*.txt" />
+		<glob pattern="*.asc" />
+
+		<!-- TIKA-85: http://www.apache.org/dev/svn-eol-style.txt -->
+		<glob pattern="INSTALL" />
+		<glob pattern="KEYS" />
+		<glob pattern="Makefile" />
+		<glob pattern="README" />
+		<glob pattern="abs-linkmap" />
+		<glob pattern="abs-menulinks" />
+		<glob pattern="*.aart" />
+		<glob pattern="*.ac" />
+		<glob pattern="*.am" />
+		<glob pattern="*.bat" />
+		<glob pattern="*.c" />
+		<glob pattern="*.cat" />
+		<glob pattern="*.cgi" />
+		<glob pattern="*.classpath" />
+		<glob pattern="*.cmd" />
+		<glob pattern="*.conf" />
+		<glob pattern="*.config" />
+		<glob pattern="*.cpp" />
+		<glob pattern="*.css" />
+		<glob pattern="*.cwiki" />
+		<glob pattern="*.data" />
+		<glob pattern="*.dcl" />
+		<glob pattern="*.dtd" />
+		<glob pattern="*.egrm" />
+		<glob pattern="*.ent" />
+		<glob pattern="*.ft" />
+		<glob pattern="*.fn" />
+		<glob pattern="*.fv" />
+		<glob pattern="*.grm" />
+		<glob pattern="*.g" />
+		<glob pattern="*.h" />
+		<glob pattern=".htaccess" />
+		<glob pattern="*.ihtml" />
+		<glob pattern="*.in" />
+		<glob pattern="*.java" />
+		<glob pattern="*.jmx" />
+		<glob pattern="*.jsp" />
+		<glob pattern="*.js" />
+		<glob pattern="*.junit" />
+		<glob pattern="*.jx" />
+		<glob pattern="*.manifest" />
+		<glob pattern="*.m4" />
+		<glob pattern="*.mf" />
+		<glob pattern="*.MF" />
+		<glob pattern="*.meta" />
+		<glob pattern="*.mod" />
+		<glob pattern="*.n3" />
+		<glob pattern="*.pen" />
+		<glob pattern="*.pl" />
+		<glob pattern="*.pm" />
+		<glob pattern="*.pod" />
+		<glob pattern="*.pom" />
+		<glob pattern="*.project" />
+		<glob pattern="*.properties" />
+		<glob pattern="*.py" />
+		<glob pattern="*.rb" />
+		<glob pattern="*.rdf" />
+		<glob pattern="*.rnc" />
+		<glob pattern="*.rng" />
+		<glob pattern="*.rnx" />
+		<glob pattern="*.roles" />
+		<glob pattern="*.sh" />
+		<glob pattern="*.sql" />
+		<glob pattern="*.svg" />
+		<glob pattern="*.tld" />
+		<glob pattern="*.types" />
+		<glob pattern="*.vm" />
+		<glob pattern="*.vsl" />
+		<glob pattern="*.wsdd" />
+		<glob pattern="*.wsdl" />
+		<glob pattern="*.xargs" />
+		<glob pattern="*.xcat" />
+		<glob pattern="*.xconf" />
+		<glob pattern="*.xegrm" />
+		<glob pattern="*.xgrm" />
+		<glob pattern="*.xlex" />
+		<glob pattern="*.xlog" />
+		<glob pattern="*.xmap" />
+		<glob pattern="*.xroles" />
+		<glob pattern="*.xsamples" />
+		<glob pattern="*.xsd" />
+		<glob pattern="*.xsl" />
+		<glob pattern="*.xslt" />
+		<glob pattern="*.xsp" />
+		<glob pattern="*.xul" />
+		<glob pattern="*.xweb" />
+		<glob pattern="*.xwelcome" />
+	</mime-type>
+
+	<mime-type type="text/html">
+		<magic priority="50">
+			<match value="&lt;!DOCTYPE HTML" type="string"
+				offset="0:64" />
+			<match value="&lt;!doctype html" type="string"
+				offset="0:64" />
+			<match value="&lt;HEAD" type="string" offset="0:64" />
+			<match value="&lt;head" type="string" offset="0:64" />
+			<match value="&lt;TITLE" type="string" offset="0:64" />
+			<match value="&lt;title" type="string" offset="0:64" />
+			<match value="&lt;html" type="string" offset="0:64" />
+			<match value="&lt;HTML" type="string" offset="0:64" />
+			<match value="&lt;BODY" type="string" offset="0" />
+			<match value="&lt;body" type="string" offset="0" />
+			<match value="&lt;TITLE" type="string" offset="0" />
+			<match value="&lt;title" type="string" offset="0" />
+			<match value="&lt;!--" type="string" offset="0" />
+			<match value="&lt;h1" type="string" offset="0" />
+			<match value="&lt;H1" type="string" offset="0" />
+			<match value="&lt;!doctype HTML" type="string" offset="0" />
+			<match value="&lt;!DOCTYPE html" type="string" offset="0" />
+		</magic>
+		<glob pattern="*.html" />
+		<glob pattern="*.htm" />
+	</mime-type>
+
+	<mime-type type="application/xhtml+xml">
+		<sub-class-of type="application/xml" />
+		<glob pattern="*.xhtml" />
+		<root-XML namespaceURI='http://www.w3.org/1999/xhtml'
+			localName='html' />
+	</mime-type>
+
+
+        <mime-type type="application/x-tika-msoffice">
+                <magic>
+                        <match value="0xd0cf11e0a1b11ae1" type="string" offset="0:8"/>
+                </magic>
+        </mime-type>
+
+        <!-- http://www.iana.org/assignments/media-types/application/vnd.visio -->
+        <mime-type type="application/vnd.visio">
+                <glob pattern="*.vsd"/>
+                <glob pattern="*.vst"/>
+                <glob pattern="*.vsw"/>
+                <glob pattern="*.vss"/>
+        </mime-type>
+
+	<mime-type type="application/vnd.ms-powerpoint">
+		<glob pattern="*.ppz" />
+		<glob pattern="*.ppt" />
+		<glob pattern="*.pps" />
+		<glob pattern="*.pot" />
+	</mime-type>
+
+	<mime-type type="application/vnd.ms-excel">
+		<glob pattern="*.xls" />
+		<glob pattern="*.xlc" />
+		<glob pattern="*.xll" />
+		<glob pattern="*.xlm" />
+		<glob pattern="*.xlw" />
+		<glob pattern="*.xla" />
+		<glob pattern="*.xlt" />
+		<glob pattern="*.xld" />
+		<alias type="application/msexcel" />
+	</mime-type>
+
+<!-- ===================================================================== -->
+<!-- Open Document Format for Office Applications (OpenDocument) v1.0      -->
+<!-- http://www.oasis-open.org/specs/index.php#opendocumentv1.0            -->
+<!-- ===================================================================== -->
+
+	<mime-type type="application/vnd.oasis.opendocument.text">
+		<comment>OpenDocument v1.0: Text document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.text" />
+		<glob pattern="*.odt" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.text" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.text-template">
+		<comment>OpenDocument v1.0: Text document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.text-template" />
+		<glob pattern="*.ott" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.text-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.graphics">
+		<comment>OpenDocument v1.0: Graphics document (Drawing)</comment>
+		<alias type="application/x-vnd.oasis.opendocument.graphics" />
+		<glob pattern="*.odg" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.graphics" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.graphics-template">
+		<comment>OpenDocument v1.0: Graphics document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.graphics-template" />
+		<glob pattern="*.otg" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.graphics-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.presentation">
+		<comment>OpenDocument v1.0: Presentation document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.presentation" />
+		<glob pattern="*.odp" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.presentation" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.presentation-template">
+		<comment>OpenDocument v1.0: Presentation document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.presentation-template" />
+		<glob pattern="*.otp" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.presentation-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.spreadsheet">
+		<comment>OpenDocument v1.0: Spreadsheet document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.spreadsheet" />
+		<glob pattern="*.ods" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.spreadsheet" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.spreadsheet-template">
+		<comment>OpenDocument v1.0: Spreadsheet document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.spreadsheet-template" />
+		<glob pattern="*.ots" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.spreadsheet-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.chart">
+		<comment>OpenDocument v1.0: Chart document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.chart" />
+		<glob pattern="*.odc" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.chart" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.chart-template">
+		<comment>OpenDocument v1.0: Chart document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.chart-template" />
+		<glob pattern="*.otc" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.chart-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.image">
+		<comment>OpenDocument v1.0: Image document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.image" />
+		<glob pattern="*.odi" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.image" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.image-template">
+		<comment>OpenDocument v1.0: Image document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.image-template" />
+		<glob pattern="*.oti" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.image-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.formula">
+		<comment>OpenDocument v1.0: Formula document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.formula" />
+		<glob pattern="*.odf" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.formula" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.formula-template">
+		<comment>OpenDocument v1.0: Formula document used as template</comment>
+		<alias type="application/x-vnd.oasis.opendocument.formula-template" />
+		<glob pattern="*.otf" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.formula-template" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.text-master">
+		<comment>OpenDocument v1.0: Global Text document</comment>
+		<alias type="application/x-vnd.oasis.opendocument.text-master" />
+		<glob pattern="*.odm" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.text-master" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/vnd.oasis.opendocument.text-web">
+		<comment>OpenDocument v1.0: Text document used as template for HTML documents</comment>
+		<alias type="application/x-vnd.oasis.opendocument.text-web" />
+		<glob pattern="*.oth" />
+		<magic>
+			<match type="string" offset="0" value="PK">
+				<match type="string" offset="30"
+					value="mimetypeapplication/vnd.oasis.opendocument.text-web" />
+			</match>
+		</magic>
+	</mime-type>
+
+	<mime-type type="application/zip">
+		<alias type="application/x-zip-compressed" />
+		<magic priority="40">
+			<match value="PK\003\004" type="string" offset="0" />
+		</magic>
+		<glob pattern="*.zip" />
+	</mime-type>
+
+	<mime-type type="application/msword">
+		<glob pattern="*.doc" />
+		<alias type="application/vnd.ms-word" />
+	</mime-type>
+
+	<mime-type type="application/octet-stream">
+		<magic priority="50">
+			<match value="\037\036" type="string" offset="0" />
+			<match value="017437" type="host16" offset="0" />
+			<match value="0x1fff" type="host16" offset="0" />
+			<match value="\377\037" type="string" offset="0" />
+			<match value="0145405" type="host16" offset="0" />
+		</magic>
+		<glob pattern="*.bin" />
+	</mime-type>
+
+	<mime-type type="application/pdf">
+		<magic priority="50">
+			<match value="%PDF-" type="string" offset="0" />
+		</magic>
+		<glob pattern="*.pdf" />
+		<alias type="application/x-pdf" />
+	</mime-type>
+
+	<mime-type type="application/atom+xml">
+		<root-XML localName="feed"
+			namespaceURI="http://purl.org/atom/ns#" />
+	</mime-type>
+
+	<mime-type type="application/mac-binhex40">
+		<glob pattern="*.hqx" />
+	</mime-type>
+
+	<mime-type type="application/mac-compactpro">
+		<glob pattern="*.cpt" />
+	</mime-type>
+
+	<mime-type type="application/rtf">
+                <magic priority="50">
+                        <match value="{\rtf" type="string" offset="0" />
+                </magic>
+	    <glob pattern="*.rtf"/>
+		<alias type="text/rtf" />
+	</mime-type>
+
+	<mime-type type="application/rss+xml">
+		<alias type="text/rss" />
+		<root-XML localName="rss" />
+		<root-XML namespaceURI="http://purl.org/rss/1.0/" />
+		<glob pattern="*.rss" />
+	</mime-type>
+
+	<!--  added in by mattmann -->
+	<mime-type type="application/xml">
+		<alias type="text/xml" />
+		<glob pattern="*.xml" />
+	</mime-type>
+
+	<mime-type type="application/x-mif">
+		<alias type="application/vnd.mif" />
+	</mime-type>
+
+	<mime-type type="application/vnd.wap.wbxml">
+		<glob pattern="*.wbxml" />
+	</mime-type>
+
+	<mime-type type="application/vnd.wap.wmlc">
+		<_comment>Compiled WML Document</_comment>
+		<glob pattern="*.wmlc" />
+	</mime-type>
+
+	<mime-type type="application/vnd.wap.wmlscriptc">
+		<_comment>Compiled WML Script</_comment>
+		<glob pattern="*.wmlsc" />
+	</mime-type>
+
+	<mime-type type="text/vnd.wap.wmlscript">
+		<_comment>WML Script</_comment>
+		<glob pattern="*.wmls" />
+	</mime-type>
+
+	<mime-type type="application/x-bzip">
+		<alias type="application/x-bzip2" />
+	</mime-type>
+
+	<mime-type type="application/x-bzip-compressed-tar">
+		<glob pattern="*.tbz" />
+		<glob pattern="*.tbz2" />
+	</mime-type>
+
+	<mime-type type="application/x-cdlink">
+		<_comment>Virtual CD-ROM CD Image File</_comment>
+		<glob pattern="*.vcd" />
+	</mime-type>
+
+	<mime-type type="application/x-director">
+		<_comment>Shockwave Movie</_comment>
+		<glob pattern="*.dcr" />
+		<glob pattern="*.dir" />
+		<glob pattern="*.dxr" />
+	</mime-type>
+
+	<mime-type type="application/x-futuresplash">
+		<_comment>Macromedia FutureSplash File</_comment>
+		<glob pattern="*.spl" />
+	</mime-type>
+
+	<mime-type type="application/x-java">
+		<alias type="application/java" />
+	</mime-type>
+
+	<mime-type type="application/x-koan">
+		<_comment>SSEYO Koan File</_comment>
+		<glob pattern="*.skp" />
+		<glob pattern="*.skd" />
+		<glob pattern="*.skt" />
+		<glob pattern="*.skm" />
+	</mime-type>
+
+	<mime-type type="application/x-latex">
+		<_comment>LaTeX Source Document</_comment>
+		<glob pattern="*.latex" />
+	</mime-type>
+
+	<!-- JC CHANGED
+		<mime-type type="application/x-mif">
+		<_comment>FrameMaker MIF document</_comment>
+		<glob pattern="*.mif"/>
+		</mime-type> -->
+
+	<mime-type type="application/x-ms-dos-executable">
+		<alias type="application/x-dosexec" />
+	</mime-type>
+
+	<mime-type type="application/ogg">
+		<alias type="application/x-ogg" />
+	</mime-type>
+
+	<mime-type type="application/x-rar">
+		<alias type="application/x-rar-compressed" />
+	</mime-type>
+
+	<mime-type type="application/x-shellscript">
+		<alias type="application/x-sh" />
+	</mime-type>
+
+	<mime-type type="application/xhtml+xml">
+		<glob pattern="*.xht" />
+	</mime-type>
+
+	<mime-type type="audio/midi">
+		<glob pattern="*.kar" />
+	</mime-type>
+
+	<mime-type type="audio/x-pn-realaudio">
+		<alias type="audio/x-realaudio" />
+	</mime-type>
+
+	<mime-type type="image/tiff">
+		<magic priority="50">
+			<match value="0x4d4d2a00" type="string" offset="0" />
+			<match value="0x49492a00" type="string" offset="0" />
+		</magic>
+	</mime-type>
+
+	<mime-type type="message/rfc822">
+		<magic priority="50">
+			<match type="string" value="Relay-Version:" offset="0" />
+			<match type="string" value="#! rnews" offset="0" />
+			<match type="string" value="N#! rnews" offset="0" />
+			<match type="string" value="Forward to" offset="0" />
+			<match type="string" value="Pipe to" offset="0" />
+			<match type="string" value="Return-Path:" offset="0" />
+			<match type="string" value="From:" offset="0" />
+			<match type="string" value="Message-ID:" offset="0" />
+			<match type="string" value="Date:" offset="0" />
+		</magic>
+	</mime-type>
+
+	<mime-type type="image/vnd.wap.wbmp">
+		<_comment>Wireless Bitmap File Format</_comment>
+		<glob pattern="*.wbmp" />
+	</mime-type>
+
+	<mime-type type="image/x-psd">
+		<alias type="image/photoshop" />
+	</mime-type>
+
+	<mime-type type="image/x-xcf">
+		<alias type="image/xcf" />
+		<magic priority="50">
+			<match type="string" value="gimp xcf " offset="0" />
+		</magic>
+	</mime-type>
+
+	<mime-type type="model/iges">
+		<_comment>
+			Initial Graphics Exchange Specification Format
+		</_comment>
+		<glob pattern="*.igs" />
+		<glob pattern="*.iges" />
+	</mime-type>
+
+	<mime-type type="model/mesh">
+		<glob pattern="*.msh" />
+		<glob pattern="*.mesh" />
+		<glob pattern="*.silo" />
+	</mime-type>
+
+	<mime-type type="model/vrml">
+		<glob pattern="*.vrml" />
+	</mime-type>
+
+	<mime-type type="text/x-tcl">
+		<alias type="application/x-tcl" />
+	</mime-type>
+
+	<mime-type type="text/x-tex">
+		<alias type="application/x-tex" />
+	</mime-type>
+
+	<mime-type type="text/x-texinfo">
+		<alias type="application/x-texinfo" />
+	</mime-type>
+
+	<mime-type type="text/x-troff-me">
+		<alias type="application/x-troff-me" />
+	</mime-type>
+
+	<mime-type type="video/vnd.mpegurl">
+		<glob pattern="*.mxu" />
+	</mime-type>
+
+	<mime-type type="x-conference/x-cooltalk">
+		<_comment>Cooltalk Audio</_comment>
+		<glob pattern="*.ice" />
+	</mime-type>
+
+<!-- ===================================================================== -->
+<!-- TIKA-85: http://www.apache.org/dev/svn-eol-style.txt                  -->
+<!-- ===================================================================== -->
+
+	<mime-type type="image/x-icon">
+		<glob pattern="*.ico" />
+	</mime-type>
+
+	<mime-type type="image/jpeg">
+		<glob pattern="*.jpg" />
+	</mime-type>
+
+	<mime-type type="image/png">
+		<glob pattern="*.png" />
+	</mime-type>
+
+</mime-info>
Index: src/main/resources/org/apache/tika/tika-config.xml
===================================================================
--- src/main/resources/org/apache/tika/tika-config.xml	(Revision 0)
+++ src/main/resources/org/apache/tika/tika-config.xml	(Revision 0)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<properties>
+
+    <mimeTypeRepository resource="/org/apache/tika/mime/tika-mimetypes.xml" magic="false"/>
+
+    <parsers>
+
+        <parser name="text-xml" class="org.apache.tika.parser.xml.DcXMLParser">
+                <mime>application/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-powerpoint</mime>
+                <mime>application/vnd.visio</mime>
+        </parser>
+
+        <parser name="parse-html" class="org.apache.tika.parser.html.HtmlParser">
+                <mime>text/html</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>
+
+    </parsers>
+
+</properties>
\ Kein Zeilenvorschub am Ende der Datei
Index: src/main/resources/tika-config.xml
===================================================================
--- src/main/resources/tika-config.xml	(Revision 642624)
+++ src/main/resources/tika-config.xml	(Arbeitskopie)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<properties>
-
-    <mimeTypeRepository resource="/org/apache/tika/mime/tika-mimetypes.xml" magic="false"/>
-
-    <parsers>
-
-        <parser name="text-xml" class="org.apache.tika.parser.xml.DcXMLParser">
-                <mime>application/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-powerpoint</mime>
-                <mime>application/vnd.visio</mime>
-        </parser>
-
-        <parser name="parse-html" class="org.apache.tika.parser.html.HtmlParser">
-                <mime>text/html</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>
-
-    </parsers>
-
-</properties>
\ Kein Zeilenvorschub am Ende der Datei
Index: pom.xml
===================================================================
--- pom.xml	(Revision 642624)
+++ pom.xml	(Arbeitskopie)
@@ -182,6 +182,15 @@
       <groupId>pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
       <version>0.7.3</version>
+	</dependency>
+	<!-- This dependency seemed to be needed, cause during an mvn test the dependency is not solved. 
+	     With the following entry it's working fine.
+	-->
+    <dependency>
+      <groupId>org.fontbox</groupId>
+      <artifactId>fontbox</artifactId>
+      <version>0.1.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
@@ -219,7 +228,7 @@
   </dependencies>
 
   <build>
-    <resources>
+	  <!--    <resources>
       <resource>
         <targetPath>org/apache/tika</targetPath>
         <directory>${basedir}/src/main/resources</directory>
@@ -233,7 +242,7 @@
           <include>LICENSE.txt</include>
         </includes>
       </resource>
-    </resources>
+  </resources> -->
     <pluginManagement>
       <plugins>
         <plugin>