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

136787 skopf: Merged REPO-2057 (5.2.1) to 5.2.N (5.2.1)
      136647 anechifor: REPO-2057 : GS Replacement: Remove GhostScript from the code base (installer, Admin Console et al.)
         - I remove GhostScript and change pom.xml from installer to build locally.


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

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

@@ -37,7 +37,6 @@
                 <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="ghostscript_distribution_folder" value="${local_binaries_folder}/ghostscript"/>
                 <!-- END ALFRESCO BUILD SYSTEM-->
             </actionList>
             <ruleList>

src/main/resources/bitrock/ghostscript.xml

@@ -1,4 +1,4 @@
-<component>
+<!--  component>
     <name>ghostscript</name>
     <description>GhostScript</description>
     <canBeEdited>0</canBeEdited>
@@ -89,5 +89,5 @@ export GS_LIB
     </folderList>
     
     <postInstallationActionList/>
-</component>
+</component-->
 

src/main/resources/bitrock/imagemagick.xml

@@ -23,11 +23,6 @@ System variables provided by this component:
         <isTrue value="${imagemagick_component_enabled}"/>
     </shouldPackRuleList>
     <preBuildActionList>
-        <setInstallerVariable name="component(imagemagick).parameter(imagemagick_ghostscriptwin_included).value" value="1">
-            <ruleList>
-                <fileTest path="${imagemagick_distribution_folder_windows}/lib/gs_init.ps" condition="exists" />
-            </ruleList>
-        </setInstallerVariable>
         <actionGroup>
             <actionList>
                 <setInstallerVariable name="imagemagick_build_path" value=""/>
@@ -93,7 +88,6 @@ System variables provided by this component:
             <value>7.0.5</value>
             <default>7.0.5</default>
         </stringParameter>
-        <booleanParameter name="imagemagick_ghostscriptwin_included" value="0" ask="0" />
     </parameterList>
     <readyToInstallActionList>
         <setInstallerVariable name="imagemagick_root_directory" value="${installdir}/common">
@@ -138,7 +132,6 @@ MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagi
 			export MAGICK_CONFIGURE_PATH
 			MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16HDRI/coders"
 			export MAGICK_CODER_MODULE_PATH
-
 			</value>
             <ruleList>
                 <platformTest type="unix"/>
@@ -154,29 +147,14 @@ set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}
                 <platformTest type="windows"/>
             </ruleList>
         </setInstallerVariable>
-        <setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
+        
-            <value>${IMAGEMAGICK_ENV_VAR}
+     
-set GS_LIB=${imagemagick_root_directory.dos}\lib
-</value>
-            <ruleList>
-                <platformTest type="windows"/>
-                <isTrue value="${imagemagick_ghostscriptwin_included}" />
-            </ruleList>
-        </setInstallerVariable>
-        <setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
-            <value>${IMAGEMAGICK_ENV_VAR}
-GS_LIB="${imagemagick_root_directory}/share/ghostscript/fonts"
-export GS_LIB
-</value>
-            <ruleList>
-                <platformTest type="unix"/>
-            </ruleList>
-        </setInstallerVariable>
         <setInstallerVariable name="ENV_VAR">
             <value>${IMAGEMAGICK_ENV_VAR}${ENV_VAR}</value>
         </setInstallerVariable>
         <setInstallerVariable name="IMAGEMAGICK_WRAPPERS">
-            <value>         ${imagemagick_root_directory}/bin/animate
+            <value>         
+            ${imagemagick_root_directory}/bin/animate
             ${imagemagick_root_directory}/bin/compare 
             ${imagemagick_root_directory}/bin/composite 
             ${imagemagick_root_directory}/bin/conjure 
@@ -231,30 +209,13 @@ export GS_LIB
                 		<ruleList>
                 			<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" />
                 		</ruleList>
-            </copyFile>
-                        <copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
-                <ruleList>
-                <fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" />
-                </ruleList>
             			</copyFile>
                 		<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
                 		<ruleList>
                 			<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" />
                 		</ruleList>
             			</copyFile>
-                        <substitute>
-                            <files>${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/type-ghostscript.xml</files>
-                             <substitutionList>
-                                 <substitution>
-                                     <pattern>/usr/share/fonts/default/Type1</pattern>
-                                     <value>${common_root_directory}/share/ghostscript/fonts</value>
-                                 </substitution>
-                             </substitutionList>
-                        </substitute>
                     </actionList>
-                    <ruleList>
-                        <fileTest path="${common_root_directory}/share/ghostscript/fonts" condition="exists" />
-                    </ruleList>
                 </actionGroup>
                 <substitute>
                     <type>exact</type>          

src/main/resources/bitrock/project.xml

@@ -191,7 +191,6 @@
         <include file="base-unix-service.xml" />
 
         <include file="imagemagick.xml"/>
-        <include file="ghostscript.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

@@ -148,12 +148,6 @@
                 <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-${libreoffice.platform}.tgz" />
             </exec>
             
-            <echo>  Extracting GhostScript...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/com/ghostscript/ghostscript-distribution/${installer.ghostscript.version}/ghostscript-distribution-${installer.ghostscript.version}-@{targetPlatform}.tgz" />
-            </exec>
-            
             <echo>  Extracting ImageMagick...</echo>
             <exec failonerror="true" executable="tar" dir="${bin.folder}">
                 <arg value="xf" />