Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A32E5E2BF for ; Tue, 15 Jan 2013 22:32:03 +0000 (UTC) Received: (qmail 56033 invoked by uid 500); 15 Jan 2013 22:32:03 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 56006 invoked by uid 500); 15 Jan 2013 22:32:03 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 55999 invoked by uid 99); 15 Jan 2013 22:32:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2013 22:32:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2013 22:32:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4B03F23889E7; Tue, 15 Jan 2013 22:31:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1433711 - in /archiva/redback/redback-core/trunk/redback-rbac: redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/ redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/ redback-rbac-role... Date: Tue, 15 Jan 2013 22:31:40 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130115223140.4B03F23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Tue Jan 15 22:31:39 2013 New Revision: 1433711 URL: http://svn.apache.org/viewvc?rev=1433711&view=rev Log: methods already defined in parent Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.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 archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1433711&r1=1433710&r2=1433711&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java (original) +++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java Tue Jan 15 22:31:39 2013 @@ -648,7 +648,6 @@ public abstract class AbstractRBACManage * @throws RbacManagerException * @throws RbacObjectNotFoundException */ - @SuppressWarnings( "unchecked" ) public Collection getEffectivelyUnassignedRoles( String principal ) throws RbacManagerException, RbacObjectNotFoundException { @@ -668,7 +667,6 @@ public abstract class AbstractRBACManage * @throws RbacManagerException * @throws RbacObjectNotFoundException */ - @SuppressWarnings( "unchecked" ) public Collection getUnassignedRoles( String principal ) throws RbacManagerException, RbacObjectNotFoundException { 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=1433711&r1=1433710&r2=1433711&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 Tue Jan 15 22:31:39 2013 @@ -268,12 +268,13 @@ public class LdapRbacManager } } - public Map> getAssignedPermissionMap( String username ) - throws RbacManagerException - { - // TODO here !! - return this.rbacImpl.getAssignedPermissionMap( username ); - } + /** + * public Map> getAssignedPermissionMap( String username ) + * throws RbacManagerException + * { + * return this.rbacImpl.getAssignedPermissionMap( username ); + * }* + */ /*public Set getAssignedPermissions( String username ) throws RbacObjectNotFoundException, RbacManagerException @@ -281,7 +282,6 @@ public class LdapRbacManager // TODO here !! return this.rbacImpl.getAssignedPermissions( username ); }*/ - private List mapToRoles( List 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 getChildRoles( Role role ) @@ -355,19 +354,21 @@ public class LdapRbacManager return this.rbacImpl.getParentRoles( role ); } + /** public Collection getEffectivelyAssignedRoles( String username ) throws RbacManagerException { // TODO here !! return this.rbacImpl.getEffectivelyAssignedRoles( username ); - } + }**/ + /** public Collection getEffectivelyUnassignedRoles( String username ) throws RbacManagerException { // TODO here !! return this.rbacImpl.getEffectivelyUnassignedRoles( username ); - } + }**/ public Set getEffectiveRoles( Role role ) throws RbacManagerException Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java?rev=1433711&r1=1433710&r2=1433711&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java (original) +++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java Tue Jan 15 22:31:39 2013 @@ -208,7 +208,7 @@ public class DefaultRoleModelProcessor // add link from parent roles to this new role if ( roleProfile.getParentRoles() != null ) { - for ( String parentRoleId : (List) roleProfile.getParentRoles() ) + for ( String parentRoleId : roleProfile.getParentRoles() ) { ModelRole parentModelRole = RoleModelUtils.getModelRole( model, parentRoleId ); Role parentRole = rbacManager.getRole( parentModelRole.getName() );