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/module/LoggerModuleComponent.java

@@ -50,8 +50,8 @@ public class LoggerModuleComponent extends AbstractModuleComponent
 
     /**
      * Set the level at which the bean must log the message.
-     * @param logLevel      One of the {@link LogLevel values}.
-     *                      The default is {@link LogLevel#INFO}.
+     * @param logLevel      One of the {@code LogLevel} values.
+     *                      The default is {@code LogLevel#INFO}.
      */
     public void setLogLevel(String logLevel)
     {

source/java/org/alfresco/repo/module/ModuleComponentHelper.java

@@ -193,9 +193,6 @@ public class ModuleComponentHelper
         }
     }
     
-    /**
-     * {@inheritDoc}
-     */
     public synchronized void startModules()
     {
         // Check properties
@@ -327,9 +324,6 @@ public class ModuleComponentHelper
         }, AuthenticationUtil.getSystemUserName());
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public synchronized void shutdownModules()
     {
         // Check properties
@@ -364,7 +358,7 @@ public class ModuleComponentHelper
 
     /**
      * Checks that all components have been executed or considered for execution.
-     * @param executedComponents
+     * @param executedComponents Set<ModuleComponent>
      */
     private void checkForOrphanComponents(Set<ModuleComponent> executedComponents)
     {
@@ -420,8 +414,8 @@ public class ModuleComponentHelper
     /**
      * Returns the version number of a module from the Registry.
      * 
-     * @param moduleId
-     * @return
+     * @param moduleId String
+     * @return ModuleVersionNumber
      */
     ModuleVersionNumber getVersion(String moduleId)
     {

source/java/org/alfresco/repo/module/ModuleDetailsImpl.java

@@ -77,7 +77,6 @@ public class ModuleDetailsImpl implements ModuleDetails
      * whitespace strings are not supported.
      * 
      * @param properties        the set of properties
-     * @Throws AlfrescoRuntimeException if unable to parse values
      */
     public ModuleDetailsImpl(Properties properties)
     {
@@ -444,11 +443,11 @@ public class ModuleDetailsImpl implements ModuleDetails
     /**
 	 * Grateful received from Apache Commons StringUtils class
 	 * 
-	 * @param array
-	 * @param separator
-	 * @param startIndex
-	 * @param endIndex
-	 * @return
+	 * @param array Object[]
+	 * @param separator char
+	 * @param startIndex int
+	 * @param endIndex int
+	 * @return String
 	 */
     private static String join(Object[] array, char separator, int startIndex, int endIndex) {
 		if (array == null) {

source/java/org/alfresco/repo/module/tool/WarHelper.java

@@ -21,15 +21,15 @@ public interface WarHelper
     /**
      * Gets the module details or an available alias
      * @param war   a valid war file or exploded directory from a war
-     * @param installingModuleDetails
+     * @param installingModuleDetails ModuleDetails
      * @return ModuleDetails
      */
     public ModuleDetails getModuleDetailsOrAlias(TFile war, ModuleDetails installingModuleDetails);
     
     /**
      * Checks the dependencies of this module
-     * @param war
-     * @param installingModuleDetails
+     * @param war TFile
+     * @param installingModuleDetails ModuleDetails
      */
     public void checkModuleDependencies(TFile war, ModuleDetails installingModuleDetails);
      
@@ -45,7 +45,7 @@ public interface WarHelper
      * If not module edition is specfied then it will just return.  However, if an edition is specified and it doesn't match
      * then an error is thrown.
      * @param war   a valid war file or exploded directory from a war
-     * @param installingModuleDetails
+     * @param installingModuleDetails ModuleDetails
      */
     public void checkCompatibleEdition(TFile war, ModuleDetails installingModuleDetails);
 
@@ -54,7 +54,7 @@ public interface WarHelper
      * Returns true if the Share war manifest states its a share war.
      * @since 3.4.11,4.1.1,Community 4.2
      * 
-     * @param war
+     * @param war TFile
      * @return boolean - true if it is a share war
      */
 	public boolean isShareWar(TFile war);

source/java/org/alfresco/repo/module/tool/WarHelperImpl.java

@@ -69,8 +69,8 @@ public class WarHelperImpl implements WarHelper
     /**
      * Checks if the module is compatible using the entry in the manifest. This is more accurate and works for both alfresco.war and share.war, however
      * valid manifest entries weren't added until 3.4.11, 4.1.1 and Community 4.2 
-     * @param war
-     * @param installingModuleDetails
+     * @param war TFile
+     * @param installingModuleDetails ModuleDetails
      */
     protected void checkCompatibleVersionUsingManifest(TFile war, ModuleDetails installingModuleDetails)
     {
@@ -149,9 +149,9 @@ public class WarHelperImpl implements WarHelper
 
 	/**
 	 * Compares the version information with the module details to see if their valid.  If they are invalid then it throws an exception.
-	 * @param warVersion
-	 * @param installingModuleDetails
-	 * @throws ModuleManagementToolException/home/gethin/development/projects/updatetool/code/update-tool
+	 * @param warVersion VersionNumber
+	 * @param installingModuleDetails ModuleDetails
+	 * @throws ModuleManagementToolException
 	 */
 	private void checkVersions(VersionNumber warVersion, ModuleDetails installingModuleDetails) throws ModuleManagementToolException
 	{
@@ -198,8 +198,8 @@ public class WarHelperImpl implements WarHelper
      * Checks to see if the module that is being installed is compatible with the war, (using the entry in the manifest).
      * This is more accurate and works for both alfresco.war and share.war, however
      * valid manifest entries weren't added until 3.4.11, 4.1.1 and Community 4.2 
-     * @param war
-     * @param installingModuleDetails
+     * @param war TFile
+     * @param installingModuleDetails ModuleDetails
      */
     public void checkCompatibleEditionUsingManifest(TFile war, ModuleDetails installingModuleDetails)
     {
@@ -381,8 +381,8 @@ public class WarHelperImpl implements WarHelper
     /**
      * Gets the module details for the specified module from the war.
      * @param war   a valid war file or exploded directory from a war
-     * @param moduleId
-     * @return
+     * @param moduleId String
+     * @return ModuleDetails
      */
     protected ModuleDetails getModuleDetails(TFile war, String moduleId)
     {