X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FCmsLogin.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FCmsLogin.java;h=ac63351e3d65a9844d34e2a9664921edd879c4a5;hb=4b56d461613392a3808d886d5373cf46b65a040e;hp=7c4dd5f4b3ac7e855ce3025952d75e6679e303a1;hpb=b3b39d5606a0c48d64a804f4aff5459ea3addc31;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java
index 7c4dd5f4b..ac63351e3 100644
--- a/org.argeo.cms/src/org/argeo/cms/CmsLogin.java
+++ b/org.argeo.cms/src/org/argeo/cms/CmsLogin.java
@@ -1,16 +1,18 @@
 package org.argeo.cms;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.Authentication;
-import org.springframework.security.AuthenticationManager;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
-import org.springframework.security.providers.anonymous.AnonymousAuthenticationToken;
-import org.springframework.security.userdetails.User;
-import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 
 /** Gateway for user login, can also generate the related UI. */
 public class CmsLogin {
@@ -21,8 +23,8 @@ public class CmsLogin {
 	protected void logInAsAnonymous() {
 		// TODO Better deal with anonymous authentication
 		try {
-			GrantedAuthority[] anonAuthorities = { new GrantedAuthorityImpl(
-					"ROLE_ANONYMOUS") };
+			List<SimpleGrantedAuthority> anonAuthorities = Collections
+					.singletonList(new SimpleGrantedAuthority("ROLE_ANONYMOUS"));
 			UserDetails anonUser = new User("anonymous", "", true, true, true,
 					true, anonAuthorities);
 			AnonymousAuthenticationToken anonToken = new AnonymousAuthenticationToken(