Jan Vonka 923af7affd Merged V3.1 to HEAD ...

17133: Merged V2.2 to V3.1
        17132: Fix ETWOONE-394, ETWOTWO-1016 - using regenerate renditions (3rd option) causes locks to remain
    also fix to use getAvmLockingService() 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2009-10-23 15:10:36 +00:00

..

java/org/alfresco

Merged V3.1 to HEAD

2009-10-23 15:10:36 +00:00

meta-inf

New build scripts

2007-03-04 19:05:34 +00:00

test-resources

Fix for ETHREEOH-1811, ETHREEOH-866 & ETHREEOH-2226: Issue with required field nodes within optional parent node that is a complextype

2009-10-22 10:58:34 +00:00

web

Merged DEV-TEMPORARY to HEAD

2009-10-23 09:43:24 +00:00