litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VIVO-1236] Add TwelveMonkeys ImageIO library for full OpenJDK image support

Browse source
This commit is contained in:
Graham Triggs 2016-05-02 14:13:07 +01:00
parent 3ffbea3cbb
commit 4dfffe88a2
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home/src/main/resources/config/example.applicationSetup.n3
View file

@ -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> .
# ----------------------------

9
webapp/src/main/webapp/WEB-INF/web.xml
View file

@ -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 -->