X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.jackrabbit%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fjackrabbit%2FArgeoSecurityManager.java;h=e785d887e3c8855635342923ce0a4899d6ddf2bf;hb=b3b39d5606a0c48d64a804f4aff5459ea3addc31;hp=3450c75d8dbd51f9e9418814a82023e8cdd4a205;hpb=5ae7bd094c6b8a2f9c0b6b3460b5abe6fe0b7fff;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
index 3450c75d8..e785d887e 100644
--- a/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
+++ b/org.argeo.security.jackrabbit/src/org/argeo/security/jackrabbit/ArgeoSecurityManager.java
@@ -17,6 +17,7 @@ package org.argeo.security.jackrabbit;
 
 import java.security.Principal;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -39,9 +40,9 @@ import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.security.AnonymousPrincipal;
 import org.apache.jackrabbit.core.security.SecurityConstants;
 import org.apache.jackrabbit.core.security.authorization.WorkspaceAccessManager;
-import org.springframework.security.Authentication;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 /** Integrates Spring Security and Jackrabbit Security users and roles. */
 public class ArgeoSecurityManager extends DefaultSecurityManager {
@@ -119,7 +120,8 @@ public class ArgeoSecurityManager extends DefaultSecurityManager {
 				log.warn("User ID is '" + userId + "' but authen is "
 						+ authen.getName());
 			StringBuffer roles = new StringBuffer("");
-			GrantedAuthority[] authorities = authen.getAuthorities();
+			Collection<? extends GrantedAuthority> authorities = authen
+					.getAuthorities();
 			for (GrantedAuthority ga : authorities) {
 				roles.append(ga.toString());
 			}