Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/version/NodeServiceImpl.java

@@ -442,6 +442,15 @@ public class NodeServiceImpl implements NodeService, VersionModel
         return result;
     }
     
+    /**
+     * @throws UnsupportedOperationException always
+     */
+    public NodeRef getChildByName(NodeRef nodeRef, QName assocTypeQName, String childName)
+    {
+        // This operation is not supported for a verion store
+        throw new UnsupportedOperationException(MSG_UNSUPPORTED);
+    }
+
     /**
      * Simulates the node begin attached ot the root node of the version store. 
      */