34397: ALF-13064: Updated document lib WebScript to protect against access errors dealing with permissions of locked documents
34406: ALF-13069: Fix flash upload file selection page title corruption
34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
34439: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
34438: Fix to issue where new Hazelcast based Share clustering was broken by a recent SpringSurf change to ServletRequestContextFactory bean config in libs rev 1028 or higher.
34443: ALF-11433: IE8 specific fix to ensure that document-picker panel is hidden before documents selected event is fired and for TinyMCE to set focus on editor so that content is added correctly
34457: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
34354: ALF-12995 - IMAP: File is modified when received as a message in IMAP account
34444: ALF-12169: Guest/guest/gUest username is now normalized to corresponding person's user ID during authentication, solving problems with synchronization with Active Directory's Guest account
34454: Java 1.6.0_31 for 3.4.9 and 4.0.2
34458: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
34392: ALF-13146: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
- From Pavel: "Some users from ldap don't have lastName. That is why NPE occurs."
34459: Merged V4.0 to V4.0-BUG-FIX
34391: Merged DEV to V4.0 (with corrections)
34390: ALF-13013 : It's impossible to change Activities Feed properties on Websphere
Now the Schedule subtree in JMX is set to the correct MBeanServer.
34407: Merged HEAD-2011_12_06 to V4.0 (4.0.1)
Updated copyrights
32813: ALF-4098: WCM: Assets in in-flight worflow are allowed to be edited.
Ability of editing assets submitted to 'in-flight' workflow has been removed:
- .AVMSyncService. service interface was expanded with new method .List<AVMDifference> compare(int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder, boolean expandDirs). to introduce ability of collecting all created/modified items in created/modified folder;
- all .AVMSyncService. implementations were expanded in accordance with changes in interface;
- new tests for newly created items, items in modified folder and for deleted items in modified folder were added
34414: ALF-11607: Bootstrap fails against database 'DB2/LINUXX8664'
- Patched hibernate jar to recognize DB2 64 bit Linux
34416: ALF-12992: Updated weblogic DD for SOLR
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17307: Merged DEV/BELARUS/V3.2-2009_10_19 to V3.2
17121: ETHREEOH-2999: Accessing Recent snapshots fails in a web project that is created from an already existing project
17223: ETHREEEOH-2999: (post-review changes)
17346: ETHREEOH-2824 - further perf improvement for multiple single submits (to active workflow sandboxes) from large modified list
17375: Fix ETHREEOH-1643 - WCM revert file & version history, including a few unreported WCM / UI revert file issues
17380: ETHREEOH-1643 - fix build/test fallout
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13033: Back end support for ETHREEOH-1179
13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
13046: Merged V3.0 to V3.1
13043: Merged V2.2 to V3.0
13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
13049: Build/test fix (WCM AssetTest)
13057: Merged V2.1-A to V3.1
8770: Added Flex SDK module
8771: Added Flex SDK binary (swc)
DH: I'm not sure about the svn:eol-style property appearing here. SVN Clients?
13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
13060: [no comments]
13061: [no comments]
13063: [no comments]
13064: [no comments]
13066: [no comments]
13067: Add NodeService.getChildrenByName
13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13043
Merged /alfresco/BRANCHES/V2.2:r13016
Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
