47581: Merged DEV to V4.1-BUG-FIX (with corrections)
47557: ALF-16846 : Checkout version from Microsoft Office does not work
AlfrescoCheckOutCheckInServiceHandler.checkOutDocument() was changed. Now we unlock before checkout if current user is LOCK_OWNER and a node has a WRITE_LOCK lock type.
47584: Remove unused import
47586: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
47583: Add serialVersionUID for Path$Element (see ALF-18265)
47599: Set Surf version to 1.2.0-SNAPSHOT in POMs
47616: Workaround ALF-16888: NodeServiceTest.testConcurrentArchive() failing on DB2
- This test no longer runs on DB2
- Unable to find configuration that allows it to succeed
47640: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX
47576: Merged DEV to PATCHES/V4.1.4
47560: ALF-18248 : Upgrade from 3.2.2 to 4.1.4 fails with java.lang.NullPointerException when applying patch 'patch.thumbnailsAssocQName'
Test for null value was added to the QNamePatch#applyInternal() method.
47638: ALF-18258: Alfresco does not start with XAM module applied
- Broke circular dependency in storeSelectorContentStoreBase
47639: ALF-18249: Fixed performance-killing typo discovered by Kev!
- One innocent ! sign got lost
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261