Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


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

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

@@ -33,17 +33,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 public interface LockInfo
 {
-    /**
-     * Retrieves the {@link ReentrantReadWriteLock} associated with this LockInfo. This is
-     * to allow client code to protect against invalid concurrent access to the state of
-     * this class.
-     * <p>
-     * Not to be confused with WebDAV locks.
-     * 
-     * @return
-     */
-    ReentrantReadWriteLock getRWLock();
-
     /**
      * Returns true if node has shared or exclusive locks
      * 
@@ -122,12 +111,12 @@ public interface LockInfo
     boolean isShared();
 
     /**
-     * Return the lock info as a string
+     * Return the lock info as a JSON string
      * 
      * @return String
      */
-    String toString();
-
+    String toJSON();
+    
     /**
      * Whether this lock has expired. If no expiry is set (i.e. expires is null)
      * then false is always returned.