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.10 topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.11 --- topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java:1.10 Wed Oct 18 08:46:34 2006 +++ topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityUtil.java Fri Oct 27 08:03:38 2006 @@ -24,9 +24,9 @@ * Created: 15 févr. 2006 * * @author Arnaud Thimel -* @version $Revision: 1.10 $ +* @version $Revision: 1.11 $ * -* Mise a jour: $Date: 2006/10/18 08:46:34 $ +* Mise a jour: $Date: 2006/10/27 08:03:38 $ * par : $Author: ruchaud $ */ @@ -78,11 +78,10 @@ public static final String TOPIA_LOGIN_MODULE = TopiaLoginModule.class.getName(); public static final String TOPIA_SECURITY_PERSISTENCE_CLASSES = - "org.codelutin.topia.history.entities.HistoryImpl," + "org.codelutin.topia.security.entities.user.TopiaUserImpl," + "org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl," + "org.codelutin.topia.security.entities.user.TopiaGroupImpl," + - "org.codelutin.topia.security.entities.authorization.TopiaIdLinkImpl," + + "org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkImpl," + "org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl," + "org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl"; 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.3 topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java:1.4 --- topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java:1.3 Wed Oct 18 08:46:34 2006 +++ topia-security/src/java/org/codelutin/topia/security/util/TopiaSecurityFactoryFilter.java Fri Oct 27 08:03:38 2006 @@ -64,7 +64,7 @@ public TopiaEntity filter(TopiaEntity entity, int actions) { try { securityManager.checkPermission(entity.getTopiaId(), actions); - } catch (TopiaException e) { + } catch (SecurityException e) { if(log.isDebugEnabled()) { log.debug("Return Null because : " + e); } @@ -85,7 +85,7 @@ TopiaEntity entity = (TopiaEntity) iterator.next(); try { securityManager.checkPermission(entity.getTopiaId(), actions); - } catch (TopiaException e) { + } catch (SecurityException e) { iterator.remove(); if(log.isDebugEnabled()) { log.debug("Removed because : " + e);