diff options
| author | Olivier Lamy <olamy@apache.org> | 2013-01-30 17:42:14 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2013-01-30 17:42:14 +0000 |
| commit | b10b504562d82a11e99d2d951f2b0e8b3901a136 (patch) | |
| tree | 1d4d31eb538f64c23ac6ee04504d7ff62030aa83 | |
| parent | b1f8454b8edfa5ab359284137e867f3c6b321a5c (diff) | |
| download | archiva-b10b504562d82a11e99d2d951f2b0e8b3901a136.tar.gz archiva-b10b504562d82a11e99d2d951f2b0e8b3901a136.zip | |
change signatures to ease ui
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1440547 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 13 insertions, 9 deletions
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java index 909c5578f..1ad54af45 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java @@ -31,13 +31,14 @@ import org.springframework.stereotype.Service; import javax.inject.Inject; import javax.inject.Named; import java.util.Collection; +import java.util.List; import java.util.Map; /** * @author Olivier Lamy * @since 2.1 */ -@Service( "ldapRoleMapperConfiguration#default" ) +@Service("ldapRoleMapperConfiguration#default") public class DefaultLdapRoleMapperConfiguration implements LdapRoleMapperConfiguration { @@ -45,15 +46,17 @@ public class DefaultLdapRoleMapperConfiguration private Logger log = LoggerFactory.getLogger( getClass() ); @Inject - @Named( value = "userConfiguration#default" ) + @Named(value = "userConfiguration#default") private UserConfiguration userConf; - public void addLdapMapping( String role, String ldapGroup ) + + public void addLdapMapping( String ldapGroup, List<String> roles ) + throws MappingException { log.warn( "addLdapMapping not implemented" ); } - public void removeLdapMapping( String role ) + public void removeLdapMapping( String group ) { log.warn( "removeLdapMapping not implemented" ); } diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java index baab69364..d3fc17d58 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java @@ -21,6 +21,7 @@ package org.apache.archiva.redback.common.ldap.role; import org.apache.archiva.redback.common.ldap.MappingException; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -30,20 +31,20 @@ import java.util.Map; public interface LdapRoleMapperConfiguration { /** - * add mapping redback role <-> ldap group + * add mapping ldap group <-> redback roles * - * @param role redback role + * @param roles list of Role names * @param ldapGroup ldap group */ - void addLdapMapping( String role, String ldapGroup ) + void addLdapMapping( String ldapGroup, List<String> roles ) throws MappingException; /** * remove a mapping * - * @param role redback role + * @param group ldap group */ - void removeLdapMapping( String role ) + void removeLdapMapping( String group ) throws MappingException; /** |