6950: Fix for forum issue (6111) when using xsl:include
6951: Partial fix for WCM-862
6952: Merged V1.4 to V2.1
6921: Reindex tracking refactoring.
6954: Merged V1.4 to V2.1
6927: Config and startup changes for index tracking
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6846: used ] instead of } in ${ldap.synchronisation.userIdAttributeName]
6856: Fixed 2 NPEs, one reported by MIT and one found by Jan (WCM-835)
6859: Truncate an existing file when uploading via FTP. WCM-836.
6869: Removed temporary files and folders from deploy-installer project
6870: Updated ignore property
6875: Fix for AWC-1605
6878: Fix for AWC-1587
6880: Fix for French language pack - locked_user message
6883: Fix for AWC-1565
6884: Relax trhe permissions required to get the parent links from a child node
6891: Fix for AR-1781 and AR-1782 (requires CHK-1451)
6892: Fixed AR-1777: Node status not updated for addition and removal of secondary associations (affects index tracking)
6893: Sample for replicating content store sample
6896: Added JVM shutdown check into inner loop to get faster breakout in the event of shutdown.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
