From 4dfffe88a2dca0f24b002b1ec41d553039b28ad9 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Mon, 2 May 2016 14:13:07 +0100
Subject: [PATCH] [VIVO-1236] Add TwelveMonkeys ImageIO library for full
 OpenJDK image support

---
 .../main/resources/config/example.applicationSetup.n3    | 8 +++-----
 webapp/src/main/webapp/WEB-INF/web.xml                   | 9 +++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3
index 4789f7b4..cba4dc17 100644
--- a/home/src/main/resources/config/example.applicationSetup.n3
+++ b/home/src/main/resources/config/example.applicationSetup.n3
@@ -23,7 +23,7 @@
         <java:edu.cornell.mannlib.vitro.webapp.modules.Application> ;
     :hasSearchEngine              :instrumentedSearchEngineWrapper ;
     :hasSearchIndexer             :basicSearchIndexer ;
-    :hasImageProcessor            :jaiImageProcessor ;
+    :hasImageProcessor            :iioImageProcessor ;
     :hasFileStorage               :ptiFileStorage ;
     :hasContentTripleSource       :sdbContentTripleSource ;
     :hasConfigurationTripleSource :tdbConfigurationTripleSource ;
@@ -32,12 +32,10 @@
 # ----------------------------
 #
 # Image processor module: 
-#    The JAI-based implementation is the only standard option.
-#    It requires no parameters.
 #
 
-:jaiImageProcessor 
-    a   <java:edu.cornell.mannlib.vitro.webapp.imageprocessor.jai.JaiImageProcessor> ,
+:iioImageProcessor
+    a   <java:edu.cornell.mannlib.vitro.webapp.imageprocessor.imageio.IIOImageProcessor> ,
         <java:edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor> .
 
 # ----------------------------
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
index 16430f44..c2dc7296 100644
--- a/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -48,8 +48,13 @@
   <listener>
     <listener-class>edu.cornell.mannlib.vitro.webapp.startup.StartupManager</listener-class>
   </listener>
-  
-  
+
+  <!-- TwelveMonkeys ImageIO listener -->
+  <listener>
+    <display-name>ImageIO service provider loader/unloader</display-name>
+    <listener-class>com.twelvemonkeys.servlet.image.IIOProviderContextListener</listener-class>
+  </listener>
+
   <!-- Filters ********************************************************** -->
   <!-- in 2.4 spec, filter chain order is first by filter-mapping <url-pattern> order in web.xml,
 	 then filter-mapping <servlet-name> order in web.xml -->