Merged HEAD (5.1) to 5.1.N (5.1.1)

119450 mcozma: Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
   ACE-4716 Can't rename a document in a virtual context from CMIS
   ACE-4752 Type virtualization method does not work
   ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
   ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java

@@ -435,6 +435,8 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
      * @see org.alfresco.service.cmr.model.FileFolderService#list(org.alfresco.service.cmr.repository.NodeRef, boolean, boolean, java.util.Set, org.alfresco.service.cmr.model.PagingSortRequest)
      */
     @Auditable(parameters = {"contextNodeRef", "files", "folders", "ignoreQNames", "sortProps", "pagingRequest"})
+    @Override
+    @Extend(traitAPI = FileFolderServiceTrait.class, extensionAPI = FileFolderServiceExtension.class)
     public PagingResults<FileInfo> list(NodeRef contextNodeRef,
                                       boolean files,
                                       boolean folders,
@@ -1251,7 +1253,7 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
     {
         return createImpl(parentNodeRef, name, typeQName, assocQName);
     }
-    
+
     private FileInfo createImpl(NodeRef parentNodeRef, String name, QName typeQName, QName assocQName) throws FileExistsException
     {
         // set up initial properties
@@ -1785,5 +1787,21 @@ public class FileFolderServiceImpl extends AbstractBaseCopyService implements Fi
             return thisService.rename(sourceNodeRef, newName);
                                        
         }
+
+        
+        public PagingResults<FileInfo> list(NodeRef contextNodeRef,
+                    boolean files,
+                    boolean folders,
+                    Set<QName> ignoreQNames,
+                    List<Pair<QName, Boolean>> sortProps,
+                    PagingRequest pagingRequest)
+        {
+            return thisService.list(contextNodeRef,
+                                    files,
+                                    folders,
+                                    ignoreQNames,
+                                    sortProps,
+                                    pagingRequest);
+        }
     };
 }