Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure using default role names when configured 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1436685 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-21 23:11:33 +00:00
parent 931c1cd295
commit 26afe7802f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
View File

@ -57,7 +57,7 @@ import java.util.Set;
* @author Olivier Lamy
* @since 2.1
*/
@Service( "ldapRoleMapper#default" )
@Service("ldapRoleMapper#default")
public class DefaultLdapRoleMapper
implements LdapRoleMapper
{
@ -68,7 +68,7 @@ public class DefaultLdapRoleMapper
private LdapConnectionFactory ldapConnectionFactory;
@Inject
@Named( value = "userConfiguration#default" )
@Named(value = "userConfiguration#default")
private UserConfiguration userConf;
//---------------------------
@ -414,6 +414,13 @@ public class DefaultLdapRoleMapper
roles.add( role );
}
}
else
{
if ( this.useDefaultRoleName )
{
roles.add( group );
}
}
}
return new ArrayList<String>( roles );
@ -800,7 +807,6 @@ public class DefaultLdapRoleMapper
}
public String getUserIdAttribute()
{
return userIdAttribute;