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

[olamy]

Author: olamy
Date: Tue Jan  8 22:47:29 2013
New Revision: 1430608

URL: http://svn.apache.org/viewvc?rev=1430608&view=rev
Log:
get ldap mapping if existing from security.properties

Modified:
    
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
    
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java

Modified: 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.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/role/DefaultLdapRoleMapper.java?rev=1430608&r1=1430607&r2=1430608&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
 Tue Jan  8 22:47:29 2013
@@ -355,7 +355,8 @@ public class DefaultLdapRoleMapper
         {
             if ( key.startsWith( 
UserConfigurationKeys.LDAP_GROUPS_ROLE_START_KEY ) )
             {
-                map.put( key, userConf.getString( key ) );
+                map.put( StringUtils.substringAfter( key, 
UserConfigurationKeys.LDAP_GROUPS_ROLE_START_KEY ),
+                         userConf.getString( key ) );
             }
         }
 

Modified: 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1430608&r1=1430607&r2=1430608&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
 Tue Jan  8 22:47:29 2013
@@ -226,6 +226,6 @@ public class DefaultUserConfiguration
 
     public Collection<String> getKeys()
     {
-        return this.registry.getSubset( PREFIX ).getKeys();
+        return this.registry.getSubset( PREFIX ).getFullKeys();
     }
 }