Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move user concerns to a specific package 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1428474 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-03 17:03:03 +00:00
parent 72e1da8091
commit 56b338cb19
15 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
View File

@ -20,8 +20,7 @@ package org.apache.archiva.redback.authentication.ldap;
*/ */
import org.apache.archiva.redback.authentication.AbstractAuthenticator; import org.apache.archiva.redback.authentication.AbstractAuthenticator;
import org.apache.archiva.redback.authentication.AuthenticationConstants; import org.apache.archiva.redback.common.ldap.user.UserMapper;
import org.apache.archiva.redback.common.ldap.UserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory; import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.configuration.UserConfigurationKeys;
@ -45,8 +44,6 @@ import javax.naming.NamingException;
import javax.naming.directory.DirContext; import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls; import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult; import javax.naming.directory.SearchResult;
import java.util.HashMap;
import java.util.Map;
/** /**
* LdapBindAuthenticator: * LdapBindAuthenticator:

2
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
View File

@ -46,7 +46,7 @@
<property name="userConf" ref="userConfiguration#default"/> <property name="userConf" ref="userConfiguration#default"/>
</bean> </bean>
<bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper"> <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.user.LdapUserMapper">
<property name="emailAttribute" value="mail"/> <property name="emailAttribute" value="mail"/>
<property name="fullNameAttribute" value="givenName"/> <property name="fullNameAttribute" value="givenName"/>
<property name="passwordAttribute" value="userPassword"/> <property name="passwordAttribute" value="userPassword"/>

2
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUser.java → redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUser.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.redback.common.ldap; package org.apache.archiva.redback.common.ldap.user;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java → redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.redback.common.ldap; package org.apache.archiva.redback.common.ldap.user;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -19,6 +19,8 @@ package org.apache.archiva.redback.common.ldap;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.common.ldap.LdapUtils;
import org.apache.archiva.redback.common.ldap.MappingException;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;

3
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserMapper.java → redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/UserMapper.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.redback.common.ldap; package org.apache.archiva.redback.common.ldap.user;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -19,6 +19,7 @@ package org.apache.archiva.redback.common.ldap;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.common.ldap.MappingException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import javax.naming.directory.Attributes; import javax.naming.directory.Attributes;

2
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/UserUpdate.java → redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/UserUpdate.java
View File

@ -1,4 +1,4 @@
package org.apache.archiva.redback.common.ldap; package org.apache.archiva.redback.common.ldap.user;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.common.ldap;
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.common.ldap.LdapUserMapper; import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;

4
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
View File

@ -20,8 +20,8 @@ package org.apache.archiva.redback.users.ldap;
*/ */
import org.apache.archiva.redback.common.ldap.LdapUser; import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.common.ldap.UserMapper; import org.apache.archiva.redback.common.ldap.user.UserMapper;
import org.apache.archiva.redback.users.AbstractUserManager; import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserQuery.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.ldap;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.common.ldap.UserMapper; import org.apache.archiva.redback.common.ldap.user.UserMapper;
import org.apache.archiva.redback.users.AbstractUserQuery; import org.apache.archiva.redback.users.AbstractUserQuery;
public class LdapUserQuery public class LdapUserQuery

6
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
View File

@ -33,9 +33,9 @@ import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls; import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult; import javax.naming.directory.SearchResult;
import org.apache.archiva.redback.common.ldap.LdapUser; import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.common.ldap.LdapUserMapper; import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
import org.apache.archiva.redback.common.ldap.UserMapper; import org.apache.archiva.redback.common.ldap.user.UserMapper;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.common.ldap.MappingException; import org.apache.archiva.redback.common.ldap.MappingException;

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.ldap.ctl;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.common.ldap.LdapUser; import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.common.ldap.MappingException; import org.apache.archiva.redback.common.ldap.MappingException;
import org.apache.archiva.redback.users.ldap.LdapUserQuery; import org.apache.archiva.redback.users.ldap.LdapUserQuery;

4
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.ldap.service;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.common.ldap.LdapUser; import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.components.cache.builder.CacheBuilder; import org.apache.archiva.redback.components.cache.builder.CacheBuilder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -65,7 +65,7 @@ public class DefaultLdapCacheService
} }
/** /**
* @see LdapCacheService#addUser(org.apache.archiva.redback.common.ldap.LdapUser) * @see LdapCacheService#addUser(org.apache.archiva.redback.common.ldap.user.LdapUser)
*/ */
public void addUser( LdapUser user ) public void addUser( LdapUser user )
{ {

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/LdapCacheService.java
View File

@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.ldap.service;
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.common.ldap.LdapUser; import org.apache.archiva.redback.common.ldap.user.LdapUser;
/** /**
* LdapCacheService * LdapCacheService

2
redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
View File

@ -20,7 +20,7 @@ package org.apache.archiva.redback.users.ldap.service;
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.common.ldap.LdapUser; import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

2
redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
View File

@ -46,7 +46,7 @@
<property name="userConf" ref="userConfiguration#default"/> <property name="userConf" ref="userConfiguration#default"/>
</bean> </bean>
<bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper"> <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.user.LdapUserMapper">
<property name="emailAttribute" value="mail"/> <property name="emailAttribute" value="mail"/>
<property name="fullNameAttribute" value="givenName"/> <property name="fullNameAttribute" value="givenName"/>
<property name="passwordAttribute" value="userPassword"/> <property name="passwordAttribute" value="userPassword"/>