From d73a5faa88c7ac89568228a890c8a0195250e04c Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 19 May 2008 14:09:30 +0000
Subject: [PATCH] Merged V2.1-A to HEAD    8289: Added jpeg2000 mimetype   
 8302: Fix for Adobe (ACT 1487)    8306: Solution for Adobe raised ticket ACT
 1384    8310: Fix for location based breadcrumb when navigating discussions  
  8432: ADB-48 - in case of multi-domain lookup, also consistent with AWC
 LoginBean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/mimetype/mimetype-map.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/alfresco/mimetype/mimetype-map.xml b/config/alfresco/mimetype/mimetype-map.xml
index 32865629c2..55e38c5d5a 100644
--- a/config/alfresco/mimetype/mimetype-map.xml
+++ b/config/alfresco/mimetype/mimetype-map.xml
@@ -142,6 +142,11 @@
             <extension>jpeg</extension>
             <extension>jpe</extension>
          </mimetype>
+         <mimetype mimetype="image/jpeg2000" display="JPEG 2000 Image">
+            <extension default="true">jpx</extension>
+            <extension>jp2</extension>
+            <extension>jpm</extension>
+         </mimetype>
          <mimetype mimetype="image/svg" display="Scalable Vector Graphics Image">
             <extension>svg</extension>
          </mimetype>