You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/15 23:31:40 UTC
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...
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<Role> getEffectivelyUnassignedRoles( String principal )
throws RbacManagerException, RbacObjectNotFoundException
{
@@ -668,7 +667,6 @@ public abstract class AbstractRBACManage
* @throws RbacManagerException
* @throws RbacObjectNotFoundException
*/
- @SuppressWarnings( "unchecked" )
public Collection<Role> 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<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
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<String>) roleProfile.getParentRoles() )
+ for ( String parentRoleId : roleProfile.getParentRoles() )
{
ModelRole parentModelRole = RoleModelUtils.getModelRole( model, parentRoleId );
Role parentRole = rbacManager.getRole( parentModelRole.getName() );