svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- this only affected the template/command servlets that were using parameters and had not already logged in
. Support for 'path' argument on DownloadContentServlet
for example /alfresco/download/direct?path=/Company%20Home/Kev's%20Home%20Space/myimage.jpg
- paths are specified in a similar way to webdav path - they are 'cm:name' based URL encoded strings
- this means we no longer need to have the NodeRef to a document to download it
. Support for 'templatePath' and 'contextPath' URL arguments in TemplateContentServlet
for example: /alfresco/template?templatePath=/Company%20Home/Data%20Dictionary/Presentation%20Templates/doc_info.ftl&contextPath=/Company%20Home/file.txt
- the 'templatePath' argument specifies the cm:name based path to the template to execute
- the 'contextPath' argument specifies the cm:name based path to the context for the template
. Support for 'scriptPath' and 'contextPath' URL arguments in Script CommandProcessor
for example: /alfresco/command/script/execute?scriptPath=/Company%20Home/Data%20Dictionary/Scripts/append%20copyright.js&contextPath=/Company%20Home/file.txt
- the 'scriptPath' argument specifies the cm:name based path to the script to execute
- the 'contextPath' argument specifies the cm:name based path to the context for the script
. Adding debugging output to get timings for executing templates and scripts
. Enhancements and additions to JavaScript API:
setPermission()
removePermission()
get/setInheritsPermissions()
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261