Index: topia/src/java/org/codelutin/topia/security/TopiaSecurityHelper.java diff -u topia/src/java/org/codelutin/topia/security/TopiaSecurityHelper.java:1.9 topia/src/java/org/codelutin/topia/security/TopiaSecurityHelper.java:1.10 --- topia/src/java/org/codelutin/topia/security/TopiaSecurityHelper.java:1.9 Wed Jul 27 06:22:56 2005 +++ topia/src/java/org/codelutin/topia/security/TopiaSecurityHelper.java Fri Jul 29 17:18:45 2005 @@ -23,9 +23,9 @@ * Created: 15 juillet 2005 17:39:35 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ * - * Last update: $Date: 2005/07/27 06:22:56 $ + * Last update: $Date: 2005/07/29 17:18:45 $ * by : $Author: thimel $ */ @@ -54,6 +54,7 @@ import org.codelutin.topia.TopiaContext; import org.codelutin.util.HashMapMultiKey; import org.codelutin.util.ListenerSet; +import org.codelutin.util.RecursiveProperties; public class TopiaSecurityHelper { // TopiaSecurityHelper @@ -121,7 +122,7 @@ protected List simpleAuthentication(String login, String password) throws TopiaSecurityException { //Récupère le fichier contenants les utilisateurs et les mots de passe - Properties users = new Properties(); + Properties users = new RecursiveProperties(); String fileName = properties.getProperty("topia.auth.simple.file.login"); if (fileName == null) throw new TopiaSecurityException( @@ -156,7 +157,7 @@ principals.add(new TopiaUserPrincipal(login)); // Récupère le fichier contenant les groupes String groupsFileName = properties.getProperty("topia.auth.simple.file.groups"); - Properties groups = new Properties(); + Properties groups = new RecursiveProperties(); try { groups.load(new FileInputStream(groupsFileName)); } catch (FileNotFoundException e1) { @@ -251,7 +252,7 @@ * @param action */ private void loadPermissions(String fileName, String action) { - Properties props = new Properties(); + Properties props = new RecursiveProperties(); try { props.load(new FileInputStream(fileName)); HashMapMultiKey.Key multiKey = new HashMapMultiKey.Key().add(action); @@ -298,7 +299,7 @@ * @param action */ private void storePermissions(String fileName, String action) { - Properties props = new Properties(); + Properties props = new RecursiveProperties(); List keys = permissions.getKeys(action); for (Iterator it = keys.iterator(); it.hasNext(); ) { HashMapMultiKey.Key key = (HashMapMultiKey.Key)it.next();