Merged V3.2 to HEAD

19410: Fix for ALF-2070 and new test



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-03-19 16:41:04 +00:00
parent 9fe04de588
commit 321d280040

View File

@@ -392,12 +392,12 @@ deployment.rmi.service.port=50507
mbean.server.locateExistingServerIfPossible=true mbean.server.locateExistingServerIfPossible=true
# External executable locations # External executable locations
ooo.exe=soffice ooo.exe=/Applications/OpenOffice.org.app/Contents/MacOS/soffice
ooo.user=${dir.root}/oouser ooo.user=${dir.root}/oouser
img.root=./ImageMagick img.root=/Users/neil/alfresco/devenv/ImageMagick-6.4.5/ImageMagick
img.dyn=${img.root}/lib img.dyn=${img.root}/lib
img.exe=${img.root}/bin/convert img.exe=${img.root}/bin/convert
swf.exe=./bin/pdf2swf swf.exe=/Users/neil/alfresco/devenv/bin/pdf2swf
# Property to enable upgrade from 2.1-A # Property to enable upgrade from 2.1-A
V2.1-A.fixes.to.schema=0 V2.1-A.fixes.to.schema=0