You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/05/01 14:17:24 UTC
svn commit: r1477968 - in /archiva/redback/redback-core/trunk:
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/
redback-common/redback-common-ldap/src/main...
Author: olamy
Date: Wed May 1 12:17:23 2013
New Revision: 1477968
URL: http://svn.apache.org/r1477968
Log:
rename to default to have an interface
Removed:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java Wed May 1 12:17:23 2013
@@ -20,6 +20,7 @@ package org.apache.archiva.redback.authe
*/
import org.apache.archiva.redback.authentication.AbstractAuthenticator;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.user.UserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.configuration.UserConfiguration;
@@ -30,7 +31,6 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.slf4j.Logger;
@@ -103,8 +103,8 @@ public class LdapBindAuthenticator
log.debug( "Searching for users with filter: '{}' from base dn: {}", filter, mapper.getUserBaseDn() );
- LdapConnection ldapConnection = null;
- LdapConnection authLdapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
+ DefaultLdapConnection authLdapConnection = null;
NamingEnumeration<SearchResult> results = null;
try
{
@@ -172,13 +172,13 @@ public class LdapBindAuthenticator
return ( source instanceof PasswordBasedAuthenticationDataSource );
}
- private LdapConnection getLdapConnection()
+ private DefaultLdapConnection getLdapConnection()
throws LdapException
{
return connectionFactory.getConnection();
}
- private void closeLdapConnection( LdapConnection ldapConnection )
+ private void closeLdapConnection( DefaultLdapConnection ldapConnection )
{
if ( ldapConnection != null )
{
Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.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/connection/ConfigurableLdapConnectionFactory.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java Wed May 1 12:17:23 2013
@@ -101,28 +101,28 @@ public class ConfigurableLdapConnectionF
// LdapConnectionFactory Implementation
// ----------------------------------------------------------------------
- public LdapConnection getConnection()
+ public DefaultLdapConnection getConnection()
throws LdapException
{
- return new LdapConnection( getLdapConnectionConfiguration(), null );
+ return new DefaultLdapConnection( getLdapConnectionConfiguration(), null );
}
- public LdapConnection getConnection( Rdn subRdn )
+ public DefaultLdapConnection getConnection( Rdn subRdn )
throws LdapException
{
- return new LdapConnection( getLdapConnectionConfiguration(), subRdn );
+ return new DefaultLdapConnection( getLdapConnectionConfiguration(), subRdn );
}
- public LdapConnection getConnection( String bindDn, String password )
+ public DefaultLdapConnection getConnection( String bindDn, String password )
throws LdapException
{
- return new LdapConnection( getLdapConnectionConfiguration(), bindDn, password );
+ return new DefaultLdapConnection( getLdapConnectionConfiguration(), bindDn, password );
}
- public LdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
+ public DefaultLdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
throws LdapException
{
- return new LdapConnection( ldapConnectionConfiguration, null );
+ return new DefaultLdapConnection( ldapConnectionConfiguration, null );
}
public LdapName getBaseDnLdapName()
Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.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/connection/LdapConnectionFactory.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java Wed May 1 12:17:23 2013
@@ -30,16 +30,16 @@ import javax.naming.spi.StateFactory;
*/
public interface LdapConnectionFactory
{
- LdapConnection getConnection()
+ DefaultLdapConnection getConnection()
throws LdapException;
- LdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
+ DefaultLdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
throws LdapException;
- LdapConnection getConnection( Rdn subRdn )
+ DefaultLdapConnection getConnection( Rdn subRdn )
throws LdapException;
- LdapConnection getConnection( String bindDn, String password )
+ DefaultLdapConnection getConnection( String bindDn, String password )
throws LdapException;
LdapName getBaseDnLdapName()
Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java Wed May 1 12:17:23 2013
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.commo
*/
import junit.framework.TestCase;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.components.apacheds.ApacheDs;
import org.apache.archiva.redback.policy.PasswordEncoder;
@@ -89,7 +89,7 @@ public class TestLdapRoleMapper
List<String> roleNames =
Arrays.asList( "Archiva System Administrator", "Internal Repo Manager", "Internal Repo Observer" );
- LdapConnection ldapConnection;
+ DefaultLdapConnection ldapConnection;
DirContext context;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java Wed May 1 12:17:23 2013
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.rest.
*/
import org.apache.archiva.redback.common.ldap.MappingException;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper;
@@ -67,7 +67,7 @@ public class DefaultLdapGroupMappingServ
public StringList getLdapGroups()
throws RedbackServiceException
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
@@ -170,7 +170,7 @@ public class DefaultLdapGroupMappingServ
// utils
//------------------
- protected void closeLdapConnection( LdapConnection ldapConnection )
+ protected void closeLdapConnection( DefaultLdapConnection ldapConnection )
{
if ( ldapConnection != null )
{
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java Wed May 1 12:17:23 2013
@@ -19,10 +19,8 @@ package org.apache.archiva.redback.rbac.
* under the License.
*/
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
import org.apache.archiva.redback.common.ldap.MappingException;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper;
@@ -176,7 +174,7 @@ public class LdapRbacManager
{
if ( writableLdap )
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -252,7 +250,7 @@ public class LdapRbacManager
public List<Role> getAllRoles()
throws RbacManagerException
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -282,7 +280,7 @@ public class LdapRbacManager
public List<UserAssignment> getAllUserAssignments()
throws RbacManagerException
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -315,7 +313,7 @@ public class LdapRbacManager
}
}
- protected void closeLdapConnection( LdapConnection ldapConnection )
+ protected void closeLdapConnection( DefaultLdapConnection ldapConnection )
{
if ( ldapConnection != null )
{
@@ -422,7 +420,7 @@ public class LdapRbacManager
throws RbacManagerException
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
@@ -530,7 +528,7 @@ public class LdapRbacManager
{
return role;
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
//verify it's a ldap group
try
@@ -567,7 +565,7 @@ public class LdapRbacManager
public Collection<Role> getUnassignedRoles( String username )
throws RbacManagerException
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
@@ -615,7 +613,7 @@ public class LdapRbacManager
{
return ua;
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -788,7 +786,7 @@ public class LdapRbacManager
rolesCache.remove( role.getName() );
if ( writableLdap )
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -870,7 +868,7 @@ public class LdapRbacManager
{
return true;
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -920,7 +918,7 @@ public class LdapRbacManager
{
if ( writableLdap )
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -958,7 +956,7 @@ public class LdapRbacManager
{
if ( writableLdap )
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -987,7 +985,7 @@ public class LdapRbacManager
public UserAssignment saveUserAssignment( UserAssignment userAssignment )
throws RbacManagerException
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -1054,7 +1052,7 @@ public class LdapRbacManager
{
return true;
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
DirContext context = null;
try
{
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java Wed May 1 12:17:23 2013
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.users
*/
-import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.common.ldap.user.UserMapper;
import org.apache.archiva.redback.configuration.UserConfiguration;
@@ -31,7 +31,6 @@ import org.apache.archiva.redback.users.
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.common.ldap.MappingException;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.users.UserQuery;
@@ -130,7 +129,7 @@ public class LdapUserManager
return guestUser;
}
- LdapConnection ldapConnection = getLdapConnection();
+ DefaultLdapConnection ldapConnection = getLdapConnection();
try
{
DirContext context = ldapConnection.getDirContext();
@@ -169,7 +168,7 @@ public class LdapUserManager
{
clearFromCache( username );
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
try
{
ldapConnection = getLdapConnection();
@@ -212,7 +211,7 @@ public class LdapUserManager
return ldapUser;
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
try
{
@@ -279,7 +278,7 @@ public class LdapUserManager
return Collections.emptyList();
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
try
{
@@ -330,7 +329,7 @@ public class LdapUserManager
*/
public List<User> getUsers()
{
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
try
{
@@ -386,7 +385,7 @@ public class LdapUserManager
clearFromCache( user.getUsername() );
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
try
{
@@ -430,7 +429,7 @@ public class LdapUserManager
return true;
}
- LdapConnection ldapConnection = null;
+ DefaultLdapConnection ldapConnection = null;
try
{
@@ -453,7 +452,7 @@ public class LdapUserManager
}
}
- private LdapConnection getLdapConnection()
+ private DefaultLdapConnection getLdapConnection()
throws LdapException
{
try
@@ -467,7 +466,7 @@ public class LdapUserManager
}
}
- private void closeLdapConnection( LdapConnection ldapConnection )
+ private void closeLdapConnection( DefaultLdapConnection ldapConnection )
{
if ( ldapConnection != null )
{
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java Wed May 1 12:17:23 2013
@@ -19,7 +19,6 @@ package org.apache.archiva.redback.users
* under the License.
*/
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -42,8 +41,6 @@ import javax.naming.directory.DirContext
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
-import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.user.LdapUser;
import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
import org.apache.archiva.redback.common.ldap.user.UserMapper;
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java?rev=1477968&r1=1477967&r2=1477968&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java Wed May 1 12:17:23 2013
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.users
import junit.framework.TestCase;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.users.User;
-import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.UserManager;
@@ -147,7 +147,7 @@ public class LdapUserManagerTest
{
assertNotNull( connectionFactory );
- LdapConnection connection = null;
+ DefaultLdapConnection connection = null;
try
{
connection = connectionFactory.getConnection();
@@ -168,7 +168,7 @@ public class LdapUserManagerTest
public void testDirectUsersExistence()
throws Exception
{
- LdapConnection connection = null;
+ DefaultLdapConnection connection = null;
try
{
connection = connectionFactory.getConnection();