inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged COMMUNITY/5.1.a (5.1.a) to HEAD (5.1/Cloud)

Browse Source 
Bitrock fix (Case 17580) ImageMagick not working on Windows

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-08-28 18:36:34 +00:00
parent c7756ff4cc
commit 8c05da9bf7
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/bitrock/project.xml
View File

@@ -159,6 +159,7 @@
</folderList> </folderList>
</component> </component>
<include file="tomcat-java.xml" /> <include file="tomcat-java.xml" />
<include file="tomcat-imagemagick.xml" />
<include file="postgres.xml" /> <include file="postgres.xml" />
<include file="postgres_initdb.xml"/> <include file="postgres_initdb.xml"/>

22
src/main/resources/bitrock/tomcat-imagemagick.xml Normal file
View File

@@ -0,0 +1,22 @@
<!-- Needed to make ImageMagick (version 6.9.1+) work with Tomcat on Windows -->
<component>
<name>tomcatimagemagick</name>
<description>//Tomcat settings for ImageMagick</description>
<detailedDescription>//Makes Apache Tomcat able to install use ImageMagick functions.</detailedDescription>
<canBeEdited>1</canBeEdited>
<show>0</show>
<selected>1</selected>
<postInstallationActionList>
<addTextToFile>
<file>${application_server_directory}/bin/setenv.bat</file>
<text>rem ##### IMAGEMAGICK ENV #####
set JAVA_OPTS=%JAVA_OPTS% --Environment "PATH='${PATH_WIN}'#MAGICK_HOME=${imagemagick_root_directory.dos}#MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders#MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}#"
</text>
<ruleList>
<platformTest type="windows"/>
<componentTest logic="exists" name="imagemagick"/>
<componentTest logic="selected" name="imagemagick"/>
</ruleList>
</addTextToFile>
</postInstallationActionList>
</component>