Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToApplicationContextGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -36,6 +36,7 @@ import java.util.Iterator; import java.io.File; +import org.codelutin.generator.Generator; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClassifier; @@ -43,6 +44,14 @@ public class ObjectModelToApplicationContextGenerator extends ObjectModelGenerator { // ObjectModelToApplicationContextGenerator + public ObjectModelToApplicationContextGenerator(){ + super(); + } + + public ObjectModelToApplicationContextGenerator(Generator parent){ + super(parent); + } + public String getFilenameForModel(ObjectModel model){ return (getProperty("defaultPackage")+".").replace('.', File.separatorChar) + model.getName() + "Context.java"; @@ -67,12 +76,20 @@ } /** + * Donne le nom du fichier de propriété lu par defaut. + *) + static public String getContextPropertiesFilename(){ + String propName = "<%=model.getName()%>Context.properties"; + return propName; + } + + /** * Method qui permet de recuperer un context pour l'application. * Cette methode est en fait un appel a la factory de context. * L'avantage d'utiliser cette methode est qu'elle vous evite un cast *) public static <%=model.getName()%>Context getContext() throws TopiaException { - String propName = "<%=model.getName()%>Context.properties"; + String propName = getContextPropertiesFilename(); return (<%=model.getName()%>Context)TopiaContextFactory.getContext(propName); } Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.2 Fri Jul 30 16:57:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/07/30 16:57:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -35,12 +35,21 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.topia.generators.Util; public class ObjectModelToContextPropertiesGenerator extends ObjectModelGenerator { // ObjectModelToContextPropertiesGenerator + + public ObjectModelToContextPropertiesGenerator(){ + super(); + } + + public ObjectModelToContextPropertiesGenerator(Generator parent){ + super(parent); + } public String getFilenameForModel(ObjectModel model){ return model.getName() + "Context.properties"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -41,8 +41,17 @@ import org.codelutin.generator.models.object.ObjectModelInterface; import org.codelutin.generator.models.object.ObjectModelOperation; import org.codelutin.topia.generators.Util; +import org.codelutin.generator.Generator; public class ObjectModelToEntityGenerator extends TopiaAbstractObjectModelGenerator { // ObjectModelToEntityGenerator + + public ObjectModelToEntityGenerator(){ + super(); + } + + public ObjectModelToEntityGenerator(Generator parent){ + super(parent); + } public String getFilenameForClassifier(ObjectModelClassifier clazz) { return super.getFilenameForClassifier(clazz) + ".java"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -36,6 +36,7 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.generator.models.object.ObjectModelClassifier; @@ -44,6 +45,14 @@ import org.codelutin.topia.generators.Util; public class ObjectModelToEntityImplGenerator extends TopiaAbstractObjectModelGenerator { // ObjectModelToEntityImplGenerator + + public ObjectModelToEntityImplGenerator(){ + super(); + } + + public ObjectModelToEntityImplGenerator(Generator parent){ + super(parent); + } public String getFilenameForClassifier(ObjectModelClassifier clazz) { return super.getFilenameForClassifier(clazz) + "Impl.java"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -36,6 +36,7 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelParameter; import org.codelutin.generator.models.object.ObjectModelClass; @@ -45,6 +46,14 @@ import org.codelutin.topia.generators.Util; public class ObjectModelToEntityOperationGenerator extends TopiaAbstractObjectModelGenerator { // ObjectModelToEntityOperationGenerator + + public ObjectModelToEntityOperationGenerator(){ + super(); + } + + public ObjectModelToEntityOperationGenerator(Generator parent){ + super(parent); + } public String getFilenameForClassifier(ObjectModelClassifier clazz) { return super.getFilenameForClassifier(clazz) + "Operation.java"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationRouterGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationRouterGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationRouterGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationRouterGenerator.java:1.2 Tue Aug 3 16:07:14 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityOperationRouterGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/03 16:07:14 $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ * par : $Author: bpoussin $ */ @@ -36,6 +36,7 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelParameter; import org.codelutin.generator.models.object.ObjectModelClass; @@ -45,6 +46,14 @@ import org.codelutin.topia.generators.Util; public class ObjectModelToEntityOperationRouterGenerator extends TopiaAbstractObjectModelGenerator { // ObjectModelToEntityOperationRouterGenerator + + public ObjectModelToEntityOperationRouterGenerator(){ + super(); + } + + public ObjectModelToEntityOperationRouterGenerator(Generator parent){ + super(parent); + } public String getFilenameForClassifier(ObjectModelClassifier clazz) { return super.getFilenameForClassifier(clazz) + "OperationRouter.java"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityPersistenceServiceGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -35,6 +35,7 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.generator.models.object.ObjectModelClassifier; @@ -43,6 +44,14 @@ import org.codelutin.topia.generators.Util; public class ObjectModelToEntityPersistenceServiceGenerator extends TopiaAbstractObjectModelGenerator { // ObjectModelToEntityPersistenceServiceGenerator + + public ObjectModelToEntityPersistenceServiceGenerator(){ + super(); + } + + public ObjectModelToEntityPersistenceServiceGenerator(Generator parent){ + super(parent); + } public String getFilenameForClassifier(ObjectModelClassifier clazz) { return super.getFilenameForClassifier(clazz) + "PersistenceService.java"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToServiceRouterGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToServiceRouterGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/ObjectModelToServiceRouterGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToServiceRouterGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToServiceRouterGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -36,6 +36,7 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelParameter; import org.codelutin.generator.models.object.ObjectModelClass; @@ -45,6 +46,14 @@ import org.codelutin.topia.generators.Util; public class ObjectModelToServiceRouterGenerator extends TopiaAbstractObjectModelGenerator { // ObjectModelToServiceRouterGenerator + + public ObjectModelToServiceRouterGenerator(){ + super(); + } + + public ObjectModelToServiceRouterGenerator(Generator parent){ + super(parent); + } public String getFilenameForClassifier(ObjectModelClassifier clazz) { return super.getFilenameForClassifier(clazz) + "Dist.java"; Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java:1.2 Wed Aug 4 08:54:02 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToTopiaMetaGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,18 +23,21 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/04 08:54:02 $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; +import org.codelutin.generator.Generator; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import java.io.IOException; import java.io.File; +import java.util.logging.Logger; +import java.util.logging.Level; /** * Meta generateur qui appelle tous les générateur de classe util pour le @@ -47,67 +50,51 @@ super(); } + public ObjectModelToTopiaMetaGenerator(Generator parent){ + super(parent); + } + public void generate(ObjectModel model, File destDir) throws IOException { ObjectModelGenerator gen = null; - System.out.println("Generation de ObjectModelToApplicationContextGenerator"); - gen = new ObjectModelToApplicationContextGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToApplicationContextGenerator"); + gen = new ObjectModelToApplicationContextGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToContextPropertiesGenerator"); - gen = new ObjectModelToContextPropertiesGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToContextPropertiesGenerator"); + gen = new ObjectModelToContextPropertiesGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToEntityGenerator"); - gen = new ObjectModelToEntityGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToEntityGenerator"); + gen = new ObjectModelToEntityGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToEntityImplGenerator"); - gen = new ObjectModelToEntityImplGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToEntityImplGenerator"); + gen = new ObjectModelToEntityImplGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToEntityOperationGenerator"); - gen = new ObjectModelToEntityOperationGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToEntityOperationGenerator"); + gen = new ObjectModelToEntityOperationGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToEntityOperationRouterGenerator"); - gen = new ObjectModelToEntityOperationRouterGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToEntityOperationRouterGenerator"); + gen = new ObjectModelToEntityOperationRouterGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToEntityPersistenceServiceGenerator"); - gen = new ObjectModelToEntityPersistenceServiceGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToEntityPersistenceServiceGenerator"); + gen = new ObjectModelToEntityPersistenceServiceGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de OjectModelToEntityPersistenceServiceImplGenerator"); - gen = new OjectModelToEntityPersistenceServiceImplGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToEntityPersistenceServiceImplGenerator"); + gen = new ObjectModelToEntityPersistenceServiceImplGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelToServiceRouterGenerator"); - gen = new ObjectModelToServiceRouterGenerator(); - gen.setProperties(properties); - gen.setOverwrite(getOverwrite()); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToServiceRouterGenerator"); + gen = new ObjectModelToServiceRouterGenerator(this); gen.generate(model, destDir); - System.out.println("Generation de ObjectModelTOServiceGenerator"); - gen = new ObjectModelTOServiceGenerator(); - gen.setOverwrite(getOverwrite()); - gen.setProperties(properties); + Logger.getLogger(getClass().getName() + ".generate").log(Level.FINE, "Generation de ObjectModelToServiceGenerator"); + gen = new ObjectModelToServiceGenerator(); gen.generate(model, destDir); } Index: topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.1 topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.2 --- topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.1 Fri Jul 30 14:38:58 2004 +++ topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java Fri Aug 6 17:48:52 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/07/30 14:38:58 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/08/06 17:48:52 $ + * par : $Author: bpoussin $ */ package org.codelutin.topia.generators; @@ -36,6 +36,7 @@ import java.io.Writer; import java.util.Iterator; +import org.codelutin.generator.Generator; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelClass; @@ -44,6 +45,14 @@ import org.codelutin.generator.models.object.ObjectModelOperation; public abstract class TopiaAbstractObjectModelGenerator extends ObjectModelGenerator { // TopiaAbstractObjectModelGenerator + + public TopiaAbstractObjectModelGenerator(){ + super(); + } + + public TopiaAbstractObjectModelGenerator(Generator parent){ + super(parent); + } /** * if this method return false, nothing is generate