inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
View File

@@ -84,7 +84,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
/**
* Set if guest login is supported.
*
* @param allowGuestLogin
* @param allowGuestLogin Boolean
*/
public void setAllowGuestLogin(Boolean allowGuestLogin)
{
@@ -183,8 +183,8 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
* authentication component as it will support guest login - prior to this direct over ride for authenticate(String ,
* char[]) was used. This will still work.
*
* @param userName
* @param password
* @param userName String
* @param password char[]
*/
protected void authenticateImpl(String userName, char[] password)
{
@@ -292,8 +292,8 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
/**
* Default implementation that makes an ACEGI object on the fly
*
* @param userName
* @return
* @param userName String
* @return UserDetails
*/
protected UserDetails getUserDetails(String userName)
{
@@ -303,9 +303,6 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
return ud;
}
/**
* {@inheritDoc}
*/
public Authentication setCurrentAuthentication(Authentication authentication)
{
return this.authenticationContext.setCurrentAuthentication(authentication);
@@ -593,7 +590,7 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
/**
* Convenience method to allow the administrator user names to be specified as a comma separated list
*
* @param defaultAdministratorUserNames
* @param defaultAdministratorUserNames String
*/
public void setDefaultAdministratorUserNameList(String defaultAdministratorUserNames)
{
@@ -605,32 +602,29 @@ public abstract class AbstractAuthenticationComponent implements AuthenticationC
setDefaultAdministratorUserNames(nameSet);
}
/**
* {@inheritDoc}
*/
public Set<String> getDefaultGuestUserNames()
{
return this.defaultGuestUserNames;
}
/**
* Sets the user names who for this particular authentication system should be considered administrators by default.
*
* @param defaultGuestUserNames
* a set of user names
*/
public void setDefaultGuestUserNames(Set<String> defaultGuestUserNames)
/**
* Sets the user names who for this particular authentication system should be considered administrators by default.
*
* @param defaultGuestUserNames
* a set of user names
*/
public void setDefaultGuestUserNames(Set<String> defaultGuestUserNames)
{
this.defaultGuestUserNames = defaultGuestUserNames;
}
/**
* Convenience method to allow the administrator user names to be specified as a comma separated list
*
* @param defaultGuestUserNames
*/
public void setDefaultGuestUserNameList(String defaultGuestUserNames)
{
/**
* Convenience method to allow the administrator user names to be specified as a comma separated list
*
* @param defaultGuestUserNames String
*/
public void setDefaultGuestUserNameList(String defaultGuestUserNames)
{
Set<String> nameSet = new TreeSet<String>();
if (defaultGuestUserNames.length() > 0)
{