svn commit: r1437805 - in /archiva/redback/redback-core/trunk: redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/ redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/...

[olamy]

Author: olamy
Date: Wed Jan 23 23:51:43 2013
New Revision: 1437805

URL: http://svn.apache.org/viewvc?rev=1437805&view=rev
Log:
honor useDefaultRoleName when searching all roles/groups from ldap

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-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
    
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.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=1437805&r1=1437804&r2=1437805&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
 Wed Jan 23 23:51:43 2013
@@ -813,4 +813,14 @@ public class DefaultLdapRoleMapper
     {
         this.userIdAttribute = userIdAttribute;
     }
+
+    public boolean isUseDefaultRoleName()
+    {
+        return useDefaultRoleName;
+    }
+
+    public void setUseDefaultRoleName( boolean useDefaultRoleName )
+    {
+        this.useDefaultRoleName = useDefaultRoleName;
+    }
 }

Modified: 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.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/LdapRoleMapper.java?rev=1437805&r1=1437804&r2=1437805&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapper.java
 Wed Jan 23 23:51:43 2013
@@ -148,4 +148,6 @@ public interface LdapRoleMapper
 
     String getUserIdAttribute();
 
+    boolean isUseDefaultRoleName();
+
 }

Modified: 
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java?rev=1437805&r1=1437804&r2=1437805&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
 Wed Jan 23 23:51:43 2013
@@ -373,6 +373,25 @@ public class LdapRbacManager
                     }
                 }
             }
+            else if ( this.ldapRoleMapper.isUseDefaultRoleName() )
+            {
+                Role role = null;
+                try
+                {
+                    role = this.rbacImpl.getRole( group );
+                }
+                catch ( RbacObjectNotFoundException e )
+                {
+                    // if it's mapped role to a group it doesn't exist in jdo
+                }
+                role = ( role == null ) ? new RoleImpl( group ) : role;
+                if ( role != null )
+                {
+                    rolesCache.put( role.getName(), role );
+                    roles.add( role );
+                }
+
+            }
         }
         return roles;