Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.11 topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.12 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.11 Tue Jun 28 14:08:34 2005 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java Thu Jul 21 17:10:38 2005 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ * - * Mise a jour: $Date: 2005/06/28 14:08:34 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2005/07/21 17:10:38 $ + * par : $Author: thimel $ */ package org.codelutin.topia.generators; @@ -85,6 +85,7 @@ } //Secuity Variables /*{ +topia.auth.loginEntry=<%=model.getName()%> topia.auth.type=simple topia.auth.simple.file.login=passwords.file #topia.auth.simple.hash=SHA Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java:1.6 topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java:1.7 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java:1.6 Thu Jul 21 12:51:54 2005 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java Thu Jul 21 17:10:38 2005 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ * - * Mise a jour: $Date: 2005/07/21 12:51:54 $ + * Mise a jour: $Date: 2005/07/21 17:10:38 $ * par : $Author: thimel $ */ @@ -33,8 +33,9 @@ import java.io.IOException; import java.io.Writer; -import java.util.Hashtable; +//import java.util.Hashtable; import java.util.Iterator; +import java.util.logging.Logger; import java.io.File; import javax.security.auth.login.Configuration; @@ -69,39 +70,27 @@ import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.topia.security.TopiaSecurityException; -import org.codelutin.topia.security.TopiaConfiguration; -import org.codelutin.topia.security.TopiaPolicy; import java.util.Properties; import java.util.List; -import java.util.Hashtable; -import javax.security.auth.login.Configuration; +import java.util.logging.Logger; -public class <%=model.getName()%>Context extends TopiaContext { +public class <%=model.getName()%>Context extends TopiaContext<<%=model.getName()%>Context> { + + /** to use log facility, just put in your code: log.info("..."); *) + static private Logger log = Logger.getLogger("<%=getProperty("defaultPackage")%>.<%=model.getName()%>Context"); /** *) protected <%=model.getName()%>Context(Properties properties) { super(properties); - initSecurity(); } /** - * Initialise les paramètres de sécurité. + * Constructeur utilisé pour l'ouverture de transaction *) - private void initSecurity() { - Configuration conf = new TopiaConfiguration("<%=model.getName()%>", - getContextPropertiesFilename()); - Configuration.setConfiguration(conf); - TopiaPolicy policy = new TopiaPolicy(); - policy.installPolicy(); - try { - getSecurityHelper().addPermissionListener(policy); - getSecurityHelper().loadPermissions(); - } catch (TopiaNotFoundException nfe) { - nfe.printStackTrace(); - } + protected <%=model.getName()%>Context(<%=model.getName()%>Context parentContext) { + super(parentContext); } /** @@ -118,6 +107,11 @@ static public String getClientContextPropertiesFilename(){ String propName = "<%=model.getName()%>Context-client.properties"; return propName; + } + + @Override + protected <%=model.getName()%>Context createChild() { + return new <%=model.getName()%>Context(this); } /**