Author: tpalsulich
Date: Fri Jan 23 03:24:37 2015
New Revision: 1654112
URL: http://svn.apache.org/r1654112
Log:
OODT-805. Properly pass tika-mimetypes.xml to Tika.
Modified:
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
oodt/trunk/metadata/src/test/resources/tika-mimetypes.xml
Modified:
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java?rev=1654112&r1=1654111&r2=1654112&view=diff
==============================================================================
---
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
(original)
+++
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
Fri Jan 23 03:24:37 2015
@@ -30,6 +30,7 @@ import java.util.logging.Logger;
//APACHE imports
import org.apache.tika.Tika;
+import org.apache.tika.detect.DefaultDetector;
import org.apache.tika.mime.MediaType;
import org.apache.tika.mime.MimeType;
import org.apache.tika.mime.MimeTypeException;
@@ -54,13 +55,13 @@ public final class MimeTypeUtils {
/* our Tika mime type registry */
private MimeTypes mimeTypes;
- private Tika tika = new Tika();
+ private Tika tika;
/* whether or not magic should be employed or not */
private boolean mimeMagic;
/* static resource path for the mimeTypesFile */
- public final static String MIME_FILE_RES_PATH = "tika-mimetypes.xml";
+ public final static String MIME_FILE_RES_PATH = "/tika-mimetypes.xml";
/* our log stream */
private static final Logger LOG = Logger.getLogger(MimeTypeUtils.class
@@ -83,6 +84,7 @@ public final class MimeTypeUtils {
try {
this.mimeTypes = MimeTypesFactory.create(mimeIs);
this.mimeMagic = magic;
+ this.tika = new Tika(new DefaultDetector(this.mimeTypes));
}catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to load MimeType Registry : " +
e.getMessage(), e);
}
Modified:
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java?rev=1654112&r1=1654111&r2=1654112&view=diff
==============================================================================
---
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
(original)
+++
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
Fri Jan 23 03:24:37 2015
@@ -27,6 +27,7 @@ public class TestMimeTypeUtils extends T
assertEquals("application/pdf",
mtUtils.getMimeType("file.pdf"));
assertEquals("application/xhtml+xml",
mtUtils.getMimeType("file.xhtml"));
assertEquals("application/xml",
mtUtils.getSuperTypeForMimeType(mtUtils.getMimeType("file.xhtml")));
+ assertEquals("test/example",
mtUtils.getMimeType("file.testexample"));
}
}
Modified: oodt/trunk/metadata/src/test/resources/tika-mimetypes.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/metadata/src/test/resources/tika-mimetypes.xml?rev=1654112&r1=1654111&r2=1654112&view=diff
==============================================================================
--- oodt/trunk/metadata/src/test/resources/tika-mimetypes.xml (original)
+++ oodt/trunk/metadata/src/test/resources/tika-mimetypes.xml Fri Jan 23
03:24:37 2015
@@ -38,6 +38,9 @@
-->
<mime-info>
+ <mime-type type="test/example">
+ <glob pattern="*.testexample"/>
+ </mime-type>
<mime-type type="application/activemessage"/>
<mime-type type="application/andrew-inset">
<glob pattern="*.ez"/>
