Index: topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java diff -u topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java:1.3 topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java:1.4 --- topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java:1.3 Fri Sep 15 13:01:49 2006 +++ topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPermission.java Fri Sep 15 16:12:05 2006 @@ -24,9 +24,9 @@ * Created: 16 févr. 2006 * * @author Arnaud Thimel -* @version $Revision: 1.3 $ +* @version $Revision: 1.4 $ * -* Mise a jour: $Date: 2006/09/15 13:01:49 $ +* Mise a jour: $Date: 2006/09/15 16:12:05 $ * par : $Author: ruchaud $ */ @@ -35,6 +35,7 @@ import java.security.Permission; +import static org.codelutin.topia.security.TopiaSecurityUtil.*; import org.codelutin.topia.security.entities.authorization.TopiaAuthorization; public class TopiaPermission extends Permission { @@ -77,7 +78,7 @@ @Override public String getActions() { - return authorization.getActionsAsString(); + return actionsInt2String(authorization.getActions()); } public TopiaAuthorization getAuthorization() { Index: topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java diff -u topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java:1.4 topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java:1.5 --- topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java:1.4 Fri Sep 15 13:01:49 2006 +++ topia-security/src/java/org/codelutin/topia/security/jaas/TopiaPolicy.java Fri Sep 15 16:12:05 2006 @@ -24,9 +24,9 @@ * Created: 17 févr. 2006 * * @author Arnaud Thimel - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ * - * Mise a jour: $Date: 2006/09/15 13:01:49 $ + * Mise a jour: $Date: 2006/09/15 16:12:05 $ * par : $Author: ruchaud $ */ @@ -46,8 +46,7 @@ import org.codelutin.topia.TopiaException; import org.codelutin.topia.security.TopiaSecurityManager; import org.codelutin.topia.security.entities.authorization.TopiaAuthorization; -import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization; -import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationDAO; +import org.codelutin.topia.security.entities.authorization.TopiaAuthorizationDAO; public class TopiaPolicy extends Policy { @@ -98,12 +97,12 @@ @Override public PermissionCollection getPermissions(ProtectionDomain domain) { PermissionCollection pc = parentPolicy.getPermissions(domain); - TopiaEntityAuthorizationDAO entityAuthorizationDAO = securityManager.getTopiaEntityAuthorizationDAO(); - if (entityAuthorizationDAO != null) { + TopiaAuthorizationDAO authorizationDAO = securityManager.getTopiaAuthorizationDAO(); + if (authorizationDAO != null) { try { - Collection authorizations = entityAuthorizationDAO.findAll(); + Collection authorizations = authorizationDAO.findAll(); Map newPermissionsCache = new HashMap(); - for (TopiaEntityAuthorization authorization : authorizations) { + for (TopiaAuthorization authorization : authorizations) { TopiaPermission topiaPermission = permissionsCache.get(authorization); if(topiaPermission == null) { topiaPermission = new TopiaPermission(authorization);