aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-05-01 12:15:50 +0000
committerOlivier Lamy <olamy@apache.org>2013-05-01 12:15:50 +0000
commit4aca37189a65f3d4f59e5c040e0b93486b52c478 (patch)
treeb5ce34973965d16ee14355dbefe2713abfb2e0c6 /archiva-modules/archiva-web
parenta60a2476de0511b7a7f8d572e26215f0e6f738de (diff)
downloadarchiva-4aca37189a65f3d4f59e5c040e0b93486b52c478.tar.gz
archiva-4aca37189a65f3d4f59e5c040e0b93486b52c478.zip
LdapConnection is now the interface to use
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1477966 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 2ed44243d..a2bca4d2f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -23,8 +23,9 @@ import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
import org.apache.archiva.admin.model.beans.LdapConfiguration;
import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.redback.authentication.Authenticator;
-import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
+import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
+import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionConfiguration;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
@@ -266,7 +267,7 @@ public class DefaultRedbackRuntimeConfigurationService
}
catch ( LdapException e )
{
- log.warn( "fail to get LdapConnection: {}", e.getMessage(), e );
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
finally
@@ -315,12 +316,12 @@ public class DefaultRedbackRuntimeConfigurationService
}
catch ( InvalidNameException e )
{
- log.warn( "fail to get LdapConnection: {}", e.getMessage(), e);
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e);
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( LdapException e )
{
- log.warn( "fail to get LdapConnection: {}", e.getMessage(), e);
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e);
throw new ArchivaRestServiceException( e.getMessage(), e );
}
finally