Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


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

source/java/org/alfresco/repo/admin/patch/AbstractPatch.java

@@ -681,8 +681,8 @@ public abstract class AbstractPatch implements Patch,  ApplicationEventPublisher
     /**
      * Support to report patch completion and estimated completion time.
      * 
-     * @param estimatedTotal
-     * @param currentInteration
+     * @param estimatedTotal long
+     * @param currentInteration long
      */
     protected void reportProgress(long estimatedTotal, long currentInteration)
     {
@@ -735,16 +735,13 @@ public abstract class AbstractPatch implements Patch,  ApplicationEventPublisher
     
     /**
      * Should the patch be deferred? And not run at bootstrap.
-     * @param deferred
+     * @param deferred boolean
      */
     public void setDeferred(boolean deferred)
     {
         this.deferred = deferred;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public boolean isDeferred()
     {
         return this.deferred;

source/java/org/alfresco/repo/admin/patch/OptionalPatchApplicationCheckBootstrapBean.java

@@ -104,7 +104,7 @@ public class OptionalPatchApplicationCheckBootstrapBean extends AbstractLifecycl
     /**
      * Was the patch applied - or was it not applied
      * 
-     * @return
+     * @return boolean
      */
     public boolean getPatchApplied()
     {

source/java/org/alfresco/repo/admin/patch/Patch.java

@@ -111,7 +111,7 @@ public interface Patch
 
     /**
      * Is this patch just ignored - never considered for application
-     * @return
+     * @return boolean
      */
     public boolean isIgnored();
     

source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java

@@ -257,13 +257,11 @@ public class PatchServiceImpl implements PatchService
     }
     
     /**
-     * Reentrant method that ensures that a patch and all its dependencies get applied.
-     * The process terminates on the first failure.
-     * 
-     * @param patch all the executed patch data.  If there was a failure, then this
-     *      is the list of successful executions only.
-     * @param patch the patch (containing dependencies) to apply
-     * @param appliedPatchesById already applied patches keyed by their ID
+     * Reentrant method that ensures that a patch and all its dependencies get applied.
+     * The process terminates on the first failure.
+     * 
+     * @param patch the patch (containing dependencies) to apply
+     * @param appliedPatchesById already applied patches keyed by their ID
      * @return Returns true if the patch and all its dependencies were successfully applied.
      */
     private boolean applyPatchAndDependencies(final Patch patch, Map<String, AppliedPatch> appliedPatchesById)
@@ -471,8 +469,6 @@ public class PatchServiceImpl implements PatchService
         
         /**
          * Perform some setup before applying the patch e.g. check whether the patch needs to be applied.
-         * 
-         * @return true: continue, false: do not apply patch
          */
     	private void setup()
     	{

source/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java

@@ -66,7 +66,7 @@ public abstract class GenericEMailTemplateUpdatePatch extends AbstractPatch
     }
     
     /**
-     * @param createSiblingIfMissing
+     * @param createSiblingIfMissing boolean
      */
     public void setCreateSiblingIfMissing(boolean createSiblingIfMissing)
     {
@@ -74,7 +74,7 @@ public abstract class GenericEMailTemplateUpdatePatch extends AbstractPatch
     }
     
     /**
-     * @param updateBaseFile
+     * @param updateBaseFile boolean
      */
     public void setUpdateBaseFile(boolean updateBaseFile)
     {

source/java/org/alfresco/repo/admin/patch/impl/GenericWorkflowPatch.java

@@ -61,7 +61,7 @@ public class GenericWorkflowPatch extends AbstractPatch implements ApplicationCo
     /**
      * Sets the Workflow Definitions
      * 
-     * @param workflowDefinitions
+     * @param workflowDefinitions List<Properties>
      */
     public void setWorkflowDefinitions(List<Properties> workflowDefinitions)
     {