X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ldap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoLdapUserDetailsManager.java;h=0c7368f1f1220f205d4dd0e25ccee7285fb42a81;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=392ac4a27edcea9d2ef911097e3a83659f03dc0c;hpb=4c8c237990cda2b1a9be35532796510d9d5734c5;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java index 392ac4a27..0c7368f1f 100644 --- a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java +++ b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2007-2012 Argeo GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.argeo.security.ldap; import java.security.NoSuchAlgorithmException; @@ -11,7 +26,6 @@ import java.util.Set; import java.util.TreeSet; import org.argeo.ArgeoException; -import org.argeo.security.UserAdminDao; import org.argeo.security.UserAdminService; import org.springframework.ldap.core.ContextSource; import org.springframework.security.Authentication; @@ -25,7 +39,7 @@ import org.springframework.security.userdetails.ldap.LdapUserDetailsManager; public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager implements UserAdminService { private String superUsername = "root"; - private UserAdminDao userAdminDao; + private ArgeoUserAdminDaoLdap userAdminDao; private PasswordEncoder passwordEncoder; private final Random random; @@ -124,7 +138,7 @@ public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager this.superUsername = superUsername; } - public void setUserAdminDao(UserAdminDao userAdminDao) { + public void setUserAdminDao(ArgeoUserAdminDaoLdap userAdminDao) { this.userAdminDao = userAdminDao; }