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/security/authentication/ldap/LDAPAuthenticationComponentImpl.java

@@ -203,7 +203,7 @@ public class LDAPAuthenticationComponentImpl extends AbstractAuthenticationCompo
     /**
      * Set the unique name of this ldap authentication component e.g. "managed,ldap1"
      * 
-     * @param id
+     * @param id String
      */
     public void setId(String id)
     {

source/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactory.java

@@ -36,7 +36,7 @@ public interface LDAPInitialDirContextFactory
     /**
      * Set the LDAP environment Hashtable properties used ot initialise the LDAP connection.
      * 
-     * @param environment
+     * @param environment Map<String, String>
      */
     public void setInitialDirContextEnvironment(Map<String, String> environment);
     
@@ -47,7 +47,7 @@ public interface LDAPInitialDirContextFactory
      * @param pageSize
      *            if a positive value, indicates that a LDAP v3 RFC 2696 paged results control should be used. The
      *            results of a search operation should be returned by the LDAP server in batches of the specified size.
-     * @param diagnostic           
+     * @param diagnostic AuthenticationDiagnostic
      * @return the default intial dir context
      * @throws AuthenticationException
      *             the authentication exception
@@ -71,7 +71,7 @@ public interface LDAPInitialDirContextFactory
      * Use the environment properties and connect to the LDAP server.
      * Used to obtain read only access to the LDAP server.
      * 
-     * @return
+     * @return InitialDirContext
      * @throws AuthenticationException
      */
     public InitialDirContext getDefaultIntialDirContext() throws AuthenticationException;
@@ -80,7 +80,7 @@ public interface LDAPInitialDirContextFactory
      * Use the environment properties and connect to the LDAP server.
      * Used to obtain read only access to the LDAP server.
      * 
-     * @return
+     * @return InitialDirContext
      * @throws AuthenticationException
      */
     public InitialDirContext getDefaultIntialDirContext(AuthenticationDiagnostic diagnostic) throws AuthenticationException;
@@ -102,9 +102,9 @@ public interface LDAPInitialDirContextFactory
      * Augment the connection environment with the identity and credentials and bind to the ldap server.
      * Mainly used to validate a user's credentials during authentication. 
      * 
-     * @param principal
-     * @param credentials
-     * @return
+     * @param principal String
+     * @param credentials String
+     * @return InitialDirContext
      * @throws AuthenticationException
      */
     public InitialDirContext getInitialDirContext(String principal, String credentials)  throws AuthenticationException;
@@ -113,10 +113,10 @@ public interface LDAPInitialDirContextFactory
      * Augment the connection environment with the identity and credentials and bind to the ldap server.
      * Mainly used to validate a user's credentials during authentication. 
      * 
-     * @param principal
-     * @param credentials
-     * @param diagnostic
-     * @return
+     * @param principal String
+     * @param credentials String
+     * @param diagnostic AuthenticationDiagnostic
+     * @return InitialDirContext
      * @throws AuthenticationException
      */
     public InitialDirContext getInitialDirContext(String principal, String credentials, AuthenticationDiagnostic diagnostic)  throws AuthenticationException;

source/java/org/alfresco/repo/security/authentication/ldap/Monitor.java

@@ -64,8 +64,8 @@ public class Monitor
     /**
      * test authenticate
      * 
-     * @param userName
-     * @param credentials
+     * @param userName String
+     * @param credentials String
      * @throws AuthenticationException
      */
     public CompositeData testAuthenticate(String userName, String credentials)