Author: shinichiro
Date: Mon Aug 26 12:23:02 2013
New Revision: 1517517
URL: http://svn.apache.org/r1517517
Log:
Fix for CONNECTORS-768
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1517517&r1=1517516&r2=1517517&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Aug 26 12:23:02 2013
@@ -3,6 +3,9 @@ $Id$
======================= 1.4-dev =====================
+CONNECTORS-768: Add more extensions to ExtensionMimeMap.
+(Shinichiro Abe)
+
CONNECTORS-766: When using mcf-api-service, multiply query
parameters are not parsed correctly.
(Shinichiro Abe)
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java?rev=1517517&r1=1517516&r2=1517517&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
Mon Aug 26 12:23:02 2013
@@ -29,14 +29,27 @@ public class ExtensionMimeMap
protected final static Map<String,String> mimeMap;
static {
mimeMap = new HashMap<String,String>();
- mimeMap.put("txt","text/plain");
- mimeMap.put("pdf","application/pdf");
- mimeMap.put("doc","application/msword");
-
mimeMap.put("docx","application/vnd.openxmlformats-officedocument.wordprocessingml.document");
- mimeMap.put("ppt","application/vnd.ms-powerpoint");
-
mimeMap.put("pptx","application/vnd.openxmlformats-officedocument.presentationml.presentation");
- mimeMap.put("xls","application/vnd.ms-excel");
-
mimeMap.put("xlsx","application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ mimeMap.put("xml", "text/xml");
+ mimeMap.put("csv", "text/csv");
+ mimeMap.put("json", "application/json");
+ mimeMap.put("pdf", "application/pdf");
+ mimeMap.put("rtf", "text/rtf");
+ mimeMap.put("html", "text/html");
+ mimeMap.put("htm", "text/html");
+ mimeMap.put("doc", "application/msword");
+ mimeMap.put("docx",
"application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ mimeMap.put("ppt", "application/vnd.ms-powerpoint");
+ mimeMap.put("pptx",
"application/vnd.openxmlformats-officedocument.presentationml.presentation");
+ mimeMap.put("xls", "application/vnd.ms-excel");
+ mimeMap.put("xlsx",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ mimeMap.put("odt", "application/vnd.oasis.opendocument.text");
+ mimeMap.put("ott", "application/vnd.oasis.opendocument.text");
+ mimeMap.put("odp", "application/vnd.oasis.opendocument.presentation");
+ mimeMap.put("otp", "application/vnd.oasis.opendocument.presentation");
+ mimeMap.put("ods", "application/vnd.oasis.opendocument.spreadsheet");
+ mimeMap.put("ots", "application/vnd.oasis.opendocument.spreadsheet");
+ mimeMap.put("txt", "text/plain");
+ mimeMap.put("log", "text/plain");
}
/** Map extension to mime type */
