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:19:21 UTC
svn commit: r1477971 - 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:19:20 2013
New Revision: 1477971
URL: http://svn.apache.org/r1477971
Log:
move LdapConnection to an interface
Added:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
- copied, changed from r1477970, archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.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/DefaultLdapConnection.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/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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -21,6 +21,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.connection.LdapConnection;
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;
@@ -103,8 +104,8 @@ public class LdapBindAuthenticator
log.debug( "Searching for users with filter: '{}' from base dn: {}", filter, mapper.getUserBaseDn() );
- DefaultLdapConnection ldapConnection = null;
- DefaultLdapConnection authLdapConnection = null;
+ LdapConnection ldapConnection = null;
+ LdapConnection authLdapConnection = null;
NamingEnumeration<SearchResult> results = null;
try
{
@@ -172,13 +173,13 @@ public class LdapBindAuthenticator
return ( source instanceof PasswordBasedAuthenticationDataSource );
}
- private DefaultLdapConnection getLdapConnection()
+ private LdapConnection getLdapConnection()
throws LdapException
{
return connectionFactory.getConnection();
}
- private void closeLdapConnection( DefaultLdapConnection ldapConnection )
+ private void closeLdapConnection( LdapConnection 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/DefaultLdapConnection.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/DefaultLdapConnection.java?rev=1477971&r1=1477970&r2=1477971&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/DefaultLdapConnection.java Wed May 1 12:19:20 2013
@@ -38,8 +38,10 @@ import java.util.Properties;
* The configuration for a connection will not change.
*
* @author <a href="mailto:trygvis@inamo.no">trygvis</a>
+ * @since 2.1
*/
public class DefaultLdapConnection
+ implements LdapConnection
{
private static LdapCtxFactory ctxFactory;// = new LdapCtxFactory();
@@ -132,6 +134,7 @@ public class DefaultLdapConnection
// Connection Managment
// ----------------------------------------------------------------------
+ @Override
public Hashtable<Object, Object> getEnvironment()
throws LdapException
{
@@ -236,6 +239,7 @@ public class DefaultLdapConnection
return env;
}
+ @Override
public void close()
{
try
@@ -259,16 +263,19 @@ public class DefaultLdapConnection
// Utils
// ----------------------------------------------------------------------
+ @Override
public LdapConnectionConfiguration getConfiguration()
{
return config;
}
+ @Override
public List<Rdn> getBaseDnRdns()
{
return baseDnRdns;
}
+ @Override
public DirContext getDirContext()
{
return context;
Copied: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java (from r1477970, 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/LdapConnection.java?p2=archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java&p1=archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionFactory.java&r1=1477970&r2=1477971&rev=1477971&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/LdapConnection.java Wed May 1 12:19:20 2013
@@ -19,36 +19,24 @@ package org.apache.archiva.redback.commo
* under the License.
*/
-import javax.naming.ldap.LdapName;
+import javax.naming.directory.DirContext;
import javax.naming.ldap.Rdn;
-import javax.naming.spi.ObjectFactory;
-import javax.naming.spi.StateFactory;
-
+import java.util.Hashtable;
+import java.util.List;
/**
- * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author Olivier Lamy
*/
-public interface LdapConnectionFactory
+public interface LdapConnection
{
- DefaultLdapConnection getConnection()
- throws LdapException;
-
- DefaultLdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
- throws LdapException;
-
- DefaultLdapConnection getConnection( Rdn subRdn )
- throws LdapException;
-
- DefaultLdapConnection getConnection( String bindDn, String password )
- throws LdapException;
-
- LdapName getBaseDnLdapName()
+ Hashtable<Object, Object> getEnvironment()
throws LdapException;
- void addObjectFactory( Class<? extends ObjectFactory> objectFactoryClass );
+ void close();
- void addStateFactory( Class<? extends StateFactory> objectFactoryClass );
+ LdapConnectionConfiguration getConfiguration();
- void initialize();
+ List<Rdn> getBaseDnRdns();
+ DirContext getDirContext();
}
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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -30,16 +30,16 @@ import javax.naming.spi.StateFactory;
*/
public interface LdapConnectionFactory
{
- DefaultLdapConnection getConnection()
+ LdapConnection getConnection()
throws LdapException;
- DefaultLdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
+ LdapConnection getConnection( LdapConnectionConfiguration ldapConnectionConfiguration )
throws LdapException;
- DefaultLdapConnection getConnection( Rdn subRdn )
+ LdapConnection getConnection( Rdn subRdn )
throws LdapException;
- DefaultLdapConnection getConnection( String bindDn, String password )
+ LdapConnection 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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -1,4 +1,5 @@
package org.apache.archiva.redback.common.ldap.role;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,7 +20,7 @@ package org.apache.archiva.redback.commo
*/
import junit.framework.TestCase;
-import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
+import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
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 +90,7 @@ public class TestLdapRoleMapper
List<String> roleNames =
Arrays.asList( "Archiva System Administrator", "Internal Repo Manager", "Internal Repo Observer" );
- DefaultLdapConnection ldapConnection;
+ LdapConnection 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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -20,6 +20,7 @@ package org.apache.archiva.redback.rest.
import org.apache.archiva.redback.common.ldap.MappingException;
import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
+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.common.ldap.role.LdapRoleMapper;
@@ -67,7 +68,7 @@ public class DefaultLdapGroupMappingServ
public StringList getLdapGroups()
throws RedbackServiceException
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
@@ -170,7 +171,7 @@ public class DefaultLdapGroupMappingServ
// utils
//------------------
- protected void closeLdapConnection( DefaultLdapConnection ldapConnection )
+ protected void closeLdapConnection( LdapConnection 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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.rbac.
*/
import org.apache.archiva.redback.common.ldap.MappingException;
-import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
+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.common.ldap.role.LdapRoleMapper;
@@ -71,7 +71,7 @@ import java.util.Set;
*
* @author Olivier Lamy
*/
-@Service( "rbacManager#ldap" )
+@Service("rbacManager#ldap")
public class LdapRbacManager
extends AbstractRBACManager
implements RBACManager, RBACManagerListener
@@ -80,19 +80,19 @@ public class LdapRbacManager
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- @Named( value = "rbacManager#cached" )
+ @Named(value = "rbacManager#cached")
private RBACManager rbacImpl;
@Inject
- @Named( value = "ldapRoleMapper#default" )
+ @Named(value = "ldapRoleMapper#default")
private LdapRoleMapper ldapRoleMapper;
@Inject
- @Named( value = "userConfiguration#default" )
+ @Named(value = "userConfiguration#default")
private UserConfiguration userConf;
@Inject
- @Named( value = "userManager#ldap" )
+ @Named(value = "userManager#ldap")
private UserManager userManager;
@Inject
@@ -102,15 +102,15 @@ public class LdapRbacManager
private LdapController ldapController;
@Inject
- @Named( value = "ldapRoleMapperConfiguration#default" )
+ @Named(value = "ldapRoleMapperConfiguration#default")
private LdapRoleMapperConfiguration ldapRoleMapperConfiguration;
@Inject
- @Named( value = "cache#ldapRoles" )
+ @Named(value = "cache#ldapRoles")
private Cache<String, Role> rolesCache;
@Inject
- @Named( value = "cache#userAssignments" )
+ @Named(value = "cache#userAssignments")
private Cache<String, UserAssignment> userAssignmentsCache;
private boolean writableLdap = false;
@@ -174,7 +174,7 @@ public class LdapRbacManager
{
if ( writableLdap )
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -250,7 +250,7 @@ public class LdapRbacManager
public List<Role> getAllRoles()
throws RbacManagerException
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -280,7 +280,7 @@ public class LdapRbacManager
public List<UserAssignment> getAllUserAssignments()
throws RbacManagerException
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -313,7 +313,7 @@ public class LdapRbacManager
}
}
- protected void closeLdapConnection( DefaultLdapConnection ldapConnection )
+ protected void closeLdapConnection( LdapConnection ldapConnection )
{
if ( ldapConnection != null )
{
@@ -420,7 +420,7 @@ public class LdapRbacManager
throws RbacManagerException
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
@@ -528,7 +528,7 @@ public class LdapRbacManager
{
return role;
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
//verify it's a ldap group
try
@@ -565,7 +565,7 @@ public class LdapRbacManager
public Collection<Role> getUnassignedRoles( String username )
throws RbacManagerException
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
@@ -613,7 +613,7 @@ public class LdapRbacManager
{
return ua;
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -786,7 +786,7 @@ public class LdapRbacManager
rolesCache.remove( role.getName() );
if ( writableLdap )
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -868,7 +868,7 @@ public class LdapRbacManager
{
return true;
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -918,7 +918,7 @@ public class LdapRbacManager
{
if ( writableLdap )
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -956,7 +956,7 @@ public class LdapRbacManager
{
if ( writableLdap )
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -985,7 +985,7 @@ public class LdapRbacManager
public UserAssignment saveUserAssignment( UserAssignment userAssignment )
throws RbacManagerException
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
DirContext context = null;
try
{
@@ -1052,7 +1052,7 @@ public class LdapRbacManager
{
return true;
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection 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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -21,6 +21,7 @@ package org.apache.archiva.redback.users
import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
+import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
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;
@@ -129,7 +130,7 @@ public class LdapUserManager
return guestUser;
}
- DefaultLdapConnection ldapConnection = getLdapConnection();
+ LdapConnection ldapConnection = getLdapConnection();
try
{
DirContext context = ldapConnection.getDirContext();
@@ -168,7 +169,7 @@ public class LdapUserManager
{
clearFromCache( username );
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
try
{
ldapConnection = getLdapConnection();
@@ -211,7 +212,7 @@ public class LdapUserManager
return ldapUser;
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
try
{
@@ -278,7 +279,7 @@ public class LdapUserManager
return Collections.emptyList();
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
try
{
@@ -329,7 +330,7 @@ public class LdapUserManager
*/
public List<User> getUsers()
{
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
try
{
@@ -385,7 +386,7 @@ public class LdapUserManager
clearFromCache( user.getUsername() );
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
try
{
@@ -429,7 +430,7 @@ public class LdapUserManager
return true;
}
- DefaultLdapConnection ldapConnection = null;
+ LdapConnection ldapConnection = null;
try
{
@@ -452,7 +453,7 @@ public class LdapUserManager
}
}
- private DefaultLdapConnection getLdapConnection()
+ private LdapConnection getLdapConnection()
throws LdapException
{
try
@@ -466,7 +467,7 @@ public class LdapUserManager
}
}
- private void closeLdapConnection( DefaultLdapConnection ldapConnection )
+ private void closeLdapConnection( LdapConnection ldapConnection )
{
if ( ldapConnection != null )
{
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=1477971&r1=1477970&r2=1477971&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:19:20 2013
@@ -20,6 +20,7 @@ package org.apache.archiva.redback.users
*/
import junit.framework.TestCase;
+import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
@@ -147,7 +148,8 @@ public class LdapUserManagerTest
{
assertNotNull( connectionFactory );
- DefaultLdapConnection connection = null;
+ LdapConnection connection = null;
+
try
{
connection = connectionFactory.getConnection();
@@ -168,7 +170,8 @@ public class LdapUserManagerTest
public void testDirectUsersExistence()
throws Exception
{
- DefaultLdapConnection connection = null;
+ LdapConnection connection = null;
+
try
{
connection = connectionFactory.getConnection();