X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FJcrUserDetails.java;h=2f7b97b7842565bc6512f584fd814d1310e68988;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=223c06de0d3dd44b4a108cc39c1b01a14fc495b3;hpb=c76283038c867fc0ef9eb6fa623040c58c6139bb;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java index 223c06de0..2f7b97b78 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrUserDetails.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.jcr; import java.util.ArrayList; @@ -9,7 +24,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.argeo.jcr.ArgeoNames; -import org.argeo.jcr.JcrUtils; +import org.argeo.jcr.UserJcrUtils; import org.springframework.security.BadCredentialsException; import org.springframework.security.DisabledException; import org.springframework.security.GrantedAuthority; @@ -75,7 +90,7 @@ public class JcrUserDetails extends User implements ArgeoNames { */ public JcrUserDetails(Session session, String username, String password, GrantedAuthority[] authorities) throws RepositoryException { - this(JcrUtils.getUserProfile(session, username), + this(UserJcrUtils.getUserProfile(session, username), password != null ? password : "", authorities); }