From: Olivier Lamy Date: Fri, 18 Jan 2013 17:59:19 +0000 (+0000) Subject: remove non used field X-Git-Tag: redback-2.1~91 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8c1281d90539f646aaa26f80f35ae21eb05c4f3c;p=archiva.git remove non used field git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1435279 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java index e426859a0..16b7ed903 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java @@ -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; //--------------------------- @@ -81,8 +81,6 @@ public class DefaultLdapRoleMapper private String baseDn; - private boolean writableLdap = false; - private boolean useDefaultRoleName = false; @PostConstruct @@ -99,8 +97,6 @@ public class DefaultLdapRoleMapper this.groupsDn = this.baseDn; } - this.writableLdap = userConf.getBoolean( UserConfigurationKeys.LDAP_WRITABLE, this.writableLdap ); - this.useDefaultRoleName = userConf.getBoolean( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME, this.useDefaultRoleName ); } 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 91a3027ac..48fddf4d4 100644 --- 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 @@ -263,6 +263,8 @@ public class LdapRbacManager //return this.rbacImpl.getAllRoles(); } + + public List getAllUserAssignments() throws RbacManagerException { @@ -781,6 +783,7 @@ public class LdapRbacManager return roleExists( role.getName() ); } + @Override public boolean roleExists( String name ) throws RbacManagerException {