]> source.dussan.org Git - archiva.git/commitdiff
LdapConnection is now the interface to use
authorOlivier Lamy <olamy@apache.org>
Wed, 1 May 2013 12:15:50 +0000 (12:15 +0000)
committerOlivier Lamy <olamy@apache.org>
Wed, 1 May 2013 12:15:50 +0000 (12:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1477966 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java

index 2ed44243d4ac6d3f53d1cd6157ef1443e9ff9e12..a2bca4d2f09867fbfc4276776b7f4709347864d0 100644 (file)
@@ -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