svn commit: r1436685 - /archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java

[olamy]

Author: olamy
Date: Mon Jan 21 23:11:33 2013
New Revision: 1436685

URL: http://svn.apache.org/viewvc?rev=1436685&view=rev
Log:
ensure using default role names when configured

Modified:
    
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.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=1436685&r1=1436684&r2=1436685&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
 Mon Jan 21 23:11:33 2013
@@ -57,7 +57,7 @@ import java.util.Set;
  * @author Olivier Lamy
  * @since 2.1
  */
-@Service( "ldapRoleMapper#default" )
+@Service("ldapRoleMapper#default")
 public class DefaultLdapRoleMapper
     implements LdapRoleMapper
 {
@@ -68,7 +68,7 @@ public class DefaultLdapRoleMapper
     private LdapConnectionFactory ldapConnectionFactory;
 
     @Inject
-    @Named( value = "userConfiguration#default" )
+    @Named(value = "userConfiguration#default")
     private UserConfiguration userConf;
 
     //---------------------------
@@ -414,6 +414,13 @@ public class DefaultLdapRoleMapper
                     roles.add( role );
                 }
             }
+            else
+            {
+                if ( this.useDefaultRoleName )
+                {
+                    roles.add( group );
+                }
+            }
         }
 
         return new ArrayList<String>( roles );
@@ -800,7 +807,6 @@ public class DefaultLdapRoleMapper
     }
 
 
-
     public String getUserIdAttribute()
     {
         return userIdAttribute;