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

package move to o.a.a.r module redback-users-ldap

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310834 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-07 19:40:24 +00:00
parent 49d699e0f9
commit 8c2e9c857e
12 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java
View File

@ -30,7 +30,7 @@
import org.codehaus.plexus.redback.common.ldap.connection.LdapConnectionFactory;
import org.codehaus.plexus.redback.common.ldap.connection.LdapException;
import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.users.ldap.service.LdapCacheService;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

6
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java
View File

@ -20,14 +20,11 @@
*/
import junit.framework.TestCase;
import org.codehaus.plexus.cache.builder.CacheBuilder;
import org.codehaus.plexus.redback.authentication.AuthenticationResult;
import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.common.ldap.LdapUser;
import org.codehaus.plexus.redback.common.ldap.connection.LdapConnection;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder;
import org.codehaus.plexus.redback.users.ldap.service.LdapCacheService;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.codehaus.redback.components.apacheds.ApacheDs;
import org.junit.After;
import org.junit.Before;
@ -46,7 +43,6 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import java.util.Calendar;
import java.util.Date;
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = "classpath*:/META-INF/spring-context.xml" )

8
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/LdapUserManager.java → redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.users.ldap;
package org.apache.archiva.redback.users.ldap;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -30,9 +30,9 @@
import org.codehaus.plexus.redback.common.ldap.connection.LdapConnectionFactory;
import org.codehaus.plexus.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.users.UserQuery;
import org.codehaus.plexus.redback.users.ldap.ctl.LdapController;
import org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerException;
import org.codehaus.plexus.redback.users.ldap.service.LdapCacheService;
import org.apache.archiva.redback.users.ldap.ctl.LdapController;
import org.apache.archiva.redback.users.ldap.ctl.LdapControllerException;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.springframework.stereotype.Service;
import javax.inject.Inject;

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

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

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

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.users.ldap.ctl;
package org.apache.archiva.redback.users.ldap.ctl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -39,7 +39,7 @@
import org.codehaus.plexus.redback.common.ldap.LdapUserMapper;
import org.codehaus.plexus.redback.common.ldap.MappingException;
import org.codehaus.plexus.redback.common.ldap.UserMapper;
import org.codehaus.plexus.redback.users.ldap.LdapUserQuery;
import org.apache.archiva.redback.users.ldap.LdapUserQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -191,7 +191,7 @@ public Collection<User> getUsers( DirContext context )
}
/**
* @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUsersByQuery(org.codehaus.plexus.redback.users.ldap.LdapUserQuery, javax.naming.directory.DirContext)
* @see org.codehaus.plexus.redback.users.ldap.ctl.LdapControllerI#getUsersByQuery(org.apache.archiva.redback.users.ldap.LdapUserQuery, javax.naming.directory.DirContext)
*/
public List<User> getUsersByQuery( LdapUserQuery query, DirContext context )
throws LdapControllerException, MappingException

4
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/LdapController.java → redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapController.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.users.ldap.ctl;
package org.apache.archiva.redback.users.ldap.ctl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,7 +22,7 @@
import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.common.ldap.LdapUser;
import org.codehaus.plexus.redback.common.ldap.MappingException;
import org.codehaus.plexus.redback.users.ldap.LdapUserQuery;
import org.apache.archiva.redback.users.ldap.LdapUserQuery;
import javax.naming.directory.DirContext;
import java.util.Collection;

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/ctl/LdapControllerException.java → redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/LdapControllerException.java
View File

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

5
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/codehaus/plexus/redback/users/ldap/service/DefaultLdapCacheService.java → redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.users.ldap.service;
package org.apache.archiva.redback.users.ldap.service;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,6 +19,7 @@
* under the License.
*/
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.codehaus.plexus.cache.builder.CacheBuilder;
import org.codehaus.plexus.redback.common.ldap.LdapUser;
import org.springframework.stereotype.Service;
@ -97,7 +98,7 @@ public boolean removeLdapUserDn( String username )
}
/**
* @see org.codehaus.plexus.redback.users.ldap.service.LdapCacheService#removeAllLdapUserDn()
* @see org.apache.archiva.redback.users.ldap.service.LdapCacheService#removeAllLdapUserDn()
*/
public void removeAllLdapUserDn()
{

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

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

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

@ -29,7 +29,7 @@
<context:annotation-config />
<context:component-scan
base-package="org.codehaus.plexus.redback.users.ldap"/>
base-package="org.apache.archiva.redback.users.ldap"/>
<!-- REDBACK-289/MRM-1488 -->
<!-- Cache for LDAP users. Data is refreshed every 3 mins. -->

4
redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/codehaus/plexus/redback/users/ldap/LdapUserManagerTest.java → redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.users.ldap;
package org.apache.archiva.redback.users.ldap;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -27,7 +27,7 @@
import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.users.ldap.service.LdapCacheService;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.codehaus.redback.components.apacheds.ApacheDs;
import org.junit.After;
import org.junit.Before;

3
redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/codehaus/plexus/redback/users/ldap/service/LdapCacheServiceTest.java → redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.users.ldap.service;
package org.apache.archiva.redback.users.ldap.service;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,6 +20,7 @@
*/
import junit.framework.TestCase;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.codehaus.plexus.redback.common.ldap.LdapUser;
import org.junit.After;
import org.junit.Test;