From ef432bccc70783ceb79d29d4760da46d847d5e3d Mon Sep 17 00:00:00 2001
From: Paul Holmes-Higgin <paulhh@alfresco.com>
Date: Fri, 9 Jan 2009 13:17:35 +0000
Subject: [PATCH] MacOS installer with changes to config for calling out to
 OOo, pdf2swf & ImageMagick.  Win installers may not work until updated as
 well.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/content-services-context.xml | 21 ++++++++++++++++----
 config/alfresco/repository.properties        |  9 ++++++++-
 config/alfresco/swf-transform-context.xml    |  4 ++--
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 28a111abf0..c5a0fb6098 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -360,7 +360,7 @@
                 <map>
                     <entry key="Windows.*">
                         <list>
-                            <value>imconvert</value>
+                            <value>${img.win.exe}</value>
                             <value>${source}</value>
                             <value>SPLIT:${options}</value>
                             <value>${target}</value>
@@ -368,7 +368,7 @@
                     </entry>
                     <entry key=".*">
                         <list>
-                            <value>convert</value>
+                            <value>${img.exe}</value>
                             <value>${source}</value>
                             <value>SPLIT:${options}</value>
                             <value>${target}</value>
@@ -376,6 +376,19 @@
                     </entry>
                 </map>
             </property>
+  		    <property name="processProperties">
+    	        <map>
+      	            <entry key="MAGICK_HOME">
+                        <value>${img.root}</value>
+         	        </entry>
+      	            <entry key="DYLD_LIBRARY_PATH">
+                        <value>${img.dyn}</value>
+         	        </entry>
+      	            <entry key="LD_LIBRARY_PATH">
+                        <value>${img.dyn}</value>
+         	        </entry>
+		        </map>
+      		</property>
             <property name="defaultProperties">
                 <props>
                     <prop key="options"></prop>
@@ -389,13 +402,13 @@
                 <map>
                     <entry key="Windows.*">
                         <list>
-                            <value>imconvert</value>
+                            <value>${img.win.exe}</value>
                             <value>-version</value>
                         </list>
                     </entry>
                     <entry key=".*">
                         <list>
-                            <value>convert</value>
+                            <value>${img.exe}</value>
                             <value>-version</value>
                         </list>
                     </entry>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index a08b63b84c..2060108c67 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -272,4 +272,11 @@ avmsync.rmi.service.port=50502
 attribute.rmi.service.port=50503
 authentication.rmi.service.port=50504
 repo.rmi.service.port=50505
-action.rmi.service.port=50506
+action.rmi.service.port=50506
+
+# External executable locations
+img.win.exe=imconvert
+img.exe=convert
+img.root=
+img.dyn=
+swf.exe=pdf2swf
diff --git a/config/alfresco/swf-transform-context.xml b/config/alfresco/swf-transform-context.xml
index 1a7261f65d..355276020d 100644
--- a/config/alfresco/swf-transform-context.xml
+++ b/config/alfresco/swf-transform-context.xml
@@ -9,7 +9,7 @@
             <property name="commandMap">
                 <map>
                     <entry key=".*">
-                        <value>pdf2swf -V</value>
+                        <value>${swf.exe} -V</value>
                     </entry>
                 </map>
             </property>
@@ -23,7 +23,7 @@
             <property name="commandMap">
                 <map>
                     <entry key=".*">
-                        <value>pdf2swf -T ${flashVersion} ${source} -o ${target}</value>
+                        <value>${swf.exe} -T ${flashVersion} ${source} -o ${target}</value>
                     </entry>
                 </map>
             </property>