Index: topia-security/src/java/org/codelutin/topia/security/TopiaSecurityUtil.java diff -u topia-security/src/java/org/codelutin/topia/security/TopiaSecurityUtil.java:1.4 topia-security/src/java/org/codelutin/topia/security/TopiaSecurityUtil.java:1.5 --- topia-security/src/java/org/codelutin/topia/security/TopiaSecurityUtil.java:1.4 Thu Sep 14 17:32:45 2006 +++ topia-security/src/java/org/codelutin/topia/security/TopiaSecurityUtil.java Fri Sep 15 16:12:05 2006 @@ -24,10 +24,10 @@ * Created: 15 févr. 2006 * * @author Arnaud Thimel -* @version $Revision: 1.4 $ +* @version $Revision: 1.5 $ * -* Mise a jour: $Date: 2006/09/14 17:32:45 $ -* par : $Author: bpoussin $ +* Mise a jour: $Date: 2006/09/15 16:12:05 $ +* par : $Author: ruchaud $ */ package org.codelutin.topia.security; @@ -152,7 +152,7 @@ * @param actions * @return */ - public String actionsInt2String(int actions) { + public static String actionsInt2String(int actions) { StringBuffer result = new StringBuffer(); if ((actions & LOAD) == LOAD) { result.append(LOAD_TEXT); Index: topia-security/src/java/org/codelutin/topia/security/TopiaSecurityVetoableListener.java diff -u topia-security/src/java/org/codelutin/topia/security/TopiaSecurityVetoableListener.java:1.3 topia-security/src/java/org/codelutin/topia/security/TopiaSecurityVetoableListener.java:1.4 --- topia-security/src/java/org/codelutin/topia/security/TopiaSecurityVetoableListener.java:1.3 Fri Sep 15 13:01:49 2006 +++ topia-security/src/java/org/codelutin/topia/security/TopiaSecurityVetoableListener.java Fri Sep 15 16:12:05 2006 @@ -24,19 +24,19 @@ * Created: 10 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 $ */ package org.codelutin.topia.security; -import static org.codelutin.topia.security.TopiaSecurityUtil.CREATE_TEXT; -import static org.codelutin.topia.security.TopiaSecurityUtil.DELETE_TEXT; -import static org.codelutin.topia.security.TopiaSecurityUtil.LOAD_TEXT; -import static org.codelutin.topia.security.TopiaSecurityUtil.UPDATE_TEXT; +import static org.codelutin.topia.security.TopiaSecurityUtil.CREATE; +import static org.codelutin.topia.security.TopiaSecurityUtil.DELETE; +import static org.codelutin.topia.security.TopiaSecurityUtil.LOAD; +import static org.codelutin.topia.security.TopiaSecurityUtil.UPDATE; import java.security.AccessControlException; import java.security.AccessController; @@ -76,7 +76,7 @@ log.debug("[Security] create entity : " + event.getEntityClass()); } try { - checkPermission(event.getEntityClass(), CREATE_TEXT); + checkPermission(event.getEntityClass(), CREATE); } catch (TopiaException te) { throw new SecurityException("Access denied to entity creation", te); } @@ -90,7 +90,7 @@ log.debug("[Security] update entity : " + event.getId()); } try { - checkPermission((String)event.getId(), UPDATE_TEXT); + checkPermission((String)event.getId(), UPDATE); } catch (TopiaException te) { throw new SecurityException("Access denied to entity modification", te); } @@ -104,7 +104,7 @@ log.debug("[Security] delete entity : " + event.getId()); } try { - checkPermission((String)event.getId(), DELETE_TEXT); + checkPermission((String)event.getId(), DELETE); } catch (TopiaException te) { throw new SecurityException("Access denied to entity deletion", te); } @@ -129,7 +129,7 @@ return true; } try { - checkPermission((String)event.getId(), LOAD_TEXT); + checkPermission((String)event.getId(), LOAD); } catch (TopiaException te) { if (log.isWarnEnabled()) { log.warn("[Security] load denied to : " + event.getId(), te); @@ -146,7 +146,7 @@ * @param actions les actions [load, read, write, admin] * @throws TopiaSecurityException */ - public static void checkPermission(Class entityClass, String actions) throws TopiaException { + public static void checkPermission(Class entityClass, int actions) throws TopiaException { if (log.isTraceEnabled()) { log.trace("Checking permissions to entity class : " + entityClass); } @@ -164,7 +164,7 @@ * @param actions les actions [load, read, write, admin] * @throws TopiaSecurityException */ - public static void checkPermission(String topiaId, String actions) throws TopiaException { + public static void checkPermission(String topiaId, int actions) throws TopiaException { Subject subj = Subject.getSubject(AccessController.getContext()); if (subj == null) { throw new TopiaException("Use doAs() and login first");