Merge V1.2.0 BRANCH to HEAD

svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


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

source/java/org/alfresco/service/cmr/admin/PatchException.java

@@ -27,21 +27,20 @@ public class PatchException extends AlfrescoRuntimeException
 {
     private static final long serialVersionUID = 7022368915143884315L;
 
-    private String report;
-    
     /**
-     * @param report the patch failure report
+     * @param msgId the patch failure message ID
      */
-    public PatchException(String report)
+    public PatchException(String msgId)
     {
-        super(report);
+        super(msgId);
     }
 
     /**
-     * @return Returns the patch failure report
+     * @param msgId the patch failure message ID
+     * @param args variable number of message arguments
      */
-    public String getReport()
+    public PatchException(String msgId, Object ... args)
     {
-        return report;
+        super(msgId, args);
     }
 }

source/java/org/alfresco/service/cmr/model/FileFolderService.java

@@ -61,6 +61,14 @@ public interface FileFolderService
      * Searches for all files and folders with the matching name pattern,
      * using wildcard characters <b>*</b> and <b>?</b>.
      * 
+     * @param contextNodeRef the context of the search.  This node will never be returned
+     *      as part of the search results.
+     * @param namePattern the name of the file or folder to search for, or a
+     *      {@link org.alfresco.util.SearchLanguageConversion#DEF_LUCENE wildcard} pattern
+     *      to search for.
+     * @param includeSubFolders true to search the entire hierarchy below the search context
+     * @return Returns a list of file or folder matches
+     *
      * @see #search(NodeRef, String, boolean, boolean, boolean)
      */
     public List<FileInfo> search(