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/HEAD/root@117632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-11-16 14:05:07 +00:00
parent 606d2547a0
commit 9ff85cd59e

View File

@@ -46,8 +46,6 @@ ooo.exe=@@BITROCK_LIBREOFFICE_PROGRAM_DIR@@
ooo.enabled=false ooo.enabled=false
ooo.port=@@BITROCK_LO_PORT@@ ooo.port=@@BITROCK_LO_PORT@@
@@BITROCK_ALFRESCO_IMAGEMAGICK_ENV@@ @@BITROCK_ALFRESCO_IMAGEMAGICK_ENV@@
swf.exe=@@BITROCK_PDF2SWF_PATH@@
swf.languagedir=@@BITROCK_PDF2SWF_LANGUAGEDIR@@
jodconverter.enabled=true jodconverter.enabled=true
jodconverter.officeHome=@@BITROCK_LIBREOFFICE_JOD_DIR@@ jodconverter.officeHome=@@BITROCK_LIBREOFFICE_JOD_DIR@@