Index: topia/src/java/org/codelutin/topia/ContextHelper.java diff -u topia/src/java/org/codelutin/topia/ContextHelper.java:1.5 topia/src/java/org/codelutin/topia/ContextHelper.java:1.6 --- topia/src/java/org/codelutin/topia/ContextHelper.java:1.5 Fri Jul 22 16:57:57 2005 +++ topia/src/java/org/codelutin/topia/ContextHelper.java Fri Jul 29 17:18:45 2005 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * - * Mise a jour: $Date: 2005/07/22 16:57:57 $ + * Mise a jour: $Date: 2005/07/29 17:18:45 $ * par : $Author: thimel $ */ @@ -37,6 +37,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.lang.reflect.Constructor; + +import org.codelutin.util.RecursiveProperties; import org.codelutin.util.Resource; /** @@ -95,7 +97,7 @@ // load properties for helper String propertiesFilename = properties.getProperty(propertyId+".properties");/* TODO .file ??? */ - properties = new Properties(properties); + properties = new RecursiveProperties(properties); if (propertiesFilename != null && !propertiesFilename.equals("")) { try { URL propURL = Resource.getURL(propertiesFilename); Index: topia/src/java/org/codelutin/topia/TopiaContextFactory.java diff -u topia/src/java/org/codelutin/topia/TopiaContextFactory.java:1.8 topia/src/java/org/codelutin/topia/TopiaContextFactory.java:1.9 --- topia/src/java/org/codelutin/topia/TopiaContextFactory.java:1.8 Wed Jul 20 12:49:52 2005 +++ topia/src/java/org/codelutin/topia/TopiaContextFactory.java Fri Jul 29 17:18:45 2005 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ * - * Mise a jour: $Date: 2005/07/20 12:49:52 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2005/07/29 17:18:45 $ + * par : $Author: thimel $ */ package org.codelutin.topia; @@ -37,6 +37,8 @@ import java.net.URL; import java.util.logging.Logger; import java.util.logging.Level; + +import org.codelutin.util.RecursiveProperties; import org.codelutin.util.Resource; /** @@ -160,7 +162,7 @@ protected static Properties getProperties(String propertiesFilename) throws TopiaException { - Properties properties = new Properties(); + Properties properties = new RecursiveProperties(); try { URL propURL = Resource.getURL(propertiesFilename); Logger.getLogger(TopiaContext.class + ".getDefaultProperties").log(