svn commit: r1417397 - in /archiva/redback/redback-core/trunk: redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/ redback-configuration/src/main/java/org/apache/archiva/redback/configuration/

[olamy]

Author: olamy
Date: Wed Dec  5 12:57:13 2012
New Revision: 1417397

URL: http://svn.apache.org/viewvc?rev=1417397&view=rev
Log:
 use a 'namespace' for user

Modified:
    
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
    
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java

Modified: 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java?rev=1417397&r1=1417396&r2=1417397&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
 Wed Dec  5 12:57:13 2012
@@ -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 );
     }
 

Modified: 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java?rev=1417397&r1=1417396&r2=1417397&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
 Wed Dec  5 12:57:13 2012
@@ -61,15 +61,15 @@ public interface UserConfigurationKeys
 
     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";
 }