Commit Graph

5 Commits

Author SHA1 Message Date
David Edwards
e1b697d6fa REPO-4400: Remove ssl.keystore and ssl.truststore from alfresco repository.jar (#480)
The ssl.keystore and ssl.truststore files have been moved to enterprise, as repo does not uses these files.
Removed files that are now in packaging
2019-06-11 14:02:25 +01:00
David Edwards
2ee0d62b80 Revert "REPO-4400 Removed files and beans (#465)"
This reverts commit 8f584c86fd.
2019-05-31 16:32:49 +01:00
David Edwards
8f584c86fd REPO-4400 Removed files and beans (#465)
ssl.keystore and ssl.truststore have been deleted alongside their corresponding .properties files.
ssl.keystore and ssl.truststore beans have been removed from encyption-contenxt.xml
2019-05-31 10:42:45 +01:00
alandavis
d1216de8d4 Fix/mnt 18404 image magick fails on windows (#14)
REMO-18404 Environment not being set for ImageMagick

The environment required by ImageMagick was not being set. Even though the environment shown by  log4j.logger.org.alfresco.util.exec.RuntimeExec=trace indicated that the required variables already existed in the current environment, that does not mean they are passed on to the sub process. In this case they were not being passed on and they were not being set as additional variables required by the sub process.

The bug was introduced when Alfresco PDF renderer was added (REPO-2054) to ACS 5.2.1 and ACS 5.2.g. The context file for ImageMagic (imagemagick-transform-context.xml) was used as the basis for Alfresco PDF renderer's context file. Unfortunately the names of the spring beans that provided the Windows and Unix environment variable values were not changed. As a result, ImageMagick was being provided with Alfresco PDF renderer's environment variables.

The Alfresco global property img.gslib and environment variable $GS_LIB set using it, are now redundant following the REPO-2054 work so have been removed in this commit.

When testing this issue we should test ImageMagick and Alfresco PDF renderer on both Windows and Unix (Linux). I have not dug into why ImageMagick and Alfresco PDF renderer are working on Linux. I'm guessing that the current environment is being passed on unlike Windows.
2017-09-11 09:09:33 +01:00
Alex Mukha
5091f63f62 REPO-2724 Add gitignore 2017-07-28 14:53:31 +01:00