Author: olamy
Date: Wed Jan 30 17:42:14 2013
New Revision: 1440547
URL: http://svn.apache.org/viewvc?rev=1440547&view=rev
Log:
change signatures to ease ui
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java?rev=1440547&r1=1440546&r2=1440547&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
Wed Jan 30 17:42:14 2013
@@ -31,13 +31,14 @@ import org.springframework.stereotype.Se
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 DefaultLdapRoleMapperConfig
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" );
}
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java?rev=1440547&r1=1440546&r2=1440547&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/LdapRoleMapperConfiguration.java
Wed Jan 30 17:42:14 2013
@@ -21,6 +21,7 @@ package org.apache.archiva.redback.commo
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;
/**
