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

fix compilation 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1439711 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-29 00:09:10 +00:00
parent 921d02c1ad
commit b1f8454b8e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
View File

@ -26,6 +26,7 @@ import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapperConfiguration;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
@ -102,6 +103,10 @@ public class LdapRbacManager
@Inject
private LdapController ldapController;
@Inject
@Named( value = "ldapRoleMapperConfiguration#default" )
private LdapRoleMapperConfiguration ldapRoleMapperConfiguration;
@Inject
@Named( value = "cache#ldapRoles" )
private Cache<String, Role> rolesCache;
@ -206,7 +211,7 @@ public class LdapRbacManager
{
try
{
Collection<Collection<String>> roleNames = ldapRoleMapper.getLdapGroupMappings().values();
Collection<Collection<String>> roleNames = ldapRoleMapperConfiguration.getLdapGroupMappings().values();
Set<Role> roles = new HashSet<Role>();
@ -356,7 +361,7 @@ public class LdapRbacManager
}
List<Role> roles = new ArrayList<Role>( groups.size() );
Map<String, Collection<String>> mappedGroups = ldapRoleMapper.getLdapGroupMappings();
Map<String, Collection<String>> mappedGroups = ldapRoleMapperConfiguration.getLdapGroupMappings();
for ( String group : groups )
{
Collection<String> roleNames = mappedGroups.get( group );