From 19d41b613c0cea55e3d5398f290332d9eef1c26d Mon Sep 17 00:00:00 2001
From: Natalia Smintanca <natalia.penciuc@ness.com>
Date: Thu, 19 Nov 2015 09:32:15 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    117631 jphuynh: Merged
 JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)       114606 jphuynh: - Changed version
 to 5.1-NO-GPL-SNAPSHOT       - Updated LibreOffice, Common and PostgreSQL
 versions       - Removed swftools

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../bitrock/alfresco-build-settings.xml       |  1 -
 .../alfresco-customstack-build-settings.xml   |  1 -
 .../resources/bitrock/alfresco-functions.xml  | 28 --------
 .../shared/alfresco-global.properties         |  2 -
 src/main/resources/bitrock/project.xml        |  1 -
 src/main/resources/bitrock/swftools.xml       | 72 -------------------
 6 files changed, 105 deletions(-)
 delete mode 100644 src/main/resources/bitrock/swftools.xml

diff --git a/src/main/resources/bitrock/alfresco-build-settings.xml b/src/main/resources/bitrock/alfresco-build-settings.xml
index be651148a3..528b870f5d 100644
--- a/src/main/resources/bitrock/alfresco-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-build-settings.xml
@@ -63,7 +63,6 @@
         <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" />
-        <setInstallerVariable name="swftools_distribution_folder" value="${binaries_folder}/swftools" />
         <setInstallerVariable name="tomcat_distribution_folder" value="${binaries_folder}/apache-tomcat" />
         <setInstallerVariable name="manager_distribution_folder" value="${binaries_folder}" />
 
diff --git a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
index bcbffe4639..8667d2eb18 100644
--- a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
@@ -37,7 +37,6 @@
                 <setInstallerVariable name="imagemagick_distribution_folder_unix" value="${local_binaries_folder}/ImageMagick"/>
                 <setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java"/>
                 <setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice"/>
-                <setInstallerVariable name="swftools_distribution_folder" value="${binaries_folder}/swftools-0.9.2"/>
                 <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-->
diff --git a/src/main/resources/bitrock/alfresco-functions.xml b/src/main/resources/bitrock/alfresco-functions.xml
index ff3f3d7df9..f25808b76f 100644
--- a/src/main/resources/bitrock/alfresco-functions.xml
+++ b/src/main/resources/bitrock/alfresco-functions.xml
@@ -189,34 +189,6 @@ img.exe=${'${img.root}'}\\convert.exe</value>
                             <pattern>@@BITROCK_LO_PORT@@</pattern>
                             <value>${libreoffice_port}</value>
                         </substitution>
-                        <substitution>
-                            <pattern>@@BITROCK_PDF2SWF_PATH@@</pattern>
-                            <value>${installdir.dos.unix}/swftools/pdf2swf.exe</value>
-                            <ruleList>
-                                <platformTest type="windows"/>
-                            </ruleList>
-                        </substitution>
-                        <substitution>
-                            <pattern>@@BITROCK_PDF2SWF_PATH@@</pattern>
-                            <value>${installdir.unix}/common/bin/pdf2swf</value>
-                            <ruleList>
-                                <platformTest type="unix"/>
-                            </ruleList>
-                        </substitution>
-                        <substitution>
-                            <pattern>@@BITROCK_PDF2SWF_LANGUAGEDIR@@</pattern>
-                            <value>${installdir.dos.unix}/swftools/japanese</value>
-                            <ruleList>
-                                <platformTest type="windows"/>
-                            </ruleList>
-                        </substitution>
-                        <substitution>
-                            <pattern>@@BITROCK_PDF2SWF_LANGUAGEDIR@@</pattern>
-                            <value>${installdir.unix}/common/japanese</value>
-                            <ruleList>
-                                <platformTest type="unix"/>
-                            </ruleList>
-                        </substitution>
                         <substitution>
                             <pattern>@@BITROCK_MYSQL_PORT@@</pattern>
                             <value>${database_port}</value>
diff --git a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
index b2bc29694d..3192dba10b 100644
--- a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
+++ b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
@@ -40,8 +40,6 @@ ooo.exe=@@BITROCK_LIBREOFFICE_PROGRAM_DIR@@
 ooo.enabled=true
 ooo.port=@@BITROCK_LO_PORT@@
 @@BITROCK_ALFRESCO_IMAGEMAGICK_ENV@@
-swf.exe=@@BITROCK_PDF2SWF_PATH@@
-swf.languagedir=@@BITROCK_PDF2SWF_LANGUAGEDIR@@
 
 jodconverter.enabled=false
 jodconverter.officeHome=@@BITROCK_LIBREOFFICE_JOD_DIR@@
diff --git a/src/main/resources/bitrock/project.xml b/src/main/resources/bitrock/project.xml
index 8ab9b71c4d..b23b8771f5 100644
--- a/src/main/resources/bitrock/project.xml
+++ b/src/main/resources/bitrock/project.xml
@@ -193,7 +193,6 @@
 
         <include file="imagemagick.xml"/>
         <include file="ghostscript.xml"/>
-        <include file="swftools.xml"/>
         <include file="alfresco-customstack-postgres-settings.xml" />
         <include file="alfresco-customstack-shortcuts.xml" />
         <include file="alfresco-customstack-validations.xml"/>
diff --git a/src/main/resources/bitrock/swftools.xml b/src/main/resources/bitrock/swftools.xml
deleted file mode 100644
index 2be4c611db..0000000000
--- a/src/main/resources/bitrock/swftools.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<component>
-    <name>swftools</name>
-    <description>SWFTOOLS Component</description>
-    <canBeEdited>0</canBeEdited>
-    <show>0</show>
-    <selected>1</selected>
-    <shouldPackRuleList>
-        <isTrue value="${swftools_component_enabled}" />
-    </shouldPackRuleList>
-
-    <initializationActionList/>
-    <parameterList>
-        <booleanParameter name="swftools_component_enabled" ask="0" value="1" />
-        <directoryParameter>
-            <ask>0</ask>
-            <description>SWFTOOLS installation directory</description>
-            <name>swftools_root_directory</name>
-            <cliOptionName>swftools_root_directory</cliOptionName>
-        </directoryParameter>
-    </parameterList>
-    <readyToInstallActionList>
-        <setInstallerVariable name="swftools_root_directory" value="${installdir}/common"/>
-                 <setInstallerVariable name="SWFTOOLS_WRAPPERS">
-            <value>         ${swftools_root_directory}/bin/as3compile
-            ${swftools_root_directory}/bin/font2swf
-            ${swftools_root_directory}/bin/jpeg2swf 
-            ${swftools_root_directory}/bin/pdf2swf
-            ${swftools_root_directory}/bin/png2swf 
-            ${swftools_root_directory}/bin/swfbbox 
-            ${swftools_root_directory}/bin/swfc 
-            ${swftools_root_directory}/bin/swfcombine 
-            ${swftools_root_directory}/bin/swfdump
-            ${swftools_root_directory}/bin/swfextract 
-            ${swftools_root_directory}/bin/swfrender
-                        ${swftools_root_directory}/bin/swfstrings 
-            ${swftools_root_directory}/bin/wav2swf
-            </value>
-        </setInstallerVariable>
-        <setInstallerVariable name="WRAPPERS" value="${SWFTOOLS_WRAPPERS};${WRAPPERS}"/>
-    </readyToInstallActionList>
-    <folderList>
-        <folder>
-            <name>swftoolsWindows</name>
-            <destination>${installdir}/swftools</destination>
-            <platforms>windows</platforms>
-            <distributionFileList>
-                <distributionDirectory allowWildcards="1" origin="${swftools_distribution_folder}/*"/>
-            </distributionFileList>
-        </folder>
-        <folder>
-            <name>swftoolsUnix</name>
-            <destination>${swftools_root_directory}</destination>
-            <platforms>linux linux-x64 osx</platforms>
-            <distributionFileList>
-                <distributionDirectory origin="${swftools_distribution_folder}/bin"/>
-                <distributionDirectory origin="${swftools_distribution_folder}/japanese"/>
-            </distributionFileList>
-            <actionList>
-                <substitute>
-                    <files>${SWFTOOLS_WRAPPERS}</files>
-                    <type>exact</type>
-                    <substitutionList>
-                        <substitution>
-                            <pattern>@@BITROCK_SWFTOOLS_ROOTDIR@@</pattern>
-                            <value>${swftools_root_directory}</value>
-                        </substitution>
-                    </substitutionList>
-                </substitute>
-            </actionList>
-        </folder>
-    </folderList>
-</component>