Author: bfoster
Date: Thu Dec 16 19:49:55 2010
New Revision: 1050124
URL: http://svn.apache.org/viewvc?rev=1050124&view=rev
Log:
- updated cas-metadata to use Tika-Core 0.8
-------------------------
OODT-89
Added:
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
(with props)
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/metadata/pom.xml
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/MimeTypeUtils.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1050124&r1=1050123&r2=1050124&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Thu Dec 16 19:49:55 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.2 (Current Development)
--------------------------------------------
+* OODT-89 (cas-metadata patch) Synchonize OODT-CAS components, which depend on
one another, on a particular Apache-Tika version (bfoster)
+
* OODT-87 Add date roll dynamic replacement fuction to PathUtils (bfoster)
* OODT-63 Use hard coded version numbers in shared component POMs so that MVN
install works (bfoster)
Modified: oodt/trunk/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/metadata/pom.xml?rev=1050124&r1=1050123&r2=1050124&view=diff
==============================================================================
--- oodt/trunk/metadata/pom.xml (original)
+++ oodt/trunk/metadata/pom.xml Thu Dec 16 19:49:55 2010
@@ -134,6 +134,11 @@ the License.
<version>2.3</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
@@ -145,8 +150,8 @@ the License.
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika</artifactId>
- <version>0.3</version>
+ <artifactId>tika-core</artifactId>
+ <version>0.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
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=1050124&r1=1050123&r2=1050124&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
Thu Dec 16 19:49:55 2010
@@ -29,6 +29,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//APACHE imports
+import org.apache.tika.mime.MediaType;
import org.apache.tika.mime.MimeType;
import org.apache.tika.mime.MimeTypeException;
import org.apache.tika.mime.MimeTypes;
@@ -76,8 +77,12 @@ public final class MimeTypeUtils {
}
public MimeTypeUtils(InputStream mimeIs, boolean magic) {
- this.mimeTypes = MimeTypesFactory.create(mimeIs);
- this.mimeMagic = magic;
+ try {
+ this.mimeTypes = MimeTypesFactory.create(mimeIs);
+ this.mimeMagic = magic;
+ }catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to load MimeType Registry : " +
e.getMessage(), e);
+ }
}
/**
@@ -288,7 +293,11 @@ public final class MimeTypeUtils {
public String getSuperTypeForMimeType(String mimeType) {
try {
- return
this.mimeTypes.forName(mimeType).getSuperType().getName();
+ MediaType mediaType =
this.mimeTypes.getMediaTypeRegistry().getSupertype(this.mimeTypes.forName(mimeType).getType());
+ if (mediaType != null)
+ return mediaType.getType() + "/" +
mediaType.getSubtype();
+ else
+ return null;
}catch (Exception e) {
LOG.log(Level.WARNING, "Failed to get super-type for mimetype "
+ mimeType + " : " + e.getMessage());
Added:
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=1050124&view=auto
==============================================================================
---
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
(added)
+++
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
Thu Dec 16 19:49:55 2010
@@ -0,0 +1,16 @@
+package org.apache.oodt.cas.metadata.util;
+
+import junit.framework.TestCase;
+
+public class TestMimeTypeUtils extends TestCase {
+
+ public void testMimeTypes() {
+ MimeTypeUtils mtUtils = new MimeTypeUtils();
+ assertEquals("application/xml",
mtUtils.getMimeType("file.xml"));
+ assertEquals("text/plain", mtUtils.getMimeType("file.txt"));
+ assertEquals("application/pdf",
mtUtils.getMimeType("file.pdf"));
+ assertEquals("application/xhtml+xml",
mtUtils.getMimeType("file.xhtml"));
+ assertEquals("application/xml",
mtUtils.getSuperTypeForMimeType(mtUtils.getMimeType("file.xhtml")));
+ }
+
+}
Propchange:
oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestMimeTypeUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
