From 8c05da9bf796f607df7951fd82d3f414393d88ec Mon Sep 17 00:00:00 2001
From: Jean-Pierre Huynh <jean-pierre.huynh@alfresco.com>
Date: Fri, 28 Aug 2015 18:36:34 +0000
Subject: [PATCH] Merged COMMUNITY/5.1.a (5.1.a) to HEAD (5.1/Cloud)    
 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
---
 src/main/resources/bitrock/project.xml        |  1 +
 .../resources/bitrock/tomcat-imagemagick.xml  | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/main/resources/bitrock/tomcat-imagemagick.xml

diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index 56c52d8906..287833ffea 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -159,6 +159,7 @@
             </folderList>
         </component>
         <include file="tomcat-java.xml" />
+        <include file="tomcat-imagemagick.xml" />
         <include file="postgres.xml" />
         <include file="postgres_initdb.xml"/>
 
diff --git a/src/main/resources/bitrock/tomcat-imagemagick.xml b/src/main/resources/bitrock/tomcat-imagemagick.xml
new file mode 100644
index 0000000000..3839cd3741
--- /dev/null
+++ b/src/main/resources/bitrock/tomcat-imagemagick.xml
@@ -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>