Merged 5.2.N (5.2.2) to HEAD (5.2)

137096 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      136870 anechifor: changes pdfium->alfresco-pdf-renderer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

src/main/resources/bitrock/alfresco-build-settings.xml

@@ -57,7 +57,7 @@
         <setInstallerVariable name="postgres_distribution_folder" value="${binaries_folder}/postgresql" />
         <setInstallerVariable name="imagemagick_distribution_folder_windows" value="${binaries_folder}/imagemagick" />
         <setInstallerVariable name="imagemagick_distribution_folder_unix" value="${binaries_folder}/ImageMagick" />
-        <setInstallerVariable name="pdfium_distribution_folder" value="${binaries_folder}/alfresco-pdf-renderer"/>
+        <setInstallerVariable name="alfresco_pdf_renderer_distribution_folder" value="${binaries_folder}/alfresco-pdf-renderer"/>
         <setInstallerVariable name="java_distribution_folder" value="${binaries_folder}/java" />
         <setInstallerVariable name="xvfb_distribution_folder" value="${binaries_folder}/Xvfb" />
         <setInstallerVariable name="libreoffice_distribution_folder" value="${binaries_folder}/libreoffice" />

src/main/resources/bitrock/alfresco-customstack-build-settings.xml

@@ -37,7 +37,7 @@
                 <setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java"/>
                 <setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice"/>
                 <setInstallerVariable name="tomcat_distribution_folder" value="${local_binaries_folder}/apache-tomcat"/>
-                <setInstallerVariable name="pdfium_distribution_folder" value="${local_binaries_folder}/alfresco-pdf-renderer"/>
+                <setInstallerVariable name="alfresco_pdf_renderer_distribution_folder" value="${local_binaries_folder}/alfresco-pdf-renderer"/>
                 <!-- END ALFRESCO BUILD SYSTEM-->
             </actionList>
             <ruleList>

src/main/resources/bitrock/alfresco-pdf-renderer.xml

@@ -0,0 +1,82 @@
+<component>
+    <name>alfresco_pdf_renderer</name>
+    <description>alfresco_pdf_renderer</description>
+    <canBeEdited>0</canBeEdited>
+    <show>0</show>
+    <selected>1</selected>
+
+    <parameterList>
+        <directoryParameter>
+            <ask>0</ask>
+            <name>alfresco_pdf_renderer_root_directory</name>
+            <cliOptionName>alfresco_pdf_renderer_root_directory</cliOptionName>
+        </directoryParameter>
+    </parameterList>
+    <readyToInstallActionList>   
+    
+        <setInstallerVariable name="alfresco_pdf_renderer_root_directory" value="${installdir}/common/alfresco-pdf-renderer">
+            <ruleList>
+                <platformTest type="unix"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="alfresco_pdf_renderer_root_directory" value="${installdir}\alfresco-pdf-renderer">
+            <ruleList>
+                <platformTest type="windows"/>
+            </ruleList>
+        </setInstallerVariable>
+
+        <setInstallerVariable name="ALFRESCO_PDF_RENDERER_PATH" value="${alfresco_pdf_renderer_root_directory}">
+            <ruleList>
+                <platformTest type="unix"/>
+            </ruleList>
+        </setInstallerVariable>
+
+        <setInstallerVariable name="ALFRESCO_PDF_RENDERER_PATH_WIN" value="${alfresco_pdf_renderer_root_directory}"/>
+
+        <setInstallerVariable name="PATH" value="${ALFRESCO_PDF_RENDERER_PATH}:${PATH}">
+            <ruleList>
+                <compareText text="${PATH}" value="${ALFRESCO_PDF_RENDERER_PATH}" nocase="1" logic="does_not_contain"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="PATH_WIN" value="${ALFRESCO_PDF_RENDERER_PATH_WIN};${PATH_WIN}">
+            <ruleList>
+                <compareText text="${PATH_WIN}" value="${ALFRESCO_PDF_RENDERER_PATH_WIN}" nocase="1" logic="does_not_contain"/>
+            </ruleList>
+        </setInstallerVariable>
+        
+         <setInstallerVariable name="ALFRESCO_PDF_RENDERER_VAR">
+            <value>##### ALFRESCO_PDF_RENDERER ENV #####
+ALFRESCO_PDF_RENDERER_VAR="${alfresco_pdf_renderer_root_directory}"
+export ALFRESCO_PDF_RENDERER_VAR
+
+</value>
+            <ruleList>
+                <platformTest type="unix"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="ALFRESCO_PDF_RENDERER_VAR">
+            <value>rem ##### ALFRESCO_PDF_RENDERER ENV #####
+set ALFRESCO_PDF_RENDERER_VAR=${alfresco_pdf_renderer_root_directory}
+</value>
+            <ruleList>
+                <platformTest type="windows"/>
+            </ruleList>
+        </setInstallerVariable>
+        <setInstallerVariable name="ENV_VAR">
+            <value>${ALFRESCO_PDF_RENDERER_VAR}${ENV_VAR}</value>
+        </setInstallerVariable>
+    </readyToInstallActionList>
+    
+    <folderList>
+        <folder>
+            <name>alfresco_pdf_renderer</name>
+            <destination>${alfresco_pdf_renderer_root_directory}</destination>
+            <distributionFileList>
+                <distributionDirectory allowWildcards="1" origin="${alfresco_pdf_renderer_distribution_folder}/*"/>
+            </distributionFileList>
+        </folder>
+    </folderList>
+    
+    <postInstallationActionList/>
+</component>
+

src/main/resources/bitrock/project.xml

@@ -191,7 +191,7 @@
         <include file="base-unix-service.xml" />
 
         <include file="imagemagick.xml"/>
-        <include file="pdfium.xml"/>
+        <include file="alfresco-pdf-renderer.xml"/>
         <include file="alfresco-customstack-postgres-settings.xml" />
         <include file="alfresco-customstack-shortcuts.xml" />
         <include file="alfresco-customstack-validations.xml"/>

src/main/resources/extract-binaries.xml

@@ -149,7 +149,7 @@
         	<echo> Extracting Alfresco Pdf Renderer...</echo>
         	<exec failonerror="true" executable="tar" dir="${bin.folder}/alfresco-pdf-renderer">
         	    <arg value="xf" />
-        	    <arg value="${maven.localrepo}/org/alfresco/alfresco-pdf-renderer/${installer.pdfium.version}/alfresco-pdf-renderer-${installer.pdfium.version}-${alfrescoPdfRenderer.platform}.tgz" />
+        	    <arg value="${maven.localrepo}/org/alfresco/alfresco-pdf-renderer/${installer.alfresco-pdf-renderer.version}/alfresco-pdf-renderer-${installer.alfresco-pdf-renderer.version}-${alfrescoPdfRenderer.platform}.tgz" />
         	</exec>
 
         </sequential>