methods already defined in parent

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1433711 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
index 43eb4b7d4ad70a5f5175e961566b38ff8903ea7c..4acb7c05c6397e928fd185321ff6c484c83130da 100644 (file)
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
@@ -648,7 +648,6 @@ public abstract class AbstractRBACManager
      * @throws RbacManagerException
      * @throws RbacObjectNotFoundException
      */
-    @SuppressWarnings( "unchecked" )
     public Collection<Role> getEffectivelyUnassignedRoles( String principal )
         throws RbacManagerException, RbacObjectNotFoundException
     {
@@ -668,7 +667,6 @@ public abstract class AbstractRBACManager
      * @throws RbacManagerException
      * @throws RbacObjectNotFoundException
      */
-    @SuppressWarnings( "unchecked" )
     public Collection<Role> getUnassignedRoles( String principal )
         throws RbacManagerException, RbacObjectNotFoundException
     {

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
index 4953a469918cf4ed56b4d5bad8f11a5eb295d120..95414b758592641ea5fb2a3b9abafc77ae8932e9 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
@@ -268,12 +268,13 @@ public class LdapRbacManager
         }
     }
 
-    public Map<String, List<Permission>> getAssignedPermissionMap( String username )
-        throws RbacManagerException
-    {
-        // TODO here !!
-        return this.rbacImpl.getAssignedPermissionMap( username );
-    }
+    /**
+     * public Map<String, List<Permission>> getAssignedPermissionMap( String username )
+     * throws RbacManagerException
+     * {
+     * return this.rbacImpl.getAssignedPermissionMap( username );
+     * }*
+     */
 
     /*public Set<Permission> getAssignedPermissions( String username )
         throws RbacObjectNotFoundException, RbacManagerException
@@ -281,7 +282,6 @@ public class LdapRbacManager
         // TODO here !!
         return this.rbacImpl.getAssignedPermissions( username );
     }*/
-
     private List<Role> mapToRoles( List<String> groups )
         throws MappingException, RbacManagerException
     {
@@ -325,7 +325,7 @@ public class LdapRbacManager
 
             for ( String name : roleNames )
             {
-                roles.add( new RoleImpl( name ) );
+                roles.add( this.rbacImpl.getRole( name ) );// new RoleImpl( name ) );
             }
 
             return roles;
@@ -340,7 +340,6 @@ public class LdapRbacManager
         throws RbacManagerException
     {
         return getAssignedRoles( userAssignment.getPrincipal() );
-        //return this.rbacImpl.getAssignedRoles( userAssignment );
     }
 
     public Map<String, Role> getChildRoles( Role role )
@@ -355,19 +354,21 @@ public class LdapRbacManager
         return this.rbacImpl.getParentRoles( role );
     }
 
+    /**
     public Collection<Role> getEffectivelyAssignedRoles( String username )
         throws RbacManagerException
     {
         // TODO here !!
         return this.rbacImpl.getEffectivelyAssignedRoles( username );
-    }
+    }**/
 
+    /**
     public Collection<Role> getEffectivelyUnassignedRoles( String username )
         throws RbacManagerException
     {
         // TODO here !!
         return this.rbacImpl.getEffectivelyUnassignedRoles( username );
-    }
+    }**/
 
     public Set<Role> getEffectiveRoles( Role role )
         throws RbacManagerException

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
index 45b4df305eda34382de6a8ab353f05885dad0b31..e4616d9407691eaa3b992eb59b944cf97ad0f34d 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
@@ -208,7 +208,7 @@ public class DefaultRoleModelProcessor
                     // add link from parent roles to this new role
                     if ( roleProfile.getParentRoles() != null )
                     {
-                        for ( String parentRoleId : (List<String>) roleProfile.getParentRoles() )
+                        for ( String parentRoleId : roleProfile.getParentRoles() )
                         {
                             ModelRole parentModelRole = RoleModelUtils.getModelRole( model, parentRoleId );
                             Role parentRole = rbacManager.getRole( parentModelRole.getName() );