diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-12-05 12:57:13 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-12-05 12:57:13 +0000 |
| commit | 6818a0097e6cdb6251c771a53e966fec7527c7c7 (patch) | |
| tree | 8dd22540a211c6268d06799b0983234ea10aab10 /redback-common | |
| parent | 3c6f8dc455d19f69dea8659d0cec71d9442fb3db (diff) | |
| download | archiva-6818a0097e6cdb6251c771a53e966fec7527c7c7.tar.gz archiva-6818a0097e6cdb6251c771a53e966fec7527c7c7.zip | |
use a 'namespace' for user
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1417397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'redback-common')
| -rw-r--r-- | redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java index 28e10390e..107e57b0b 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java @@ -86,17 +86,17 @@ public class LdapUserMapper @PostConstruct public void initialize() { - emailAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_EMAIL, emailAttribute ); + emailAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_EMAIL, emailAttribute ); fullNameAttribute = - userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_FULLNAME, fullNameAttribute ); + userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FULLNAME, fullNameAttribute ); passwordAttribute = - userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_PASSWORD, passwordAttribute ); - userIdAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_ID, userIdAttribute ); + userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_PASSWORD, passwordAttribute ); + userIdAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_ID, userIdAttribute ); userBaseDn = userConf.getConcatenatedList( "ldap.config.mapper.attribute.user.base.dn", userConf.getConcatenatedList( "ldap.config.base.dn", userBaseDn ) ); userObjectClass = - userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_OBJECT_CLASS, userObjectClass ); - userFilter = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_FILTER, userFilter ); + userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS, userObjectClass ); + userFilter = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter ); maxResultCount = userConf.getInt( "ldap.config.max.result.count", maxResultCount ); } |