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

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
This commit is contained in:
Olivier Lamy 2012-12-05 12:57:13 +00:00
parent 3c6f8dc455
commit 6818a0097e
2 changed files with 12 additions and 12 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/LdapUserMapper.java
View File

@ -86,17 +86,17 @@ public class LdapUserMapper
@PostConstruct @PostConstruct
public void initialize() public void initialize()
{ {
emailAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_EMAIL, emailAttribute ); emailAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_EMAIL, emailAttribute );
fullNameAttribute = fullNameAttribute =
userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_FULLNAME, fullNameAttribute ); userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FULLNAME, fullNameAttribute );
passwordAttribute = passwordAttribute =
userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_PASSWORD, passwordAttribute ); userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_PASSWORD, passwordAttribute );
userIdAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_ID, userIdAttribute ); userIdAttribute = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_ID, userIdAttribute );
userBaseDn = userConf.getConcatenatedList( "ldap.config.mapper.attribute.user.base.dn", userBaseDn = userConf.getConcatenatedList( "ldap.config.mapper.attribute.user.base.dn",
userConf.getConcatenatedList( "ldap.config.base.dn", userBaseDn ) ); userConf.getConcatenatedList( "ldap.config.base.dn", userBaseDn ) );
userObjectClass = userObjectClass =
userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_OBJECT_CLASS, userObjectClass ); userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS, userObjectClass );
userFilter = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_ATTRIBUTE_FILTER, userFilter ); userFilter = userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter );
maxResultCount = userConf.getInt( "ldap.config.max.result.count", maxResultCount ); maxResultCount = userConf.getInt( "ldap.config.max.result.count", maxResultCount );
} }

12
redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
View File

@ -61,15 +61,15 @@ public interface UserConfigurationKeys
String EMAIL_URL_PATH = "email.url.path"; String EMAIL_URL_PATH = "email.url.path";
String LDAP_MAPPER_ATTRIBUTE_EMAIL = "ldap.config.mapper.attribute.email"; String LDAP_MAPPER_USER_ATTRIBUTE_EMAIL = "ldap.config.mapper.attribute.email";
String LDAP_MAPPER_ATTRIBUTE_FULLNAME = "ldap.config.mapper.attribute.fullname"; String LDAP_MAPPER_USER_ATTRIBUTE_FULLNAME = "ldap.config.mapper.attribute.fullname";
String LDAP_MAPPER_ATTRIBUTE_PASSWORD = "ldap.config.mapper.attribute.password"; String LDAP_MAPPER_USER_ATTRIBUTE_PASSWORD = "ldap.config.mapper.attribute.password";
String LDAP_MAPPER_ATTRIBUTE_ID = "ldap.config.mapper.attribute.user.id"; String LDAP_MAPPER_USER_ATTRIBUTE_ID = "ldap.config.mapper.attribute.user.id";
String LDAP_MAPPER_ATTRIBUTE_OBJECT_CLASS = "ldap.config.mapper.attribute.user.object.class"; String LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS = "ldap.config.mapper.attribute.user.object.class";
String LDAP_MAPPER_ATTRIBUTE_FILTER = "ldap.config.mapper.attribute.user.filter"; String LDAP_MAPPER_USER_ATTRIBUTE_FILTER = "ldap.config.mapper.attribute.user.filter";
} }