Merged V3.4-BUG-FIX to HEAD

29333: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
      29311: Fixed tomcat shutdown problem (ALF-9574)
   29337: Merged DEV to V3.4-BUG-FIX
      29336: ALF-8554 : matchesEncodedPattern in ISO9075 class fails with some values
             Corrected matchesEncodedPattern method and unit test added to demonstrate the problem has gone.
   29340: Merged DEV to HEAD
      29330: ALF-3681 : Webdav lock issue returned on 3.3g and 4.0a
             LockMethod corrected: expiryDate (as lockOwner) should be cached in fileInfo's properties for correct response generation.
   29361: Fix for CIFS desktop actions are copied by copying a folder: ALF-8640.
   Pseudo file creates are converted to a file open, they are not writeable, writes are dumped.
   29380: ALF-6434: Better detection / prevention of cyclic group relationships in LDAP sync
   29387: Incremented version.revision for 3.4.5
   29388: Merged V3.4 to V3.4-BUG-FIX
      29307: Merged V3.4-BUG-FIX to V3.4 (3.4.4) (RECORD ONLY)
      29314: ALF-9612: Temporary placeholders for missing installer translations
      29385: ALF-9612: New installer translations from Gloria


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

source/java/org/alfresco/repo/webdav/LockMethod.java

@@ -329,6 +329,9 @@ public class LockMethod extends WebDAVMethod
             
             // update local cache (will be read back when generating the response)
             lockNode.getProperties().put(ContentModel.PROP_LOCK_OWNER, userName);
+            // ALF-3681, we should also cache the expiryDate for correct response generation
+            lockNode.getProperties().put(ContentModel.PROP_EXPIRY_DATE, 
+                    getNodeService().getProperty(lockNode.getNodeRef(), ContentModel.PROP_EXPIRY_DATE));
 
             //this.lockInfo.setToken(lockToken);
             getNodeService().setProperty(lockNode.getNodeRef(), WebDAVModel.PROP_OPAQUE_LOCK_TOKEN, lockToken);