From 75be3cfeb0def3c9b06dfa372efdb82b33bb7edb Mon Sep 17 00:00:00 2001 From: Natalia Smintanca Date: Thu, 19 Nov 2015 09:33:36 +0000 Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1) 117632 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1) 117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui, admin ui English property values (translations still exist) and some obvious unit tests. - Note: SWFTransformationOptions has been left as it is used in tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../bitrock/bitrock/alfresco/shared/alfresco-global.properties | 2 -- 1 file changed, 2 deletions(-) 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 e541e43e8a..f70717e112 100644 --- a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties +++ b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties @@ -46,8 +46,6 @@ ooo.exe=@@BITROCK_LIBREOFFICE_PROGRAM_DIR@@ ooo.enabled=false ooo.port=@@BITROCK_LO_PORT@@ @@BITROCK_ALFRESCO_IMAGEMAGICK_ENV@@ -swf.exe=@@BITROCK_PDF2SWF_PATH@@ -swf.languagedir=@@BITROCK_PDF2SWF_LANGUAGEDIR@@ jodconverter.enabled=true jodconverter.officeHome=@@BITROCK_LIBREOFFICE_JOD_DIR@@