Index: topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java diff -u topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java:1.2 topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java:1.3 --- topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java:1.2 Mon Oct 16 14:27:40 2006 +++ topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java Wed Oct 18 08:46:34 2006 @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaException; import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.security.TopiaSecurityManagerImpl; +import org.codelutin.topia.security.TopiaSecurityService; /** * La classe permet de filtrer n'importe quel objet (Collection, List, TopiaEntity, ...) @@ -43,9 +43,9 @@ private static final long serialVersionUID = 1L; - private TopiaSecurityManagerImpl securityManager; + private TopiaSecurityService securityManager; - public TopiaSecurityFactoryFilter(TopiaSecurityManagerImpl securityManager) { + public TopiaSecurityFactoryFilter(TopiaSecurityService securityManager) { super(); this.securityManager = securityManager; } Index: topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java diff -u topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.9 topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.10 --- topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.9 Tue Oct 17 13:50:40 2006 +++ topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java Wed Oct 18 08:46:34 2006 @@ -24,15 +24,14 @@ * Created: 15 févr. 2006 * * @author Arnaud Thimel -* @version $Revision: 1.9 $ +* @version $Revision: 1.10 $ * -* Mise a jour: $Date: 2006/10/17 13:50:40 $ -* par : $Author: bpoussin $ +* Mise a jour: $Date: 2006/10/18 08:46:34 $ +* par : $Author: ruchaud $ */ package org.codelutin.topia.security.util; -import java.security.AccessControlException; import java.security.AccessController; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -47,14 +46,10 @@ import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.topia.framework.TopiaContextImpl; import org.codelutin.topia.persistence.TopiaId; -import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization; -import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl; import org.codelutin.topia.security.entities.user.TopiaUser; import org.codelutin.topia.security.jaas.TopiaLoginModule; -import org.codelutin.topia.security.jaas.TopiaPermission; import sun.misc.BASE64Encoder;